订单管理驳回和撤销接口调整/打印字段调整

zkqy-ui/src/utils/print/outBoundPrint.js

@@ -26,13 +26,14 @@ function outBoundPrint(data, domId, isRetail = false) {
     tableHeader = `<td style="width: 100px;">名称</td>
         <td style="width: 100px;">规格</td>
         <td style="width: 100px;">批号</td>
+        <td style="width: 100px;">等级</td>
         <td style="width: 100px;">单位</td>
         <td style="width: 100px;">数量</td>
         <td style="width: 100px;">单价</td>
         <td style="width: 100px;">金额</td>`
   }
 
-  let printContent = `<div style="width: 700px;position: relative;">
+  let printContent = `<div style="width: 800px;position: relative;">
 
     <div
       style="width: 100%;position: relative;text-align: center;display: flex;flex-direction: column;margin-bottom: 10px;">
@@ -52,7 +53,7 @@ function outBoundPrint(data, domId, isRetail = false) {
   let totalPrice = 0, totalWeight = 0;
   for (let i = 0; i < tableData.length; i++) {
     let item = tableData[i];
-    let { productName, productSpecifications, lotNumber, unit, productNumber, productUnitPrice, productAmounts } = item
+    let { productName, productSpecifications, lotNumber, unit, productNumber, productUnitPrice, productAmounts, productLevel } = item
     if (Number(productAmounts)) {
       totalPrice += Number(productAmounts);
     }
@@ -63,6 +64,7 @@ function outBoundPrint(data, domId, isRetail = false) {
       <td>${productName}</td>
       <td>${productSpecifications}</td>
       ${isRetail ? '' : '<td>' + lotNumber + '</td>'}
+      ${isRetail ? '' : '<td>' + productLevel + '</td>'}
       <td>${unit}</td>
       <td>${productNumber}</td>
       <td>${productUnitPrice}</td>
@@ -75,6 +77,7 @@ function outBoundPrint(data, domId, isRetail = false) {
         <td style="width: 100px;">合计</td>
         <td style="width: 100px;"></td>
         ${isRetail ? '' : '<td style="width: 100px;"></td>'}
+        ${isRetail ? '' : '<td style="width: 100px;"></td>'}
         <td style="width: 100px;"></td>
         <td style="width: 100px;">${totalWeight}</td>
         <td style="width: 100px;"></td>

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

@@ -1077,6 +1077,7 @@ export default {
       };
       let {
         id, //id
+        qrCodeId,
         qrCode, //序号
         canisterNum, //筒数
         grossWeight, //毛重
@@ -1089,7 +1090,7 @@ export default {
       let temp =
         id +
         "@" +
-        uuid +
+        qrCodeId +
         "@" +
         canisterNum +
         "@" +

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -798,12 +798,14 @@ export default {
       firstRowData.machineToolNo = this.lineOptions.find(
         (item) => item.id == this.form.machineTool
       ).productionLineNo;
+      firstRowData.qrCodeId = uuidv4().slice(0, 8); //生成总码单自己的qrCodeId
       this.printTableData = [firstRowData];
 
       // 保存打印数据
       let payLoad = {
         ...firstRowData,
       };
+
       let res = await productCodeList(payLoad);
       if (res.code !== 200) {
         this.$message.error("网络异常请稍后再试");
@@ -812,11 +814,11 @@ export default {
       let msg = this.isEdit ? "编辑" : "新增";
       if (res.code == 200) {
         // 后端打印
-        await this.newPrintHandler();
-        this.tableData = [];
-        this.$message.success(`总码单打印成功!`);
+        // await this.newPrintHandler();
+        // this.tableData = [];
+        // this.$message.success(`总码单打印成功!`);
         // 前端打印
-        // codeListPrint(this.printTableData, "printDom");
+        codeListPrint(this.printTableData, "printDom");
       } else {
         this.$message.error(`${msg}箱单失败`);
       }
@@ -900,6 +902,7 @@ export default {
       // 等级发生变化，重新获取码单号
       this.tableData = []; //清空打印记录
       let res = await getQrCode();
+      this.summertId = new Date().getTime(); //总码单id重新生成
       if (res.code == 200) {
         this.qrCode = res.msg;
       } else {
@@ -1539,6 +1542,7 @@ export default {
         // 手动打印  获取码单号
         this.getQrCodeHandle();
         // }
+        this.summertId = new Date().getTime(); //总码单id重新生成
       }
       this.currentRow = val;
       // this.continuePrintHandler(); //产品选择后,自动执行接续逻辑

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -58,6 +58,11 @@
         label="批号"
         prop="lotNumber"
       ></el-table-column>
+      <el-table-column
+        v-if="!isRetail"
+        label="等级"
+        prop="productLevel"
+      ></el-table-column>
       <el-table-column label="单位" prop="unit">
         <template slot-scope="scope">
           <el-input

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

@@ -165,7 +165,7 @@
                 prop="productSpecifications"
               >
               </el-table-column>
-              <el-table-column align="center" label="颜色" prop="colours">
+              <el-table-column align="center" label="颜色" prop="productColor">
               </el-table-column>
               <!-- <el-table-column align="center" label="批号" prop="lotNum">
               </el-table-column>

zkqy-ui/src/views/system/financialManage/saleAccountsReceivableDetail.vue

@@ -1019,11 +1019,12 @@ export default {
         .then(async () => {
           try {
             let payload = {
-              status: 3,
-              id: row.id,
-              otherCollectionId: row.otherCollectionId,
-              customerId: row.customerId,
-              receivedAmount: row.receivedAmount,
+              // status: 3,
+              // id: row.id,
+              // otherCollectionId: row.otherCollectionId,
+              // customerId: row.customerId,
+              // receivedAmount: row.receivedAmount,
+              ...row,
             };
             let res = await cancelAccountEntry(payload);
             if (res.code == 200) {
@@ -1072,11 +1073,12 @@ export default {
         .then(async () => {
           try {
             let payload = {
-              status: 3,
-              id: row.id,
-              otherCollectionId: row.otherCollectionId,
-              customerId: row.customerId,
-              receivedAmount: row.receivedAmount,
+              // status: 3,
+              // id: row.id,
+              // otherCollectionId: row.otherCollectionId,
+              // customerId: row.customerId,
+              // receivedAmount: row.receivedAmount,
+              ...row,
             };
             let res = await rejectHandler(payload);
             if (res.code == 200) {