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

4 months ago · 77cdf305c6
32 changed files with 533 additions and 42 deletions
--- a/src/api/wms/countPlanMain/index.ts
+++ b/src/api/wms/countPlanMain/index.ts
@ -8,6 +8,7 @@ export interface CountPlanMainVO {
  ignoreListOfItem: string
  ignoreListOfLocation: string
  scopeList: string
+  countSplitType: string
  number: string
  businessType: string
  remark: string
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@ -91,7 +91,7 @@
              "
              :disabled="disabledInput(headerItem, row)"
              style="flex: 1"
-              @blur.stop="inputStringBlur(headerItem, row[headerItem.field], row, index)"
+              @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
            />
            <Icon
              icon="ep:circle-close"
@ -101,12 +101,12 @@
                headerItem?.tableForm?.clearable
              "
              style="position: absolute; right: 50px; cursor: pointer"
-              @click.stop="clearInput(headerItem.field, row, index)"
+              @click="clearInput(headerItem.field, row, index)"
            />
            <el-button
              :key="headerItem.field + $index + 'button'"
              v-if="headerItem?.tableForm?.isInpuFocusShow"
-              @click.stop="inpuFocus(headerItem, row, index)"
+              @click="inpuFocus(headerItem, row, index)"
              ><Icon icon="ep:search" size="14"
            /></el-button>
          </el-form-item>
@ -123,9 +123,7 @@
              :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
              :disabled="itemIsDisabled(headerItem, row)"
              style="width: 100%"
-              @input.stop="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
-              @click.stop=""
-              @focus.stop=""
+              @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
            />
          </el-form-item>
          <!-- 数字输入框 -->
@ -141,7 +139,7 @@
              :min="headerItem?.tableForm?.min"
              :precision="headerItem?.tableForm?.precision"
              :disabled="itemIsDisabled(headerItem, row)"
-              @change.stop="
+              @change="
                (e) => {
                  inputNumberChange(headerItem.field, $index, row, e)
                }
@ -164,8 +162,8 @@
              :allow-create="headerItem?.tableForm.allowCreate"
              style="width: 100%"
              :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change.stop="formSelectChange(headerItem.field, $event, row)"
-              @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+              @change="formSelectChange(headerItem.field, $event, row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
            >
              <el-option
                v-for="op in initSelectOptions(headerItem)"
@ -194,8 +192,8 @@
              :allow-create="headerItem?.tableForm.allowCreate"
              style="width: 100%"
              :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change.stop="formSelectChange(headerItem.field, $event, row)"
-              @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+              @change="formSelectChange(headerItem.field, $event, row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
            >
              <el-option-group
                v-for="group in initSelectOptions(headerItem)"
@ -235,7 +233,7 @@
              :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
-              @change.stop="formFormDateChange(headerItem.field, $event, row, $index)"
+              @change="formFormDateChange(headerItem.field, $event, row, $index)"
            />
          </el-form-item>
          <!-- 日期时间选择器 -->
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -224,6 +224,7 @@ export enum DICT_TYPE {
  REQEUST_MODE = 'reqeust_mode', // 申请模式
  TIME_UNIT = 'time_unit', // 时间单位
  COUNT_TYPE = 'count_type', // 盘点类型
+  COUNT_SPLIT_TYPE = 'count_split_type', // 盘点拆分方式
  COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型
  BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
  SETTLEMENT_TYPE = 'settlement_type', // 结算类型
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@ -48,6 +48,20 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
    isSearch: true
  },
+  {
+    label: '任务拆分方式',
+    field: 'countSplitType',
+    dictType: DICT_TYPE.COUNT_SPLIT_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value:'LOCATION_CODE',
+    }
+  },
  {
    label: '',//执行周期
    field: 'crontab',
@ -506,6 +520,9 @@ export const CountPlanMainRules = reactive({
  type: [
    { required: true, message: '请选择盘点类型', trigger: 'change' }
  ],
+  countSplitType: [
+    { required: true, message: '请选择任务拆分方式', trigger: 'change' }
+  ],
  crontab: [
    { required: false, message: '请填写执行周期', trigger:  ['change','blur'] },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
  ],
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@ -249,6 +249,40 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
    isTable: true
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  {
    label: '操作',
    field: 'action',
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@ -191,6 +191,40 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
    isTable: true
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  {
    label: '发货日期',
    field: 'deliverDate',
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@ -412,6 +412,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    isForm: false,
+    isTable: false
  },
  {
    label: '最后更新者',
@ -421,6 +422,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
    isForm: false,
+    isTable: false
  },
  // TODO: 临时添加 方便操作
  {
@ -455,4 +457,4 @@ export const BalanceRules = reactive({
  produceDate: [
    { required: true, message: '请选择生产日期', trigger: 'change' }
  ],
-})
+})
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@ -212,6 +212,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'createTime',
    sort: 'custom',
    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
    search: {
      component: 'DatePicker',
      componentProps: {
@ -220,8 +223,51 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
+    isTable: true,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
  },
  {
    label: '扩展属性',
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@ -146,6 +146,40 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
    isTable: true
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  {
    label: '操作',
    field: 'action',
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@ -216,6 +216,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'createTime',
    sort: 'custom',
    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
    search: {
      component: 'DatePicker',
      componentProps: {
@ -227,6 +230,49 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
    isTable:false,
    isForm: false,
  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  {
    label: '扩展属性',
    field: 'extraProperties',
@ -414,6 +460,9 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'createTime',
    sort: 'custom',
    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
    search: {
      component: 'DatePicker',
      componentProps: {
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@ -226,7 +226,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
-    isTable: false,
+    isTable: true,
    isForm: false,
  },
  {
@ -238,6 +238,40 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
    isTable: true
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  {
    label: '扩展属性',
    field: 'extraProperties',
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@ -195,7 +195,16 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    isForm: false
-  }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
 ]))

 // 表单校验
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@ -470,6 +470,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '创建时间',
@ -490,14 +491,16 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '最后更新时间',
@ -518,6 +521,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false
  },
  // {
  //   label: '操作',
@ -778,11 +782,12 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '最后更新时间',
@ -795,6 +800,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@ -206,11 +206,12 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '最后更新时间',
@ -231,6 +232,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false,
  },
  {
    label: '操作',
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@ -380,11 +380,12 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '最后更新时间',
@ -405,6 +406,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false
  },
  {
    label: '操作',
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@ -196,7 +196,16 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    isForm: false
-  }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
 ]))


--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@ -454,6 +454,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false
  },
  {
    label: '创建者',
@ -462,6 +463,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '最后更新时间',
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@ -223,6 +223,41 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  // {
  //   label: '代码',
  //   field: 'code',
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
@ -388,6 +388,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable:false,
  },
  {
    label: '创建者',
@ -396,6 +397,41 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
  },
  // {
  //   label: '代码',
@ -484,7 +520,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
    label: '单据号',
    field: 'number',
    sort: 'custom',
-    hiddenInMain:true, 
+    hiddenInMain:true,
    table: {
      width: 180
    },
@ -672,7 +708,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
    sort: 'custom',
    table: {
      width: 150
-    }, 
+    },
  },
  // {
  //   label: '任务明细ID',
