diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 11c707e11..0b9a9258b 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -5,6 +5,28 @@ import { dateFormatter } from '@/utils/formatTime'
  * @returns {Array} 盘点任务主表
  */
 export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -90,18 +112,6 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '过期时间',
     field: 'expiredTime',
@@ -123,127 +133,13 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '状态',
-    field: 'jobStageStatus',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '承接人',
-    field: 'acceptUserId',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '完成人',
-    field: 'completeUserId',
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
   {
     label: '从库位类型范围',
     field: 'fromLocationTypes',
@@ -267,62 +163,38 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
+    label: '优先级',
+    field: 'priority',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '优先级增量',
+    field: 'priorityIncrement',
     sort: 'custom',
     table: {
       width: 150
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
     form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
+      component: 'InputNumber',
+    }
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
@@ -518,6 +390,134 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',
@@ -553,9 +553,9 @@ export const CountJobMainRules = reactive({
   status: [
     { required: true, message: '请选择状态', trigger: 'change' }
   ],
-  jobStageStatus: [
-    { required: true, message: '请选择阶段状态', trigger: 'change' }
-  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
   priority: [
     { required: true, message: '请输入优先级', trigger: 'blur' }
   ],
@@ -587,91 +587,72 @@ export const CountJobMainRules = reactive({
  */
 export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '盘点明细号',
-    field: 'countDetailNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '盘点明细号',
+    field: 'countDetailNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -700,24 +681,35 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
@@ -743,6 +735,14 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 56ce6d2bb..edd5f9e38 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime'
  * @returns {Array} 盘点记录主表
  */
 export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -31,20 +41,20 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '阶段',
-    field: 'stage',
-    dictType: DICT_TYPE.COUNT_STAGE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '仓库代码',
+    field: 'warehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '仓库代码',
-    field: 'warehouseCode',
+    label: '阶段',
+    field: 'stage',
+    dictType: DICT_TYPE.COUNT_STAGE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -67,8 +77,8 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '执行时间',
-    field: 'executeTime',
+    label: '申请时间',
+    field: 'requestTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -87,8 +97,8 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '生效日期',
-    field: 'activeDate',
+    label: '截止时间',
+    field: 'dueTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -107,8 +117,8 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '申请时间',
-    field: 'requestTime',
+    label: '执行时间',
+    field: 'executeTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -127,8 +137,8 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '截止时间',
-    field: 'dueTime',
+    label: '生效日期',
+    field: 'activeDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -147,37 +157,16 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isSearch: true,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
@@ -192,8 +181,11 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -220,13 +212,21 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '代码',
-    field: 'code',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '是否可用',
     field: 'available',
@@ -303,75 +303,48 @@ export const CountRecordMainRules = reactive({
  */
 export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '盘点明细号',
-    field: 'countDetailNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库位代码',
-    field: 'locationCode',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库位组代码',
-    field: 'locationGroupCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库区代码',
-    field: 'areaCode',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '盘点明细号',
+    field: 'countDetailNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -425,138 +398,165 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
+      component: 'InputNumber',
+    }
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '库位组代码',
+    field: 'locationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '库区代码',
+    field: 'areaCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '货主代码',
+    field: 'ownerCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '任务明细ID',
-    field: 'jobDetailId',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '代码',
-    field: 'code',
+    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,
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
 ]))
 
 //表单校验
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 802262c42..edfb83e19 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -25,6 +25,35 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 盘点申请主表
  */
 export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -79,72 +108,6 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'Count',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -189,67 +152,42 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      value: userDept.name,
+      value: 'Count',
       componentProps: {
         disabled: true
       }
-    }
+    },
+    isForm: false,
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      value: '1',
+      value: userDept.name,
       componentProps: {
         disabled: true
       }
     }
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    isTable: false
   },
   {
     label: '自动提交',
@@ -331,6 +269,68 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
   {
     label: '操作',
     field: 'action',
@@ -383,96 +383,88 @@ export const CountRequestMainRules = reactive({
  */
 export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '盘点明细号',
+    field: 'countDetailNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库位代码',
-    field: 'locationCode',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      type: 'Select'
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '盘点明细号',
-    field: 'countDetailNumber',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
     label: '数量',
@@ -496,19 +488,31 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -519,6 +523,32 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -552,36 +582,6 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index 47fb03071..d8de05a03 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime'
  * @returns {Array} 盘点调整记录主表
  */
 export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -48,8 +58,8 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '执行时间',
-    field: 'executeTime',
+    label: '申请时间',
+    field: 'requestTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -68,8 +78,8 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '生效日期',
-    field: 'activeDate',
+    label: '截止时间',
+    field: 'dueTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -88,8 +98,8 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '申请时间',
-    field: 'requestTime',
+    label: '执行时间',
+    field: 'executeTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -108,8 +118,8 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '截止时间',
-    field: 'dueTime',
+    label: '生效日期',
+    field: 'activeDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -127,6 +137,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '部门',
     field: 'departmentCode',
@@ -146,24 +164,6 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '备注',
     field: 'remark',
@@ -172,14 +172,6 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -201,13 +193,21 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '代码',
-    field: 'code',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '是否可用',
     field: 'available',
@@ -278,168 +278,146 @@ export const CountadjustRecordMainRules =reactive({
  */
 export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '盘点明细号',
-    field: 'countDetailNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '货主代码',
-    field: 'ownerCode',
+    label: '盘点明细号',
+    field: 'countDetailNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库位代码',
-    field: 'locationCode',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '盘点数量',
-    field: 'countQty',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '库存数量',
-    field: 'inventoryQty',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '调整数量',
-    field: 'adjustQty',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '盘点数量',
+    field: 'countQty',
     sort: 'custom',
     table: {
       width: 150
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
     form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+      component: 'InputNumber',
+    }
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '库存数量',
+    field: 'inventoryQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '调整数量',
+    field: 'adjustQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -454,20 +432,33 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '货主代码',
+    field: 'ownerCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -476,27 +467,36 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '任务明细ID',
-    field: 'jobDetailId',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '代码',
-    field: 'code',
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
   },
   {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index b2f6fd317..6072b3f32 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -25,6 +25,35 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 盘点调整申请主表
  */
 export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -68,69 +97,6 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -175,67 +141,39 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
-      width: 150
-    },
-    form: {
-      value: userDept.name,
+      width: 150,
       componentProps: {
         disabled: true
       }
-    }
+    },
+    isForm: false,
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      value: '1',
+      value: userDept.name,
       componentProps: {
         disabled: true
       }
     }
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false
+    isTable: false
   },
   {
     label: '自动提交',
@@ -317,6 +255,68 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '操作',
     field: 'action',
@@ -361,6 +361,20 @@ export const CountadjustRequestMainRules = reactive({
  * @returns {Array} 盘点调整申请子表
  */
 export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '盘点明细号',
     field: 'countDetailNumber',
@@ -370,28 +384,42 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '货主代码',
-    field: 'ownerCode',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '批次',
@@ -402,17 +430,45 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库位代码',
-    field: 'locationCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -484,28 +540,30 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
@@ -514,52 +572,24 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '货主代码',
+    field: 'ownerCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      type: 'Select'
-    }
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
+    label: '创建时间',
+    field: 'createTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -581,8 +611,8 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
@@ -591,38 +621,8 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
+    label: '最后更新时间',
+    field: 'updateTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -644,8 +644,8 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '最后更新者',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150