From 4e4bbed21be4b3333c1a6908bcfff36d4dfe1f99 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 3 Jun 2024 18:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=BC=96=E8=BE=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=9F=E4=B8=80=E5=95=86=E5=9C=BA=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/checkInventoryTask/createTask.vue  |  2 +-
 .../inventory/distrilbutionBillLading.vue           | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index bfc050ee..7182d0ea 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -2648,7 +2648,7 @@ const DelayButton = () => {
 
 /** 未盘点数据导出 */
 const handleUncountedExport = () => {
-  ElMessageBox.confirm('是否导出未盘点数据?').then(async () => {
+  ElMessageBox.confirm(InventoryState.value ? '导出未盘点数据' : '导出已盘点数据').then(async () => {
     try {
       TcPdloading.value = true;
       const res = await postExportContrastStockInfo({
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 54d682de..24621a63 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -465,7 +465,7 @@
         class="addTable"
         ref="multipleTable"
         :columnList="columnList"
-        :tableData="dataOrder"
+        :tableData="dataOrder" 
         :loading="loading"
         @inputTxt="inputsc"
         @timeCheck="timesc"
@@ -2270,14 +2270,21 @@ export default {
     },
     //订单选择确定
     callFordeliveryOrder() {
+      if(!this.selectionList.length){
+        this.$message.warning('请选择订单');
+        return
+      }
       console.log(this.selectionList, 'this.selectionList');
       let scID = this.selectionList[0].mallId; //获取第一个商场DI用于匹配后面的是否选择的一样
       let mallIdState = this.selectionList.find(res => res.mallId != scID);
-      if (mallIdState) {
+      let dataListscID = null;
+      if(this.dataList.length){
+        dataListscID = this.dataList.find(res=>res.mallId != scID)
+      }
+      if (mallIdState || dataListscID) {
         this.$message.warning('请选择同一商场');
         return;
       }
-
       console.log('111 :>> ', 111);
       let st = false;
       let sts = false;