From 17cc768cc0b9b44c57b4059aed2d03d588fdbec7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 18 Sep 2024 15:40:16 +0800
Subject: [PATCH] =?UTF-8?q?9/18=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E4=B8=8B=E8=B4=A7...=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue      | 9 +++++++++
 src/views/collect/IoSplitOperateCode.vue | 8 +++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index ea76f08c..34e0eb4b 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1853,6 +1853,7 @@ export default {
         this.findInvListByUser();
         this.initBusType();
         this.findFromInvList();
+        // this.getWorkBindBusTypes(null);
       } else {
         //新增页面
         this.corpOrderIdDisabled = false;
@@ -1983,8 +1984,16 @@ export default {
       this.workplaceId = this.$route.query.workplaceId
       this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
       this.orderFormData.splitBusType = "YPCF002"
+    }else {
+      if (this.orderQuery != null){
+        this.orderFormData.workPlaceCode = String(this.orderQuery.workPlaceCode);
+        // if (this.orderQuery.splitBusType != null){
+        //   this.orderFormData.busType = this.orderQuery.splitBusType;
+        // }
+      }
     }
 
+
   },
 };
 </script>
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index f4310178..61e8433d 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -11,7 +11,7 @@
                             :label="item.columnDesc+`:`" :key="item.id">
                 <el-input
                   v-model="filterQuery[item.columnName]"
-                  :placeholder="item.columnDesc == '模糊查询' ? '产品通用名/规格/所属工位/业务名称' : item.columnDesc"
+                  :placeholder="item.columnDesc == '模糊查询' ? '所属工位/业务名称/单据号' : item.columnDesc"
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                   clearable
@@ -945,13 +945,11 @@ export default {
         id: "",
         billNo: null,
         mainAction: null,
-        action: null,
-        statusType: null,
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: this.$store.getters.locInvCode,
+        keywords:null
       };
       this.actDateRange = [];
       this.getList();
@@ -1276,7 +1274,7 @@ export default {
   },
   created() {
     this.getInvList(this);
-    this.getBusType(this);
+    this.getWorkBindBusTypes(this,"");
     this.findWorkPlace(this, "");
 
     this.splitType = this.$route.query.splitType;