diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index b7f8b4b26..371bc9302 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1335,5 +1335,6 @@ export default { 全部重试:'All retry', 导出对账单:'Export the statement of account', 更新要货预测:'Update the order forecast', + 临时补料:'Temporary material replenishment', }, } diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 2a94d7071..a59588000 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1334,6 +1334,7 @@ export default { 全部重试:'全部重试', 导出对账单:'导出对账单', 更新要货预测:'更新要货预测', + 临时补料:'临时补料', }, } diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index c7b045405..1c6eb2372 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1573,6 +1573,19 @@ export function mainLisSelectiontTrialResultBtn(option: any) { }) } +// 临时补料按钮 +export function temporaryReplenishmentBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.临时补料`).replace('ts.', ''), + name: 'temporaryReplenishment', + hide: false, + type: 'primary', + icon: 'ep:plus', + color: '', + hasPermi: '' + }) +} + //待开票导出对账单按钮 export function invoicedExportBtn(option: any) { return __defaultBtnOption(option, { diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index ca3a73504..159b07184 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -25,18 +25,27 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ }, sortTableDefault: 1, }, + // { + // label: '供应商代码', + // field: 'supplierCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, { - label: '供应商代码', - field: 'supplierCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, - isTable: false, + isTable: false }, { - label: '从仓库代码', - field: 'fromWarehouseCode', + label: '到仓库代码', + field: 'toWarehouseCode', sort: 'custom', table: { width: 150 @@ -64,6 +73,42 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ } }, }, + { + label: '日期时间', + field: 'day', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 5, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'datetimerange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, + isDetail: true, + isTable: true, + isForm: true, + isTableForm: false, + isSearch: true, + sortSearchDefault: 3, + }, { label: '要求截止时间', field: 'requestDueTime', @@ -525,6 +570,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ // }, // isTable: false, // }, + { label: '创建者', field: 'creator', @@ -714,16 +760,16 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ sortSearchDefault:3, sortTableDefault:4, }, - { - label: '来源库区代码', - field: 'fromAreaCode', - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '来源库区代码', + // field: 'fromAreaCode', + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '库存状态', field: 'inventoryStatus', @@ -773,26 +819,26 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ }, isSearch: true, }, - { - label: '从库区', - field: 'fromAreaCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isTable: true - }, - { - label: '到库区', - field: 'toAreaCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isTable: true - }, + // { + // label: '从库区', + // field: 'fromAreaCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // isTable: true + // }, + // { + // label: '到库区', + // field: 'toAreaCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // isTable: true + // }, { label: '品番', field: 'itemCode', @@ -804,6 +850,23 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ isSearch: true, sortTableDefault:3, }, + + { + label: '背番', + field: 'backNumber', + sort: 'custom', + sortTableDefault:3, + table: { + width: 150 + }, + isSearch:true, + isForm: false, + isTable: true, + isDetail: true, + tableForm: { + disabled:true + } + }, { label: '品名', field: 'itemName', @@ -900,6 +963,33 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ // }, // hiddenInMain: true, // }, + { + label: '生产线区分', + field: 'productionLine', + sort: 'custom', + sortTableDefault: 7, + table: { + width: 150 + }, + isTableForm: true, + isTable: true, + isDetail: true, + isForm: false, + tableForm: { + disabled:true + } + }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + isForm: false, + isDetail: true + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index a964ce2dd..fe8a3a072 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -138,6 +138,42 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '日期时间', + field: 'day', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 5, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'datetimerange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, + isDetail: true, + isTable: true, + isForm: true, + isTableForm: false, + isSearch: true, + sortSearchDefault: 3, + }, { label: '截止时间', field: 'dueTime', @@ -577,15 +613,15 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, }, - { - label: '从库区代码', - field: 'fromAreaCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - }, + // { + // label: '从库区代码', + // field: 'fromAreaCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // }, { label: '到货主代码', field: 'toOwnerCode', @@ -613,15 +649,15 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, }, - { - label: '到库区代码', - field: 'toAreaCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - }, + // { + // label: '到库区代码', + // field: 'toAreaCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // }, { label: '单据号', field: 'number', @@ -642,6 +678,24 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([ sortSearchDefault:2, sortTableDefault:4, }, + + { + label: '背番', + field: 'backNumber', + sort: 'custom', + sortSearchDefault:2, + sortTableDefault:4, + table: { + width: 150 + }, + isSearch:true, + isForm: false, + isTable: true, + isDetail: true, + tableForm: { + disabled:true + } + }, { label: '品名', field: 'itemName', @@ -718,6 +772,33 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([ isTable:false, hiddenInMain:true, }, + { + label: '生产线区分', + field: 'productionLine', + sort: 'custom', + sortTableDefault: 7, + table: { + width: 150 + }, + isTableForm: true, + isTable: true, + isDetail: true, + isForm: false, + tableForm: { + disabled:true + } + }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + isForm: false, + isDetail: true + }, // { // label: '代码', // field: 'code', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index a4bc0f0c5..617db10e6 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -165,7 +165,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:repleinsh-request-main:create'}), // 新增 + defaultButtons.temporaryReplenishmentBtn({hasPermi:'wms:repleinsh-request-main:create'}), // 临时补料 defaultButtons.defaultImportBtn({hasPermi:'wms:repleinsh-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:repleinsh-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 @@ -183,7 +183,7 @@ const HeadButttondata = [ // 头部按钮事件 const buttonBaseClick = (val, item) => { - if (val == 'add') { // 新增 + if (val == 'temporaryReplenishment') { // 新增 openForm('create') } else if (val == 'import') { // 导入 handleImport() diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 7de5b2596..8d0b13269 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -78,7 +78,7 @@ export const RepleinshRequestMain = useCrudSchemas( table: { width: 150 }, - isTable: true, + isTable: false, isForm: false, isDetail: true }, @@ -90,7 +90,7 @@ export const RepleinshRequestMain = useCrudSchemas( width: 150 }, isForm: false, - isTable: true, + isTable: false, isDetail: true }, { @@ -117,10 +117,10 @@ export const RepleinshRequestMain = useCrudSchemas( search: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'datetimerange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, }, isDetail: true, isTable: true, @@ -858,6 +858,7 @@ export const RepleinshRequestDetail = useCrudSchemas( table: { width: 150 }, + sortTableDefault: 7, isTableForm: true, isForm: false, isTable: true,