From 10fad9c0c67e55b1fc37bc008f7138bcc5511aad Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 17 Sep 2024 23:34:38 +0800
Subject: [PATCH] =?UTF-8?q?9/17=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderAllotCardComponents.vue | 2 +-
 src/views/collect/CollectOrderNew.vue                 | 8 ++++++--
 src/views/collect/IoCreateOrder.vue                   | 4 ++--
 src/views/collect/PanelOrderUpload.vue                | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index c25c441c..e63e3061 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -699,7 +699,7 @@ export default {
       this.getList();
     },
     onSubmit(_this) {
-      debugger
+      // debugger
       if (_this == null)
         _this = this
       _this.filterQuery.page = 1;
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index 36b25291..8623b1e0 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -518,7 +518,8 @@ export default {
       curRow: null,
       panelALive: false,
       busQuery: {
-        workplaceCode: '',
+        busKey: '',
+        workplaceCode: null,
         page: 1,
         limit: 100
       },
@@ -674,7 +675,9 @@ export default {
         _this.errQuery.startTime = null;
         _this.errQuery.endTime = null;
       }
+      // _this.errQuery = _this.filterQuery
       _this.errQuery.tagStatus = 4;
+      _this.errQuery.tagStatusList = [4]
       orderPage(_this.errQuery).then(res => {
         _this.loading = false
         _this.errList = res.data.list || []
@@ -887,7 +890,7 @@ export default {
         })
         .catch(() => {
         });
-    }
+    },
   },
   created() {
     getHead("prescribeDownloadOrigin", "1").then((re) => {
@@ -911,6 +914,7 @@ export default {
     // this.filterQuery.tagStatus = String(this.tagStatus)
     // this.filterQuery.tagStatusList = this.tagStatusList
     this.findWorkPlace(this, '')
+    this.getWorkBindBusTypes(this, '')
   }
 
 }
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 535228ab..ee685cda 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -131,10 +131,10 @@
           </el-col>
 
           <el-col :span="6" v-if="!isLinkDisabled">
-            <el-form-item prop="busType" class="query-form-item" label="业务类型:">
+            <el-form-item prop="busType" class="query-form-item" label="业务名称:">
               <el-select
                 v-model="orderFormData.busType"
-                placeholder="业务类型"
+                placeholder="业务名称"
                 style="width: 90%"
                 :disabled="corpOrderIdDisabled"
                 filterable
diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue
index e7870873..8daec9e9 100644
--- a/src/views/collect/PanelOrderUpload.vue
+++ b/src/views/collect/PanelOrderUpload.vue
@@ -13,7 +13,7 @@
               >
                 <el-input
                   v-model="filterQuery[item.columnName]"
-                  :placeholder="item.columnDesc"
+                  :placeholder="item.columnDesc == '模糊查询' ? '单据号/来源系统/收货方/发货方' : item.columnDesc"
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                   clearable