Merge remote-tracking branch 'origin/master_hella' into master_hella

src/views/wms/countManage/count/countJobMain/countJobMain.data.ts

@@ -56,22 +56,22 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '仓库代码',
+  //   label: '仓库代码',
-    field: 'warehouseCode',
+  //   field: 'warehouseCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '库位代码',
+  //   label: '库位代码',
-    field: 'locationCode',
+  //   field: 'locationCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',

src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@@ -88,7 +88,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: true,
     form: {
-      value: 'LOCATION_CODE'
+      value: 'locationCode'
     }
 
   },

src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts

@@ -40,14 +40,14 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '仓库代码',
+  //   label: '仓库代码',
-    field: 'warehouseCode',
+  //   field: 'warehouseCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '阶段',
     field: 'stage',

src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts

@@ -54,15 +54,6 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
   {
     label: '计划单号',
     field: 'planNumber',
@@ -99,15 +90,15 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
+  // {
-    label: '仓库代码',
+  //   label: '仓库代码',
-    field: 'warehouseCode',
+  //   field: 'warehouseCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isSearch: true,
+  //   isSearch: true,
-  },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',