From 92625c7f4b24b292a917c21f7685c257239f6dbb Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 29 Sep 2024 15:40:52 +0800
Subject: [PATCH] =?UTF-8?q?9/29=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/cargowWorkplaceManage.vue |  1 +
 src/views/basic/workplace/workplaceManage.vue       |  2 ++
 .../collect/CollectOrderAllotCardComponents.vue     |  3 +--
 src/views/collect/CollectOrderNew.vue               |  1 -
 src/views/collect/IoSplitOperateCode.vue            | 13 +++++++++----
 .../collect/prescribe/prescribeDownloadDialog.vue   |  3 +++
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index 5da9048c..8677d73c 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -710,6 +710,7 @@ export default {
         deptCode: this.$store.getters.locDeptCode
       }
       this.getList()
+      this.collectList = []
     },
     changeDept() {
       this.collectList = []
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 6ec7fcbb..084a942f 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -960,6 +960,8 @@ export default {
         deptCode: this.$store.getters.locDeptCode,
       }
       this.getList()
+      this.busTypeList = []
+      this.userList = []
     },
     getList() {
       listPage(this.query).then(res => {
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 2ae52137..21b2e6a6 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -54,7 +54,6 @@
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   filterable
                   remote
-                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
                   clearable>
                   <el-option
                     v-for="item in options[item.clickFuc]"
@@ -571,7 +570,7 @@ export default {
     },
     getWorkBindBusTypes(_this, query) {
       _this.busQuery.workplaceCode = query
-      getWorkBindBusTypes(this.busQuery).then(res => {
+      getWorkBindBusTypes(_this.busQuery).then(res => {
         if (res.code == 20000) {
           let busTypes = res.data.list || [];
           // _this.options.getWorkPlace = res.data.list || [];
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index 7ead57ed..b0bff52f 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -44,7 +44,6 @@
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   filterable
                   remote
-                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
                   clearable>
                   <el-option
                     v-for="item in options[item.clickFuc]"
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index 3fab3630..b6c5f995 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -953,7 +953,8 @@ export default {
         startTime: null,
         endTime: null,
         workPlaceCode:null,
-        keyWords:null
+        keyWords:null,
+        busType: null
       };
       this.actDateRange = [];
       this.getList();
@@ -1196,18 +1197,22 @@ export default {
       this.getCodeList();
     },
     onBizReset() {
+      if (isBlank(this.currentRow.billNo)){
+        return this.$message.error("请先选择需要查询的单据")
+      }
       this.bizQuery = {
         productName: null,
         orderIdFk: null,
         page: 1,
         limit: 10
       };
+      this.getBizDetailList();
 
-      if (!isBlank(this.currentRow.billNo)) {
-        this.getBizDetailList();
-      }
     },
     onBizSubmit() {
+      if (isBlank(this.currentRow.billNo)){
+        return this.$message.error("请先选择需要查询的单据")
+      }
       this.bizQuery.page = 1;
       this.getBizDetailList();
     },
diff --git a/src/views/collect/prescribe/prescribeDownloadDialog.vue b/src/views/collect/prescribe/prescribeDownloadDialog.vue
index 24fe13fc..3a75e76e 100644
--- a/src/views/collect/prescribe/prescribeDownloadDialog.vue
+++ b/src/views/collect/prescribe/prescribeDownloadDialog.vue
@@ -372,6 +372,9 @@ export default {
       // this.getList();
     },
     downloadPrescription(status) {
+      if (this.filterQuery.busType == null){
+        return this.$message.error("请选择业务名称")
+      }
       if(status == 1){
         if (this.selectList.length == 0) {
           this.$message.error("请选择下载处方")