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

src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts

@@ -164,17 +164,17 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',
@@ -267,9 +267,9 @@ export const CountadjustRecordMainRules =reactive({
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
-  ],
+  // interfaceType: [
+  //   { required: true, message: '请选择接口类型', trigger: 'change' }
+  // ],
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
@@ -368,6 +368,22 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -455,17 +471,17 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',