@ -752,4 +788,4 @@ export const UnplannedissueRecordDetailRules = reactive({
  creator: [
    { required: true, message: '请输入创建者', trigger: 'blur' }
  ],
-})
+})
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@ -287,6 +287,39 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+  {
+    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',
+      }
+    },
+    isTable:false,
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isForm: false,
+  },
  {
    label: '是否可用',
    field: 'available',
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@ -409,6 +409,40 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  // {
  //   label: '代码',
  //   field: 'code',
@ -701,7 +735,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
    sort: 'custom',
    table: {
      width: 150
-    }, 
+    },
  },
  // {
  //   label: '任务明细ID',
@ -781,4 +815,4 @@ export const UnplannedissueRecordDetailRules = reactive({
  creator: [
    { required: true, message: '请输入创建者', trigger: 'blur' }
  ],
-})
+})
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@ -387,6 +387,40 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  // {
  //   label: '代码',
  //   field: 'code',
@ -833,4 +867,4 @@ export const UnplannedreceiptRecordDetailRules = reactive({
  expireDate: [
    { required: true, message: '请选择过期日期', trigger: 'change' }
  ]
-})
+})
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@ -178,7 +178,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
@ -122,7 +122,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@ -146,7 +146,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@ -77,7 +77,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
    label: '执行时间',
    field: 'executeTime',
    formatter: dateFormatter,
-    detai: {
+    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
@ -98,7 +98,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
    label: '生效日期',
    field: 'activeDate',
    formatter: dateFormatter2,
-    detai: {
+    detail: {
      dateFormat: 'YYYY-MM-DD'
    },
    isTable: false,
@ -120,7 +120,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
    label: '申请时间',
    field: 'requestTime',
    formatter: dateFormatter,
-    detai: {
+    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
@ -141,7 +141,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
    label: '截止时间',
    field: 'dueTime',
    formatter: dateFormatter,
-    detai: {
+    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
@ -200,7 +200,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
    label: '创建时间',
    field: 'createTime',
    formatter: dateFormatter,
-    detai: {
+    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@ -558,7 +558,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@ -194,6 +194,40 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
    isTable: false
  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
  // {
  //   label: '代码',
  //   field: 'code',
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@ -796,6 +796,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    hiddenInMain: true,
    isTableForm: false,
    isForm: false,
+    isTable: true
  },
  {
    label: '创建时间',
@ -820,6 +821,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
    isTableForm: false,
    isForm: false,
+    isTable: true,
  },
  {
    label: '是否可用',
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@ -48,6 +48,9 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'planDate',
    sort: 'custom',
    formatter: dateFormatter2,
+    detail: {
+      dateFormat : 'YYYY-MM-DD'
+    },
    form: {
      component: 'DatePicker',
      componentProps: {
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@ -148,7 +148,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '最后更新者',
-    field: 'update',
+    field: 'updater',
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@ -485,12 +485,12 @@ export const ProductreceiptRequestMainRules = reactive({
  workshopCode: [
    { required: true, message: '请选择车间代码', trigger: 'change' }
  ],
-  team: [
-    { required: true, message: '请选择班组代码', trigger: 'change' }
-  ],
-  shift: [
-    { required: true, message: '请选择班次代码', trigger: 'change' }
-  ],
+  // team: [
+  //   { required: true, message: '请选择班组代码', trigger: 'change' }
+  // ],
+  // shift: [
+  //   { required: true, message: '请选择班次代码', trigger: 'change' }
+  // ],
  dueTime: [
    { required: true, message: '请选择截止时间', trigger: 'blur' }
  ],