问题修复

vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

@@ -47,7 +47,6 @@
                 />
               </el-form-item>
             </el-col>
-           
           </el-form-item>
 
           <!-- <el-form-item label="底盘号码">
@@ -565,6 +564,7 @@ export default {
       //批量删除
       var params = [];
       let myalert = ""; //声明变量，其变量必须在此声明后使用
+      let myalertcount = [];
       if (row) {
         //单行
         params.push(row.id);
@@ -577,11 +577,36 @@ export default {
         });
         myalert = "选中项";
       }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
+      console.log("作废查询参数：" + JSON.stringify(params));
+      this.$axios
+        .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
+        .then((response) => {
+          //alert(response.status);
+          const index = this.list.indexOf(row);
+          if (response.status === false) {
+            this.$message({
+              message: response.message,
+              type: "error",
+            });
+            return;
+          } else {
+            this.fileQuery.dataname = JSON.stringify(response);
+            response.forEach((itemsss) => {
+              myalertcount.push(itemsss.billNum);
+            });
+            console.log(
+              "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                JSON.stringify(this.fileQuery.dataname)
+            );
+            this.$confirm(
+              "是否作废选中的" + response.length + "条记录?",
+              "提示",
+              {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
-      })
+              }
+            )
               .then(() => {
                 this.$axios
                   .posts("/api/newjit/MenBanPackingList/scrap", params)
@@ -602,6 +627,9 @@ export default {
                   message: "已取消操作",
                 });
               });
+          }
+        })
+        .catch(() => {});
     },
     fetchData(id) {
       //循环动态

vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

@@ -454,7 +454,8 @@ export default {
       ifr.setAttribute("name", "printPdf" + date);
       ifr.src = window.URL.createObjectURL(blob);
       document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
+      this.doPrint("printPdf" + date);
+      alert("ifr.src:" + JSON.stringify(ifr.src));
       window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
       this.dialogFormVisible = false;
     },
@@ -581,6 +582,7 @@ export default {
       //批量删除
      var params = [];
       let myalert = ""; //声明变量，其变量必须在此声明后使用
+      let myalertcount = [];
       if (row) {
         //单行
         params.push(row.id);
@@ -593,11 +595,36 @@ export default {
         });
         myalert = "选中项";
       }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
+      console.log("作废查询参数：" + JSON.stringify(params));
+      this.$axios
+        .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
+        .then((response) => {
+          //alert(response.status);
+          const index = this.list.indexOf(row);
+          if (response.status === false) {
+            this.$message({
+              message: response.message,
+              type: "error",
+            });
+            return;
+          } else {
+            this.fileQuery.dataname = JSON.stringify(response);
+            response.forEach((itemsss) => {
+              myalertcount.push(itemsss.billNum);
+            });
+            console.log(
+              "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                JSON.stringify(this.fileQuery.dataname)
+            );
+            this.$confirm(
+              "是否作废选中的" + response.length + "条记录?",
+              "提示",
+              {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
-      })
+              }
+            )
               .then(() => {
                 this.$axios
                   .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
@@ -618,6 +645,9 @@ export default {
                   message: "已取消操作",
                 });
               });
+          }
+        })
+        .catch(() => {});
     },
     fetchData(id) {
       //循环动态

vue/src/views/pg-fis/basedate/m100Online/index.vue

@@ -701,6 +701,12 @@ export default {
         width: 120,
       });
 
+      tempsTabs.push({
+        label: "柱护板状态",
+        prop: "billStatus",
+        width: 120,
+      });
+
       tempsTabs.push({
         label: "备注",
         prop: "remark",
@@ -867,7 +873,11 @@ export default {
       if (this.listQuery.state == 1) {
         this.listQuery.billStatus = this.listQuery.state[0];
       }
- 
+      if (this.listQuery.productType === 2) {
+        this.listQuery.ZHBBillStatus = 2;
+      } else {
+        this.listQuery.ZHBBillStatus = 0;
+      }
       this.$axios
         .gets("/api/newjit/bill-m100/list", this.listQuery)
         .then((response) => {

vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@@ -437,7 +437,7 @@ export default {
         ],
       },
       billState: [
-        { id: 2, name: "已匹配" },
+        { id: 2, name: "未打印" },
         { id: 3, name: "已打印" },
       ],
       valueSelect: "",
@@ -494,6 +494,7 @@ export default {
         ProductLine: undefined,
         BillStatus: undefined,
         CanNotPrint: false,
+        ZHBBillStatus:undefined,
       },
       listExportQuery: {
         erpAssemblyCode: undefined,
@@ -631,6 +632,12 @@ export default {
         width: 120,
       });
 
+      tempsTabs.push({
+        label: "柱护板状态",
+        prop: "billStatus",
+        width: 120,
+      });
+
       tempsTabs.push({
         label: "备注",
         prop: "remark",
@@ -876,7 +883,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
+        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
       }
       if (column.property == "onlineTime" || column.property == "receiveTime") {
         var date = row[column.property];
@@ -897,6 +904,16 @@ export default {
       } else {
         this.listQueryList.SkipCount = (this.page - 1) * 15;
       }
+      if (this.listQuery.productType === 2) {
+        this.listQueryList.ZHBBillStatus = 2;
+      } else {
+        this.listQueryList.ZHBBillStatus = 0;
+      }
+      if (this.listQuery.productType === 2) {
+        this.listQuery.ZHBBillStatus = 2;
+      } else {
+        this.listQuery.ZHBBillStatus = 0;
+      }
       this.listQueryList.BillStatus = 2; //状态
       this.listQueryList.ProductLine = this.listQuery.productLine; //产线
       this.listQueryList.CanNotPrint = false; //不可打印
@@ -2019,6 +2036,13 @@ export default {
         this.listQuery.state = [];
         this.isShowState = false;
       }
+      if (this.listQuery.productType === 2) {
+        this.listQueryList.ZHBBillStatus = 2;
+        
+      } else {
+        this.listQueryList.ZHBBillStatus = 0;
+        
+      }
     },
     /*单据状态变更 */
     checkedListChange(index) {