From c7be9e729d72547b76fb2206f1edba509b4c3d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 21 Mar 2024 12:05:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchTable/src/SearchTable.vue           | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 299c1070b..011ff68f4 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -98,27 +98,37 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  // console.log(99, rowRef.value)
-  // console.log(100, searchData)
-  // console.log(101, searchConditionRef.value)
+  console.log(99, rowRef.value)
+  console.log(100, searchData)
+  console.log(101, searchConditionRef.value)
   // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
-  if (searchConditionRef.value) {
-    Object.keys(searchConditionRef.value).forEach(key => {
-      if (searchData.filters) {
-          searchData.filters.push({
-            action: "==",
-            column: key,
-            value: searchConditionRef.value[key]
-          })
-        // }
-      } else {
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
+  if (searchData.filters) {
+    if (searchConditionRef.value.filters) {
+      Object.keys(searchConditionRef.value.filters).forEach(key => {
+        searchData.filters.push(searchConditionRef.value.filters[key])
+      });
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters.push({
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      });
+    }
+  } else {
+    if (searchConditionRef.value.filters) {
+      searchData.filters = searchConditionRef.value.filters
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
         searchData.filters = [{
           action: "==",
           column: key,
           value: searchConditionRef.value[key]
         }]
-      }
-    });
+      });
+    }
   }
   tableObjectRef.value.params = {
     isSearch: true,

From c0431773d59e5ec7c3d7ac37164e68a0d290454c Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 21 Mar 2024 13:00:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8E=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businesstype/businesstype.data.ts                | 12 ++++++------
 .../factoryModeling/workstation/index.vue            |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index c50ffcadc..71710f119 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -361,12 +361,12 @@ export const BusinesstypeRules = reactive({
   itemStatuses: [
     { required: true, message: '请选择可用物料状态范围', trigger: 'change' }
   ],
-  outTransactionType: [
-    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
-  ],
-  inTransactionType: [
-    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
-  ],
+  // outTransactionType: [
+  //   { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  // ],
+  // inTransactionType: [
+  //   { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  // ],
   useOnTheWay: [
     { required: true, message: '请输入使用在途库', trigger: 'blur' }
   ],
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 7002ebef5..96151f4ec 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -212,7 +212,7 @@ Workstation.allSchemas.tableFormColumns.map(item => {
       item.form.componentProps.searchCondition = [
       {
         key: 'areaType',
-        value: 'RAW',
+        value: 'WIP',
       },
       {
           key: 'available',
@@ -224,7 +224,7 @@ Workstation.allSchemas.tableFormColumns.map(item => {
       item.form.componentProps.searchCondition = [
       {
         key: 'areaType',
-        value: 'FG',
+        value: 'WIP',
       },
       {
           key: 'available',