Merge branch '申购自动计算报价' into 测试

src/components/process/subscribe.vue

@@ -9,13 +9,14 @@
           <el-table :data="formData.data.applyBuyBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
             <el-table-column label="品号" prop="bomSpecCode" width="140" />
             <el-table-column label="品名" prop="bomSpecName" min-width="220" />
-            <el-table-column label="颜色" prop="bomSpecColour" width="160" />
+            <el-table-column label="颜色" prop="bomSpecColour" width="170" />
             <el-table-column label="尺寸（长宽高，cm）" prop="name" width="160">
               <template #default="{ row }">
                 <div>{{ row.bomSpecLength }} * {{ row.bomSpecWidth }} * {{ row.bomSpecHeight }}</div>
               </template>
             </el-table-column>
-            <el-table-column label="申购数量" width="160">
+            <el-table-column label="申购单价" prop="unitPrice" width="100" />
+            <el-table-column label="申购数量" width="140">
               <template #default="{ row, $index }">
                 <el-form-item :prop="'applyBuyBomList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true" style="width: 100%">
                   <el-input-number
@@ -167,17 +168,21 @@ const selectMateriel = (row) => {
       return ElMessage("请勿重复添加!");
     }
   }
-  formData.data.applyBuyBomList.push({
-    bomSpecId: row.id,
-    bomSpecCode: row.code,
-    bomSpecName: row.name,
-    bomSpecColour: row.colour,
-    bomSpecLength: row.length,
-    bomSpecWidth: row.width,
-    bomSpecHeight: row.height,
-    quantity: undefined,
+  proxy.post("/bomSpec/getPriceById", { id: row.id }).then((res) => {
+    console.log(res);
+    formData.data.applyBuyBomList.push({
+      bomSpecId: row.id,
+      bomSpecCode: row.code,
+      bomSpecName: row.name,
+      bomSpecColour: row.colour,
+      bomSpecLength: row.length,
+      bomSpecWidth: row.width,
+      bomSpecHeight: row.height,
+      quantity: undefined,
+      unitPrice: res,
+    });
+    ElMessage({ message: "选择完成", type: "success" });
   });
-  ElMessage({ message: "选择完成", type: "success" });
 };
 const clickDelete = (index) => {
   formData.data.applyBuyBomList.splice(index, 1);