From dea45638361e81e2ced2bf46e95b15c46b70ebbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Apr 2023 12:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20=20=E5=8E=9F=E6=96=99=E5=BA=93=E4=BD=8D=E7=BB=84=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicData/WorkshopManage/ProductionLine.vue  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
index b59e0030d..5e8d99b06 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
@@ -171,8 +171,12 @@ export default {
           ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData,[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
@@ -203,8 +207,12 @@ export default {
           ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData,[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[