Эх сурвалжийг харах

零售单添加删除接口/处理多选删除后表格勾选框异常问题

lph 1 жил өмнө
parent
commit
2c7c27e3c2

+ 8 - 0
zkqy-ui/src/api/system/retailMange.js

@@ -83,6 +83,14 @@ export function outboundDetails(params) {
   })
 }
 
+// 零售删除接口
+export function deleRetailOrder(data) {
+  return request({
+    url: `/system/order/RetailOrder/${data}`,
+    method: 'delete',
+  })
+}
+
 // 获取库存箱数
 export function getProductInventory(data) {
   return request({

+ 43 - 42
zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -15,7 +15,7 @@
                   type="primary"
                   size="mini"
                   @click="updateOrderData"
-                >保存修改
+                  >保存修改
                 </el-button>
                 <!-- <el-button
                     :disabled="tableData.length != 1"
@@ -40,14 +40,14 @@
                 >
                 </el-switch>
                 <el-button type="primary" size="mini" @click="readStateChange"
-                >{{ isStartReadNum ? "停止读数" : "开始读数" }}
+                  >{{ isStartReadNum ? "停止读数" : "开始读数" }}
                 </el-button>
                 <el-button
                   v-show="!printAuto"
                   type="success"
                   size="mini"
                   @click="printBtnHandler"
-                >打印
+                  >打印
                 </el-button>
               </div>
               <div class="weightWrap" v-show="excuteType == 1">
@@ -121,7 +121,7 @@
                   size="mini"
                   :disabled="chooseState"
                   @click="handleSaveOne(scope.row)"
-                >保存修改
+                  >保存修改
                 </el-button>
                 <el-button
                   v-else-if="excuteType == 3"
@@ -129,7 +129,7 @@
                   size="mini"
                   :disabled="chooseState"
                   @click="handleSuppleOne(scope.row)"
-                >打印
+                  >打印
                 </el-button>
 
                 <el-button
@@ -138,7 +138,7 @@
                   size="mini"
                   :disabled="chooseState"
                   @click="handleDeleteOne(scope.$index, scope.row)"
-                >删除
+                  >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -224,11 +224,11 @@
                       :value="item.id"
                     >
                       <span class="discribe" style="float: left">{{
-                          item.productionLineName
-                        }}</span>
+                        item.productionLineName
+                      }}</span>
                       <span
                         style="float: right; color: #8492a6; font-size: 13px"
-                      >{{ item.productionLineDepartment }}</span
+                        >{{ item.productionLineDepartment }}</span
                       >
                     </el-option>
                   </el-select>
@@ -489,8 +489,8 @@ import {
   removeProductCodeASInventory,
 } from "@/api/codeListManage/productCodeList";
 import codeListPrint from "@/utils/print/codeListPrint";
-import {getServerPrintData} from "@/utils/print/printUtils";
-import {v4 as uuidv4} from "uuid";
+import { getServerPrintData } from "@/utils/print/printUtils";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
   name: "ProductCodeList",
@@ -562,36 +562,36 @@ export default {
       },
       rules: {
         grossWeight: [
-          {required: true, message: "请输入重量", trigger: "change"},
+          { required: true, message: "请输入重量", trigger: "change" },
         ],
         packaging: [
-          {required: true, message: "请选择包装", trigger: "change"},
+          { required: true, message: "请选择包装", trigger: "change" },
         ],
         machineTool: [
-          {required: true, message: "请选择机台", trigger: "change"},
+          { required: true, message: "请选择机台", trigger: "change" },
         ],
         workShifts: [
-          {required: true, message: "请选择班次", trigger: "change"},
+          { required: true, message: "请选择班次", trigger: "change" },
         ],
         productionDate: [
-          {required: true, message: "请选择生产日期", trigger: "change"},
+          { required: true, message: "请选择生产日期", trigger: "change" },
         ],
-        levels: [{required: true, message: "请选择等级", trigger: "change"}],
+        levels: [{ required: true, message: "请选择等级", trigger: "change" }],
         // foreignTradeNumber: [
         //   { required: true, message: "请输入外贸号", trigger: "blur" },
         // ],
         canisterWeight: [
-          {required: true, message: "请选择筒重", trigger: "change"},
+          { required: true, message: "请选择筒重", trigger: "change" },
         ],
         boxWeight: [
-          {required: true, message: "请选择箱重/车重", trigger: "change"},
+          { required: true, message: "请选择箱重/车重", trigger: "change" },
         ],
         tubeColor: [
-          {required: true, message: "请选择管色", trigger: "change"},
+          { required: true, message: "请选择管色", trigger: "change" },
         ],
-        comPort: [{required: true, message: "请选择端口", trigger: "change"}],
+        comPort: [{ required: true, message: "请选择端口", trigger: "change" }],
         printFormat: [
-          {required: true, message: "请选择格式", trigger: "change"},
+          { required: true, message: "请选择格式", trigger: "change" },
         ],
       },
       dropDownData: {},
@@ -654,7 +654,7 @@ export default {
         suttle: null,
       },
       waiting: 0, // 等待次数 不论时间
-      confirmPrinting: false,// 确认打印
+      confirmPrinting: false, // 确认打印
       lastWeight: 0, // 上次得到的重量
     };
   },
