From e0dee287f5e51a3a6901379d42646d92d588386a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 19:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8C=89=E9=92=AE+=E4=B8=8B=E6=9E=B6=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E4=B8=8B=E7=89=A9=E6=96=99=E5=88=86=E7=BB=84=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/downShelfStrategy/AddForm.vue    | 23 +++++++++++++++++--
 .../productionreturnRequestMain.data.ts       |  3 ++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 47ed9e9e9..ed8ffd727 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -157,13 +157,29 @@
                     :value="cur.value"
                   />
                 </el-select>
-                <el-input key="物料分组"
+                <el-select key="物料分组"
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemGroup'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_GROUP)"
+                    :key="'物料分组Value'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <!-- <el-input key="物料分组"
                   v-model="item.Value"
                   placeholder="请输入物料分组，多个物料分组以逗号分隔"
                   clearable
                   style="flex: 1"
                   v-else-if="item.ParamCode == 'ItemGroup'"
-                />
+                /> -->
                 <el-input key="项目"
                   v-model="item.Value"
                   placeholder="请输入项目，多个项目以逗号分隔"
@@ -1064,6 +1080,9 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+
+  console.log('规则条件',formData.value.condition)
+  
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 97ccff14f..b31c3985a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -206,6 +206,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTable: false,
+    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -431,7 +432,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     isForm: false,
-    isSearch: false,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {