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

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -63,8 +63,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -90,8 +88,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -117,8 +113,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -209,8 +203,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
         }]
       }
@@ -646,38 +638,10 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '库位组',
     field: 'locationGroupCode',
     sort: 'custom',
-    tableForm:{
+    isForm: false,
-      isInpuFocusShow: true, // 开启查询弹窗
+    isTableForm: false,
-      searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '库位组基础信息', // 查询弹窗标题
-      searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
-      searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位组代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位组基础信息', // 查询弹窗标题
-        searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
-        searchPage: LocationgroupApi.getLocationgroupPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
-      }
-    }
   },
+
   {
     label: '库位代码',
     field: 'locationCode',
@@ -694,9 +658,9 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'TRUE',
         isMainValue: false
       },{
-        key: 'locationGroupCode',
+        key: 'areaCode',
-        value: 'locationGroupCode',
+        value: 'areaCode',
-        message: '请选择库位组！',
+        message: '请选择区域代码！',
         isMainValue: true
       }]
     },
@@ -714,9 +678,9 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'TRUE',
           isMainValue: false
         },{
-          key: 'locationGroupCode',
+          key: 'areaCode',
-          value: 'locationGroupCode',
+          value: 'areaCode',
-          message: '请选择库位组！',
+          message: '请选择区域代码！',
           isMainValue: true
         }]
       }
@@ -727,36 +691,6 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '创建者Id',
-    field: 'creator',
-    sort: 'custom',
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '最后更新者Id',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    isTableForm: false,
-  },
   {
     label: '操作',
     field: 'action',