@@ -694,7 +694,7 @@ export default {
   mounted() {
     // console.log(this.dict.type.packaging_type);
     console.log("mounted");
-    let {excuteType, qrCode} = this.$route.query;
+    let { excuteType, qrCode } = this.$route.query;
     if (excuteType == 2) {
       //修改
       this.handleUpdate(qrCode);
@@ -807,7 +807,6 @@ export default {
           return;
         }
 
-
         const weightDifference = Math.abs(weight - initialWeight);
         if (weightDifference > weightChangeThreshold) {
           initialWeight = weight;
@@ -815,7 +814,11 @@ export default {
           shouldPrint = true;
         } else {
           this.waiting++;
-          if (this.waiting == frequency && shouldPrint && this.confirmPrinting) {
+          if (
+            this.waiting == frequency &&
+            shouldPrint &&
+            this.confirmPrinting
+          ) {
             // 只有在应该打印且等待计数达标时才打印qwe
             this.waiting = 0;
             this.confirmPrinting = false;
@@ -1011,7 +1014,7 @@ export default {
     // 毛重改变回调
     changeGrossWeight(row) {
       console.log(row);
-      let {boxWeight, grossWeight, canisterWeight, canisterNum} = row;
+      let { boxWeight, grossWeight, canisterWeight, canisterNum } = row;
       if (!Number(grossWeight)) {
         row.suttle = 0;
         return;
@@ -1047,7 +1050,7 @@ export default {
     // 确认保存修改一条数据
     async handleSaveOne(row) {
       try {
-        let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
+        let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
           this.count;
         let rowData = JSON.parse(JSON.stringify(row));
 
@@ -1094,14 +1097,14 @@ export default {
       });
       this.changeGrossWeight(this.printTableData[0]);
       // 前端打印
-      // codeListPrint(this.printTableData, "printDom");
+      codeListPrint(this.printTableData, "printDom");
 
-      // if (this.excuteType == 1) {
-      //   this.tableData.push(this.printTableData[0]);
-      // }
+      if (this.excuteType == 1) {
+        this.tableData.push(this.printTableData[0]);
+      }
       // 后端打印
       console.log("newPrintHandler");
-      this.newPrintHandler();
+      // this.newPrintHandler();
     },
     // 获取机台选项数据
     async getLineOptionLsit() {
@@ -1130,7 +1133,7 @@ export default {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
           try {
-            let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
+            let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
               this.count;
             let rowData = newData.machineTool
               ? JSON.parse(JSON.stringify(newData))
@@ -1188,7 +1191,7 @@ export default {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
           try {
-            let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
+            let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
               this.count;
             let rowData = JSON.parse(JSON.stringify(this.tableData[0]));
             this.printTableData = [rowData];
@@ -1332,7 +1335,7 @@ export default {
     },
     // 计算净重
     getSuttle() {
-      let {boxWeight, canisterWeight, canisterNum} = this.form;
+      let { boxWeight, canisterWeight, canisterNum } = this.form;
       return (Number(boxWeight) - canisterWeight * canisterNum).toFixed(2);
     },
     // 表格点击回调
@@ -1375,7 +1378,7 @@ export default {
             this.$refs.form.validate(async (valid) => {
               if (valid) {
                 try {
-                  let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
+                  let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
                     this.count;
                   let rowData = JSON.parse(JSON.stringify(row));
                   this.printTableData = [rowData];
@@ -1427,7 +1430,7 @@ export default {
     // 获取所有批次数据
     async getAllBatchData(id) {
       try {
-        let payload = {machineTool: id};
+        let payload = { machineTool: id };
         let res = await finishedProductList(payload);
         if (res.code == 200) {
           this.batchData = res.data;
@@ -1456,8 +1459,7 @@ export default {
         if (res.code == 200) {
           this.dropDownData = res.data;
         }
-      } catch (error) {
-      }
+      } catch (error) {}
     },
     /** 查询产品码单列表 */
     getList() {
@@ -1658,8 +1660,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -3246,9 +3246,9 @@ export default {
           this.$message.success("删除成功");
           this.getList();
           this.myDelIds = [];
-          // this.$nextTick(() => {
-          //   this.$refs.tableRef?.clearSelection();
-          // });
+          this.$nextTick(() => {
+            this.$refs.tableRef?.clearSelection();
+          });
         } else {
           this.$message.error(res.msg);
         }

+ 16 - 14
zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -125,13 +125,12 @@
         @selection-change="handleSelectionChange"
         ref="tableRef"
         :cell-style="cellStyle"
-        :reserve-selection="true"
-        row-key="saleOrderId"
+        row-key="id"
       >
         <el-table-column
           type="selection"
           width="55"
-          reserve-selection
+          :reserve-selection="true"
           align="center"
         >
         </el-table-column>
@@ -224,7 +223,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-delete"
-                    @click="handleDelete(scope.row)"
+                    @click="myDeleteHandler(scope.row)"
                     >删除
                   </el-button>
                 </el-dropdown-item>
@@ -686,6 +685,7 @@ import {
   retailProductInvoiceInfo,
   submitRetailOrder,
   cancelRetailOrder,
+  deleRetailOrder,
 } from "@/api/system/retailMange.js";
 import { listData } from "@/api/system/tenant/data";
 import { getToken } from "@/utils/auth";
@@ -1073,9 +1073,9 @@ export default {
     // 产品名失焦
     handleProductBlur(productNo) {
       console.log("blur", productNo);
-      if (!productNo) {
-        this.productionOptions = this.allProductionOptions.slice(0, 500);
-      }
+      // if (!productNo) {
+      //   this.productionOptions = this.allProductionOptions.slice(0, 500);
+      // }
     },
     // 产品名称改变
     handleProductChange(productNo, row) {
@@ -1211,7 +1211,6 @@ export default {
     },
     // 自定义校验规则
     validateTableField(rule, value, callback) {
-      console.log("校验规则", rule, value);
       let { message, field } = rule;
       let index = field.split("-")[1],
         fieldName = field.split("-")[0];
@@ -1220,6 +1219,7 @@ export default {
         fieldName,
         this.productionTableData[Number(index)][fieldName]
       );
+      console.log(this.productionTableData);
       if (!this.productionTableData[Number(index)][fieldName]) {
         callback(new Error(message));
       } else {
@@ -1805,7 +1805,7 @@ export default {
       //     ]
       // );
       this.selection = selection;
-      this.myDelIds = selection.map((item) => item.saleOrderId);
+      this.myDelIds = selection.map((item) => item.id);
       console.log(this.myDelIds);
       this.ids = selection.map((item) => item.saleOrderSaleNo);
       this.single = selection.length != 1;
@@ -3058,17 +3058,19 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       });
-      let payLoad = row.saleOrderId ? [row.saleOrderId] : this.myDelIds;
+      let payLoad = row.id ? [row.id] : this.myDelIds;
+      payLoad = payLoad.join(",");
       console.log(payLoad);
+
       try {
-        let res = await delOrder(payLoad);
+        let res = await deleRetailOrder(payLoad);
         if (res.code === 200) {
           this.$message.success("删除成功");
           this.getList();
           this.myDelIds = [];
-          // this.$nextTick(() => {
-          //   this.$refs.tableRef?.clearSelection();
-          // });
+          this.$nextTick(() => {
+            this.$refs.tableRef?.clearSelection();
+          });
         } else {
           this.$message.error(res.msg);
         }