diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts index ac4308878..49eba9cab 100644 --- a/src/utils/disposition/tableColumns.ts +++ b/src/utils/disposition/tableColumns.ts @@ -6843,7 +6843,7 @@ export const Businesstype = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, }, { @@ -6854,7 +6854,7 @@ export const Businesstype = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, }, { @@ -6865,7 +6865,7 @@ export const Businesstype = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, }, { @@ -6876,7 +6876,7 @@ export const Businesstype = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, }, { @@ -6903,7 +6903,7 @@ export const Businesstype = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, }, { @@ -6914,7 +6914,7 @@ export const Businesstype = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, }, { @@ -7056,26 +7056,6 @@ export const Businesstype = useCrudSchemas(reactive([ } }, }, - { - label: '是否软删除', - field: 'isSoftDeleted', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '操作', field: 'action', @@ -7132,6 +7112,7 @@ export const Documentsetting = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, }, { label: '描述', @@ -7146,7 +7127,6 @@ export const Documentsetting = useCrudSchemas(reactive([ field: 'type', dictType: DICT_TYPE.DOCUMENT_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7198,7 +7178,6 @@ export const Documentsetting = useCrudSchemas(reactive([ field: 'resetPeriod', dictType: DICT_TYPE.RESET_PERIOD, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7301,26 +7280,6 @@ export const Documentsetting = useCrudSchemas(reactive([ } }, }, - { - label: '是否软删除', - field: 'isSoftDeleted', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '操作', field: 'action', @@ -7378,7 +7337,6 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'requestMode', dictType: DICT_TYPE.REQEUST_MODE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7390,7 +7348,6 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7410,7 +7367,6 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7430,7 +7386,6 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7450,7 +7405,6 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'directCreateRecord', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7485,26 +7439,6 @@ export const Requestsetting = useCrudSchemas(reactive([ } }, }, - { - label: '是否软删除', - field: 'isSoftDeleted', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '生效时间', field: 'activeTime', @@ -7566,11 +7500,12 @@ export const Requestsetting = useCrudSchemas(reactive([ { label: '备注', field: 'remark', - isTable: false, + isTable: true, sort: 'custom', table: { width: 150 }, + isSearch: true, }, { label: '创建者', @@ -7644,7 +7579,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7664,7 +7598,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7684,7 +7617,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7704,7 +7636,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7724,7 +7655,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7744,7 +7674,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7764,7 +7693,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7784,7 +7712,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7804,7 +7731,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowModifyBach', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7824,7 +7750,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -7860,41 +7785,40 @@ export const Jobsetting = useCrudSchemas(reactive([ }, }, { - label: '是否软删除', - field: 'isSoftDeleted', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, + label: '生效时间', + field: 'activeTime', isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + type: 'datetime', } }, }, { - label: '生效时间', - field: 'activeTime', + label: '是否软删除', + field: 'isSoftDeleted', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', + component: 'Switch', + value: 'TRUE', componentProps: { - type: 'datetime', + inactiveValue: 'FALSE', + activeValue: 'TRUE' } }, }, @@ -8127,26 +8051,6 @@ export const Recordsetting = useCrudSchemas(reactive([ } }, }, - { - label: '是否软删除', - field: 'isSoftDeleted', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '操作', field: 'action', @@ -10591,9 +10495,20 @@ export const PurchaseDetail = useCrudSchemas(reactive([ * @returns {Array} 采购索赔申请主表 */ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + isForm:false, + table: { + width: 150 + } + }, { label: '发货单号', - field: 'asnNumber' + field: 'asnNumber', + table: { + width: 150 + } }, { label: '要货计划单号', @@ -10602,6 +10517,9 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ componentProps:{ disabled:true, } + }, + table: { + width: 150 } }, { @@ -10611,21 +10529,26 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ componentProps:{ disabled:true, } + }, + table: { + width: 150 } }, { - label: '单据号', - field: 'number', - isForm:false, - }, - { - label: '业务类型', - field: 'businessType', - form:{ - value:'PurchaseClaim', + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + form: { + value:'1', componentProps:{ - disabled:true, + disabled:true, } + }, + table: { + width: 100 } }, { @@ -10641,6 +10564,9 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ }, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 } }, { @@ -10655,6 +10581,9 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ }, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 } }, { @@ -10666,54 +10595,27 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ disabled:true, } }, + table: { + width: 100 + } }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - form: { - value:'1', + label: '业务类型', + field: 'businessType', + form:{ + value:'PurchaseClaim', componentProps:{ - disabled:true, + disabled:true, } }, - }, - { - label: '备注', - field: 'remark' - }, - { - label: '创建者', - field: 'creator', - isForm:false - }, - { - label: '创建时间', - field: 'createTime', - isTable: true, - formatter: dateFormatter, - isForm:false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + table: { + width: 130 } }, { - label: '最后更新者', - field: 'updater', - isForm:false - }, - { - label: '最后更新时间', - field: 'updateTime', - isTable: true, - formatter: dateFormatter, - isForm:false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - } + label: '备注', + field: 'remark', + isTable: false }, { label: '自动提交', @@ -10723,7 +10625,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ isSearch: true, isTable: true, table: { - width: 150 + width: 100 }, form:{ component:'Switch', @@ -10743,7 +10645,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ isSearch: true, isTable: true, table: { - width: 150 + width: 100 }, form:{ component:'Switch', @@ -10763,7 +10665,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ isSearch: true, isTable: true, table: { - width: 150 + width: 100 }, form:{ component:'Switch', @@ -10776,14 +10678,14 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ } }, { - label: '跳过任务直接删生成记录', + label: '直接生成记录', field: 'directCreateRecord', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, isTable: true, table: { - width: 150 + width: 120 }, form:{ component:'Switch', @@ -10795,13 +10697,55 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '创建者', + field: 'creator', + isForm:false, + table: { + width: 120 + } + }, + { + label: '创建时间', + field: 'createTime', + isTable: true, + formatter: dateFormatter, + isForm:false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + } + }, + { + label: '最后更新者', + field: 'updater', + isForm:false, + table: { + width: 120 + } + }, + { + label: '最后更新时间', + field: 'updateTime', + isTable: true, + formatter: dateFormatter, + isForm:false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + } + }, { label: '操作', field: 'action', isDetail: false, isForm: false , table: { - width: 150 + width: 300 } } ])) @@ -10839,7 +10783,11 @@ export const PurchaseclaimRequestMainRules = reactive({ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive([ { label: '订单号', - field: 'poNumber' + field: 'poNumber', + tableForm:{ + isInpuFocusShow: true + } + }, { label: '订单行',