部分bug解决

src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -86,7 +86,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="materialColor" label="颜色" width="170" />
-                <el-table-column label="数量" width="150">
+                <!-- <el-table-column label="数量" width="150">
                   <template #default="{ row, $index }">
                     <div style="width: 100%">
                       <el-form-item :prop="'productBomDetailList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true"
@@ -96,7 +96,7 @@
                       </el-form-item>
                     </div>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="标准用量" width="150">
                   <template #default="{ row, $index }">
                     <div style="width: 100%">
@@ -762,17 +762,17 @@ const config = computed(() => {
           //       clickSelect(row);
           //     },
           //   }
-          {
-            attrs: {
-              label: "BOM",
-              type: "primary",
-              text: true,
-            },
-            el: "button",
-            click() {
-              bomSetting(row);
-            },
-          },
+          // {
+          //   attrs: {
+          //     label: "BOM",
+          //     type: "primary",
+          //     text: true,
+          //   },
+          //   el: "button",
+          //   click() {
+          //     bomSetting(row);
+          //   },
+          // },
           {
             attrs: {
               label: "修改",
@@ -1553,7 +1553,7 @@ const selectMaterial = (row) => {
         materialHeight: row.height,
         materialColor: row.color,
         quantity: null,
-        standardDosage: null,
+        standardDosage: 1,
         lossRate: null,
         remark: "",
       });
@@ -1763,7 +1763,7 @@ const selectRawMaterial = (row) => {
         materialHeight: row.height,
         materialColor: row.color,
         quantity: null,
-        standardDosage: null,
+        standardDosage: 1,
         lossRate: null,
         remark: "",
       });
@@ -1805,7 +1805,7 @@ const selectTechnology = (row) => {
       materialId: x.id,
       materialName: x.name,
       quantity: null,
-      standardDosage: null,
+      standardDosage: 1,
       lossRate: null,
       remark: "",
     }));

src/views/EHSD/productLibrary/waitCreateProduct/index.vue

@@ -64,7 +64,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="materialColor" label="颜色" width="170" />
-                <el-table-column label="数量" width="150">
+                <!-- <el-table-column label="数量" width="150">
                   <template #default="{ row, $index }">
                     <div style="width: 100%">
                       <el-form-item :prop="'productBomDetailList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true"
@@ -74,7 +74,7 @@
                       </el-form-item>
                     </div>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="标准用量" width="150">
                   <template #default="{ row, $index }">
                     <div style="width: 100%">
@@ -441,6 +441,10 @@ const rules = ref({
   ],
   foldWay: [{ required: true, message: "请选择折叠数", trigger: "change" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
+  standardDosage: [
+    { required: true, message: "请输入标准用量", trigger: "blur" },
+  ],
+  lossRate: [{ required: true, message: "请输入损耗率", trigger: "blur" }],
   // remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
 });
 const props = defineProps({
@@ -1395,7 +1399,7 @@ const selectRawMaterial = (row) => {
         materialHeight: row.height,
         materialColor: row.color,
         quantity: null,
-        standardDosage: null,
+        standardDosage: 1,
         lossRate: null,
         remark: "",
       });
@@ -1437,7 +1441,7 @@ const selectTechnology = (row) => {
       materialId: x.id,
       materialName: x.name,
       quantity: null,
-      standardDosage: null,
+      standardDosage: 1,
       lossRate: null,
       remark: "",
     }));

src/views/EHSD/saleContract/PriceSheetDetail.vue

@@ -284,7 +284,7 @@
                         </template>
                       </el-table-column>
                       <el-table-column prop="productColor" label="颜色" width="170" />
-                      <el-table-column prop="quantity" label="数量" width="100" />
+                      <!-- <el-table-column prop="quantity" label="数量" width="100" /> -->
                       <el-table-column prop="standardDosage" label="标准用量" width="100" />
                       <el-table-column prop="lossRate" label="损耗率(%)" width="100" />
                       <el-table-column prop="remark" label="备注" min-width="150" />

src/views/EHSD/saleContract/priceSheetEHSD/index.vue

@@ -325,7 +325,7 @@
                           </template>
                         </el-table-column>
                         <el-table-column prop="materialColor" label="颜色" width="170" />
-                        <el-table-column label="数量" width="150">
+                        <!-- <el-table-column label="数量" width="150">
                           <template #default="{ row, $index }">
                             <div style="width: 100%">
                               <el-form-item :prop="'quotationProductList.' + index + '.quotationProductBomList.' + $index + '.quantity'"
@@ -335,7 +335,7 @@
                               </el-form-item>
                             </div>
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column label="标准用量" width="150">
                           <template #default="{ row, $index }">
                             <div style="width: 100%">
@@ -734,7 +734,7 @@
                             </template>
                           </el-table-column>
                           <el-table-column prop="productColor" label="颜色" width="170" />
-                          <el-table-column prop="quantity" label="数量" width="100" />
+                          <!-- <el-table-column prop="quantity" label="数量" width="100" /> -->
                           <el-table-column prop="standardDosage" label="标准用量" width="100" />
                           <el-table-column prop="lossRate" label="损耗率(%)" width="100" />
                           <el-table-column prop="remark" label="备注" min-width="150" />
@@ -1051,7 +1051,7 @@
                             </template>
                           </el-table-column>
                           <el-table-column prop="productColor" label="颜色" width="170" />
-                          <el-table-column prop="quantity" label="数量" width="100" />
+                          <!-- <el-table-column prop="quantity" label="数量" width="100" /> -->
                           <el-table-column prop="standardDosage" label="标准用量" width="100" />
                           <el-table-column prop="lossRate" label="损耗率(%)" width="100" />
                           <el-table-column prop="remark" label="备注" min-width="150" />

src/views/EHSD/saleContract/priceSheetEstimate/index.vue

@@ -229,7 +229,7 @@
                           </template>
                         </el-table-column>
                         <el-table-column prop="productColor" label="颜色" width="170" />
-                        <el-table-column prop="quantity" label="数量" width="100" />
+                        <!-- <el-table-column prop="quantity" label="数量" width="100" /> -->
                         <el-table-column prop="standardDosage" label="标准用量" width="100" />
                         <el-table-column prop="lossRate" label="损耗率(%)" width="100" />
                         <el-table-column prop="remark" label="备注" min-width="150" />
@@ -750,7 +750,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="productColor" label="颜色" width="170" />
-                <el-table-column prop="quantity" label="数量" width="100" />
+                <!-- <el-table-column prop="quantity" label="数量" width="100" /> -->
                 <el-table-column prop="standardDosage" label="标准用量" width="100" />
                 <el-table-column prop="lossRate" label="损耗率(%)" width="100" />
                 <el-table-column prop="remark" label="备注" min-width="150" />

src/views/product/material/index.vue

@@ -786,6 +786,9 @@ const openModal = () => {
     fileList: [],
     productClassifyId: sourceList.value.pagination.productClassifyId || "",
   };
+  if (formData.data.productClassifyId) {
+    changeProductClassifyId(formData.data.productClassifyId);
+  }
   // if (currencyData.value && currencyData.value.length > 0) {
   //   formData.data.currency = currencyData.value[0].dictKey;
   //   formData.data.costCurrency = currencyData.value[0].dictKey;