零售新增添加新的字段/处理产品下拉框数据异常问题/修改待生产状态的订单按钮逻辑/成品出入库日志部分字段调整

zkqy-ui/src/views/orderMange/index.vue

@@ -291,11 +291,11 @@
                 <el-input size="small" v-model="formData.saleNo"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item prop="lotNumber" label="批号:">
                 <el-input size="small" v-model="formData.lotNumber"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item prop="saleDate" label="日期:">
                 <el-date-picker
@@ -410,6 +410,7 @@
                       @change="
                         handleProductChange(scope.row.productNo, scope.row)
                       "
+                      @blur="handleProductBlur(scope.row.productNo)"
                     >
                       <el-option
                         v-for="item in productionOptions"
@@ -1136,7 +1137,13 @@ export default {
         outBoundPrint(res.data, "printDom", false);
       }
     },
-
+    // 产品名失焦
+    handleProductBlur(productNo) {
+      console.log("blur", productNo);
+      if (!productNo) {
+        this.productionOptions = this.allProductionOptions.slice(0, 500);
+      }
+    },
     // 产品名称改变
     handleProductChange(productNo, row) {
       console.log(productNo);
@@ -1488,8 +1495,9 @@ export default {
               btnName: "出库明细",
               btnType: "OutDetail",
               btnIcon: "",
+              // btnShowCondition: "[]",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"}]',
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -1497,8 +1505,9 @@ export default {
               btnName: "打印出库单",
               btnType: "printOutBound",
               btnIcon: "",
+              // btnShowCondition: "[]",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"}]',
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -1508,7 +1517,8 @@ export default {
               btnIcon: "",
               // btnShowCondition: "[]",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"}]',
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"}]',
+              // ,{"fieldName":"sale_order.status","mark":"3","refValue":"3"}  3待生产
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },

zkqy-ui/src/views/orderMange/productInRecord/index.vue

@@ -142,10 +142,11 @@
           {{ getDictLabel(scope.row.packaging, dict.type.packaging_type) }}
         </template>
       </el-table-column>
-      <el-table-column label="箱数" align="center" prop="totalBoxNum" />
+      <el-table-column label="箱号" align="center" prop="boxNum" />
       <!-- <el-table-column label="筒数" align="center" prop="canisterNum" /> -->
 
-      <el-table-column label="毛重" align="center" prop="totalGrossWeight" />
+      <el-table-column label="毛重" align="center" prop="grossWeight" />
+      <el-table-column label="净重" align="center" prop="suttle" />
       <el-table-column label="班次" align="center" prop="workShifts" />
       <!-- <el-table-column label="净重" align="center" prop="suttle" /> -->
       <el-table-column

zkqy-ui/src/views/orderMange/productOutRecord/index.vue

@@ -141,10 +141,11 @@
           {{ getDictLabel(scope.row.packaging, dict.type.packaging_type) }}
         </template>
       </el-table-column>
-      <el-table-column label="箱数" align="center" prop="totalBoxNum" />
+      <el-table-column label="箱号" align="center" prop="boxNum" />
       <!-- <el-table-column label="筒数" align="center" prop="canisterNum" /> -->
 
-      <el-table-column label="毛重" align="center" prop="totalGrossWeight" />
+      <el-table-column label="毛重" align="center" prop="grossWeight" />
+      <el-table-column label="净重" align="center" prop="suttle" />
       <el-table-column label="班次" align="center" prop="workShifts" />
       <!-- <el-table-column label="净重" align="center" prop="suttle" /> -->
       <el-table-column

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -423,6 +423,7 @@
                       @change="
                         handleProductChange(scope.row.productNo, scope.row)
                       "
+                      @blur="handleProductBlur(productNo)"
                     >
                       <el-option
                         v-for="item in productionOptions"
@@ -1069,7 +1070,13 @@ export default {
         outBoundPrint(res.data, "printDom", true);
       }
     },
-
+    // 产品名失焦
+    handleProductBlur(productNo) {
+      console.log("blur", productNo);
+      if (!productNo) {
+        this.productionOptions = this.allProductionOptions.slice(0, 500);
+      }
+    },
     // 产品名称改变
     handleProductChange(productNo, row) {
       if (!productNo) {
@@ -1561,6 +1568,7 @@ export default {
             }
           } else {
             //新增
+            payload.orderType = 1;
             let res = await addRetailOrder(payload);
             if (res.code == 200) {
               this.$message.success("添加成功");