Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/components/SearchTable/src/SearchTable.vue

@@ -98,28 +98,38 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  // console.log(99, rowRef.value)
+  console.log(99, rowRef.value)
-  // console.log(100, searchData)
+  console.log(100, searchData)
-  // console.log(101, searchConditionRef.value)
+  console.log(101, searchConditionRef.value)
   // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
-  if (searchConditionRef.value) {
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
-    Object.keys(searchConditionRef.value).forEach(key => {
   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,
     filters: searchData.filters

src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@@ -361,12 +361,12 @@ export const BusinesstypeRules = reactive({
   itemStatuses: [
     { required: true, message: '请选择可用物料状态范围', trigger: 'change' }
   ],
-  outTransactionType: [
+  // outTransactionType: [
-    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  //   { required: true, message: '请输入出库事务类型', trigger: 'blur' }
-  ],
+  // ],
-  inTransactionType: [
+  // inTransactionType: [
-    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  //   { required: true, message: '请输入入库事务类型', trigger: 'blur' }
-  ],
+  // ],
   useOnTheWay: [
     { required: true, message: '请输入使用在途库', trigger: 'blur' }
   ],

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',