diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue new file mode 100644 index 000000000..034536d5d --- /dev/null +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -0,0 +1,337 @@ + + + + + diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index d97935f3b..474e6f59b 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -891,14 +891,16 @@ export default { 共:'Total', 打开:'Open', 保存:'Save', - 下一步:'Next', + 下一步: 'Next', + 好的: 'OK', 请选择筛选对象:'Please select filter', 请输入内容:'Please inputr content', 附件:'Attachment', '更新:新增并修改':'Update:Add and modify', '追加:只新增,不修改':'Add:Add,no modify', '覆盖:只修改不新增':'Cover:Modify,not add', - 下载模板:'Download Template', + 下载模板: 'Download Template', + 下载差异数据: 'Download differential data', 更新:'Update', 追加:'Add', 覆盖:'Cover', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index acf92e53e..92927f2ba 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -896,14 +896,16 @@ export default { 共:'共', 打开:'打开', 保存:'保存', - 下一步:'下一步', + 下一步: '下一步', + 好的: '好的', 请选择筛选对象:'请选择筛选对象', 请输入内容:'请输入内容', 附件:'附件', '更新:新增并修改':'更新:新增并修改', '追加:只新增,不修改':'追加:只新增,不修改', '覆盖:只修改不新增':'覆盖:只修改不新增', - 下载模板:'下载模板', + 下载模板: '下载模板', + 下载差异数据: '下载差异数据', 更新:'更新', 追加:'追加', 覆盖:'覆盖', diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 5f3197726..e458159e8 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -872,3 +872,114 @@ export const DeliverRecordDetailRules = reactive({ { required: true, message: '请输入创建者', trigger: 'blur' } ], }) + +/** + * @returns {Array} 导入表单表 + */ +export const DeliverRecordImport = useCrudSchemas(reactive([ + { + label: '订单号', + field: 'customerOrderNumber', + sort: 'custom', + }, + { + label: '开始日期', + field: 'startData', + sort: 'custom', + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + }, + { + label: '结束日期', + field: 'finishData', + sort: 'custom', + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + }, + { + label: '开始序号', + field: 'startNo', + sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + min:1, + precision: 0 + } + }, + }, + { + label: '结束序号', + field: 'finishNo', + sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 0 + } + }, + }, +])) +//导入表单校验 +export const DeliverRecordImportRules = reactive({ + customerOrderNumber: [ + { required: true, message: '请输入订单号', trigger: 'blur' } + ], + startData: [ + { required: true, message: '请选择开始日期', trigger: 'change' } + ], + finishData: [ + { required: true, message: '请选择结束日期', trigger: 'change' } + ], + startNo: [ + { required: true, message: '请输入开始序号', trigger: 'change' } + ], + finishNo: [ + { required: true, message: '请输入结束序号', trigger: 'change' } + ], +}) +/** + * @returns {Array} 导入确认数据表 + */ +export const DeliverRecordImportData = useCrudSchemas(reactive([ + { + label: '纳入受领书单号', + field: 'customerOrderNumber', + sort: 'custom', + }, + { + label: '订单号', + field: 'customerOrderNumber', + sort: 'custom', + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + }, +])) \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index f41a8a4d4..e347ff1a5 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -59,13 +59,20 @@ :detailAllSchemasRules="DeliverRecordDetailRules" :apiPage="DeliverRecordDetailApi.getDeliverRecordDetailPage" /> - - + +