From f39038f960a0da988cc324a32938cc47f5d00b9b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 18 Sep 2024 10:49:48 +0800
Subject: [PATCH] =?UTF-8?q?9/18=20=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=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        | 47 +++++++++++++++-------
 src/views/collect/IoSplitFifoCodePanel.vue |  2 +-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index ee685cda..ea76f08c 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -117,13 +117,13 @@
               >
                 <el-option
                   v-for="item in curWorkPlaces"
-                  :key="item.workplaceId"
-                  :label="item.workplaceName"
-                  :value="item.workplaceId"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
                 >
-                  <span style="float: left">{{ item.workplaceName }}</span>
+                  <span style="float: left">{{ item.label }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.workplaceId
+                      item.code
                     }}</span>
                 </el-option>
               </el-select>
@@ -330,6 +330,7 @@ import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 
 export default {
   name: "ioCreateOrder",
@@ -1005,19 +1006,37 @@ export default {
     },
 
     //获取当前工位
+    // findCurWorkPlaces(val) {
+    //   let query = {
+    //     userId: this.userInfo.userId,
+    //     page: 1,
+    //     limit: 100,
+    //   }
+    //   getUserBindWork(query).then((res) => {
+    //     this.curWorkPlaces = res.data.list || [];
+    //     if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
+    //       this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
+    //       this.defaultSplitType()
+    //     }
+    //   })
+    // },
     findCurWorkPlaces(val) {
       let query = {
-        userId: this.userInfo.userId,
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
         page: 1,
-        limit: 100,
+        limit: 10,
       }
-      getUserBindWork(query).then((res) => {
-        this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
-          this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
-          this.defaultSplitType()
-        }
-      })
+      filterWorkOptimize(query)
+        .then((response) => {
+          this.loading = false;
+          this.curWorkPlaces = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.curWorkPlaces = [];
+        });
     },
 
 
diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index eb4595ba..8d8817a0 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -37,7 +37,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