WMS bug：HL-5766 报废出库申请.任务.记录主子备注保存

3 months ago · ae44d72c31
6 changed files with 181 additions and 181 deletions
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@ -370,8 +370,8 @@ export const ScrapJobMain = useCrudSchemas(
      }
    },
    {
-      label: '备注',
+      label: '单据备注',
-      field: 'remark',
+      field: 'remarkMain',
      sort: 'custom',
      table: {
        width: 150
@ -904,7 +904,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
  //   },
  // },
  {
-    label: '备注',
+    label: '明细备注',
    field: 'remark',
    sort: 'custom',
    table: {
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@ -373,8 +373,8 @@ export const ScrapRecordMain = useCrudSchemas(
      }
    },
    {
-      label: '备注',
+      label: '单据备注',
-      field: 'remark',
+      field: 'remarkMain',
      sort: 'custom',
      table: {
        width: 150
@ -736,7 +736,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
  //   },
  // },
  {
-    label: '备注',
+    label: '明细备注',
    field: 'remark',
    sort: 'custom',
    table: {
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@ -625,8 +625,8 @@ export const ScrapRequestMain = useCrudSchemas(
      }
    },
    {
-      label: '备注',
+      label: '单据备注',
-      field: 'remark',
+      field: 'remarkMain',
      sort: 'custom',
      table: {
        width: 150
@ -1171,7 +1171,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
  },
  {
-    label: '备注',
+    label: '明细备注',
    field: 'remark',
    sort: 'custom',
    table: {
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@ -409,43 +409,43 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-    isSearch: true,
+  //   isSearch: true,
-    search: {
+  //   search: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
+  //       type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+  //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '创建者',
+  //   label: '创建者',
-    field: 'creator',
+  //   field: 'creator',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
  {
    label: '最后更新时间',
    field: 'updateTime',
@ -488,26 +488,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
  //     width: 150
  //   },
  // },
-  {
+  // {
-    label: '是否可用',
+  //   label: '是否可用',
-    field: 'available',
+  //   field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isSearch: false,
+  //   isSearch: false,
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'Switch',
+  //     component: 'Switch',
-      value: 'TRUE',
+  //     value: 'TRUE',
-      componentProps: {
+  //     componentProps: {
-        inactiveValue: 'FALSE',
+  //       inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+  //       activeValue: 'TRUE'
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
  {
    label: '操作',
    field: 'action',
@ -757,25 +757,25 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
  },
-  {
+  // {
-    label: '项目代码',
+  //   label: '项目代码',
-    field: 'projectCode',
+  //   field: 'projectCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '接口类型',
+  //   label: '接口类型',
-    field: 'interfaceType',
+  //   field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
  {
    label: '明细备注',
    field: 'remark',
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@ -625,43 +625,43 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-    isSearch: true,
+  //   isSearch: true,
-    search: {
+  //   search: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
+  //       type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+  //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '创建者',
+  //   label: '创建者',
-    field: 'creator',
+  //   field: 'creator',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
  {
    label: '最后更新时间',
    field: 'updateTime',
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@ -393,45 +393,45 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
  },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    isTable:false,
+  //   isTable:false,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-    isSearch: true,
+  //   isSearch: true,
-    search: {
+  //   search: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'datetimerange',
+  //       type: 'datetimerange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+  //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '创建者',
+  //   label: '创建者',
-    field: 'creator',
+  //   field: 'creator',
-    sort: 'custom',
+  //   sort: 'custom',
-    isTable:false,
+  //   isTable:false,
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
  {
    label: '最后更新时间',
    field: 'updateTime',
@ -474,26 +474,26 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
  //     width: 150
  //   },
  // },
-  {
+  // {
-    label: '是否可用',
+  //   label: '是否可用',
-    field: 'available',
+  //   field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isSearch: false,
+  //   isSearch: false,
-    isTable: false,
+  //   isTable: false,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'Switch',
+  //     component: 'Switch',
-      value: 'TRUE',
+  //     value: 'TRUE',
-      componentProps: {
+  //     componentProps: {
-        inactiveValue: 'FALSE',
+  //       inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+  //       activeValue: 'TRUE'
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
  {
    label: '操作',
    field: 'action',