From 12c87364ed4067e3c9b623ac2d43816bc8a84052 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Mon, 31 Jul 2023 11:14:37 +0800
Subject: [PATCH] 入库/出库批量生成任务页面问题修改

---
 ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue   | 53 +++++++++++++++++++++++++++--------------------------
 ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue | 39 ++++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index b921d2f..1bdcd05 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -345,39 +345,40 @@ export default {
       this.$refs.modalForm4.edit(record);
       this.$refs.modalForm4.title = "选择容器状态";
     },
-    createBatchTask(){
-      if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！')
+    createBatchTask() {
+      if (this.selectedRowKeys.length <= 1) {
+        this.$message.warning('至少选择两条记录！')
         return
-      }else{
-        console.log("createBatchTask");
-        var receiptContainerHeaderList =[];
-        var receiptContainerHeader= null;
+      } else {
+        var receiptContainerHeaderList = []
+        var receiptContainerHeader = null
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          if (this.selectionRows[a].status == 0) {
-            if (receiptContainerHeader == null)
-            {
-              receiptContainerHeader = this.selectionRows[a];
+          if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+            if (receiptContainerHeader == null) {
+              receiptContainerHeader = this.selectionRows[a]
             }
-            if (receiptContainerHeader.taskType == this.selectionRows[a].taskType)
-            {
-              receiptContainerHeaderList.push(this.selectionRows[a]);
+            if (receiptContainerHeader.taskType == this.selectionRows[a].taskType) {
+              receiptContainerHeaderList.push(this.selectionRows[a])
             }
           }
         }
-        if(receiptContainerHeader.taskType == 100) {
-          createReceiptBatchTask(receiptContainerHeaderList).then((res) => {
-            this.loading = false;
-            if (res.success) {
-              this.$message.success(res.message);
-            } else {
-              this.$message.error(res.message);
-            }
-            this.searchQuery();
-          });
+        if (receiptContainerHeaderList.length > 1) {
+          if (receiptContainerHeader.taskType == 100) {
+            createReceiptBatchTask(receiptContainerHeaderList).then(res => {
+              this.loading = false
+              if (res.success) {
+                this.$message.success(res.message)
+              } else {
+                this.$message.error(res.message)
+              }
+              this.searchQuery()
+            })
+          } else {
+            this.$refs.modalForm2.batchEdit(receiptContainerHeaderList)
+            this.$refs.modalForm2.title = '选择出库口'
+          }
         } else {
-          this.$refs.modalForm2.batchEdit(receiptContainerHeaderList);
-          this.$refs.modalForm2.title = "选择出库口";
+          this.$message.error("至少选择两条符合条件的记录！")
         }
       }
     },
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
index 25efc69..d256eaf 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
@@ -296,28 +296,29 @@ export default {
       this.$refs.modalForm2.edit(record);
       this.$refs.modalForm2.title = "选择出库口";
     },
-    createBatchTask(){
-      if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！')
+    createBatchTask() {
+      if (this.selectedRowKeys.length <= 1) {
+        this.$message.warning('至少选择两条记录！')
         return
-      }else{
-        console.log("createBatchTask");
-        var shipmentContainerHeaderList =[];
-        var shipmentContainerHeader= null;
+      } else {
+        var shipmentContainerHeaderList = []
+        var shipmentContainerHeader = null
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
-         if (this.selectionRows[a].status == 0) {
-           if (shipmentContainerHeader == null)
-           {
-             shipmentContainerHeader = this.selectionRows[a];
-           }
-           if (shipmentContainerHeader.taskType == this.selectionRows[a].taskType)
-           {
-             shipmentContainerHeaderList.push(this.selectionRows[a]);
-           }
-         }
+          if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+            if (shipmentContainerHeader == null) {
+              shipmentContainerHeader = this.selectionRows[a]
+            }
+            if (shipmentContainerHeader.taskType == this.selectionRows[a].taskType) {
+              shipmentContainerHeaderList.push(this.selectionRows[a])
+            }
+          }
+        }
+        if (shipmentContainerHeaderList.length > 0) {
+          this.$refs.modalForm2.batchEdit(shipmentContainerHeaderList)
+          this.$refs.modalForm2.title = '选择出库口'
+        } else {
+          this.$message.error("至少选择两条符合条件的记录！")
         }
-        this.$refs.modalForm2.batchEdit(shipmentContainerHeaderList);
-        this.$refs.modalForm2.title = "选择出库口";
       }
     },
     cancelBatchTask() {
--
libgit2 0.22.2