diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index a745afabc..30d4cf47c 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -11,12 +11,12 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'type', dictType: DICT_TYPE.COUNT_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, + isSearch: true }, { label: '执行周期', @@ -31,7 +31,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'dimension', dictType: DICT_TYPE.COUNT_DIMENSION, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -78,7 +77,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'isSnapshot', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -98,7 +96,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'isFreeze', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -118,7 +115,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'isCountEmptyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -138,7 +134,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'isCountZeroInventory', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -158,7 +153,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'isCountNegativeInventory', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -178,7 +172,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'isOpenCount', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -198,8 +191,11 @@ export const CountPlanMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isSearch: true, + isForm: false, }, { label: '业务类型', @@ -208,6 +204,12 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'Count', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -216,6 +218,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '创建者', @@ -224,6 +227,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '创建时间', @@ -244,6 +248,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '开始时间', @@ -288,7 +293,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ { label: '状态', field: 'status', - dictType: DICT_TYPE.COUNT_PLAN_STATUS, + dictType: DICT_TYPE.PLAN_STATUS, dictClass: 'string', isSearch: true, isTable: true, @@ -296,6 +301,12 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'PLAN_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -316,6 +327,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '最后更新者', @@ -324,6 +336,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '是否可用', @@ -341,6 +354,16 @@ export const CountPlanMain = useCrudSchemas(reactive([ } }, }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -372,15 +395,6 @@ export const CountPlanMainRules = reactive({ status: [ { required: true, message: '请选择状态', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], @@ -395,7 +409,6 @@ export const CountPlanDetail = useCrudSchemas(([ field: 'type', dictType: DICT_TYPE.COUNT_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -415,8 +428,14 @@ export const CountPlanDetail = useCrudSchemas(([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } }, { label: '物品代码', @@ -441,6 +460,8 @@ export const CountPlanDetail = useCrudSchemas(([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '创建时间', @@ -461,6 +482,8 @@ export const CountPlanDetail = useCrudSchemas(([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '最后更新时间', @@ -481,6 +504,8 @@ export const CountPlanDetail = useCrudSchemas(([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '最后更新者', @@ -489,6 +514,8 @@ export const CountPlanDetail = useCrudSchemas(([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '计划数量', @@ -506,7 +533,6 @@ export const CountPlanDetail = useCrudSchemas(([ field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -518,7 +544,6 @@ export const CountPlanDetail = useCrudSchemas(([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, form: { component: 'Switch', @@ -533,6 +558,17 @@ export const CountPlanDetail = useCrudSchemas(([ width: 150 }, }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 @@ -552,10 +588,4 @@ export const CountPlanDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index c24351ca4..e4cbcc9a2 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -90,7 +90,7 @@ export const CountRequestMain = useCrudSchemas(([ table: { width: 150 }, - isForm: false, + isTable: false }, { label: '创建时间', @@ -187,7 +187,12 @@ export const CountRequestMain = useCrudSchemas(([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -299,6 +304,16 @@ export const CountRequestMain = useCrudSchemas(([ width: 150 }, }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -530,8 +545,6 @@ export const CountRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -565,6 +578,17 @@ export const CountRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index e7fe01cf5..927ea3d7d 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:countRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:countRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:count-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:count-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 62c160afb..5ae3a718d 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -76,7 +76,7 @@ export const CountadjustRequestMain = useCrudSchemas(([ table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -173,7 +173,12 @@ export const CountadjustRequestMain = useCrudSchemas(([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -285,6 +290,16 @@ export const CountadjustRequestMain = useCrudSchemas(([ width: 150 }, }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -526,8 +541,6 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -561,6 +574,17 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index d8bcc0fc7..cf0507cb8 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:countadjustRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:countadjustRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:countadjust-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:countadjust-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 8706bb6e2..08945e0e3 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -160,7 +160,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -265,7 +265,12 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -377,6 +382,16 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -522,8 +537,6 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:customerreceiptRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreceiptRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:customerreceipt-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreceipt-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 7135ecd7b..cc26c3375 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -181,7 +181,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -277,7 +277,12 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + }, isSearch: true, }, { @@ -390,6 +395,16 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -541,8 +556,6 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -678,6 +691,17 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index fac27131b..76df74a47 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:customerreturnRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturnRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:customerreturn-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index b66290ccf..c17c57c1f 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -106,7 +106,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -203,7 +203,12 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -315,6 +320,16 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -447,8 +462,6 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -568,6 +581,17 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index 79799f747..0da4d9688 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:customersettleRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customersettleRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:customersettle-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:customersettle-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 1cb961239..314a76d7c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -173,7 +173,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -270,7 +270,12 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -382,6 +387,16 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -530,8 +545,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -659,6 +672,17 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 4bffa9d7b..37181b620 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:deliverRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliverRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:deliver-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 645b469cf..aba38bdc9 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -14,6 +14,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true }, { label: '计划日期', @@ -40,8 +41,11 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isForm: false, + isSearch: true }, { label: '业务类型', @@ -50,6 +54,12 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'Deliver', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -58,6 +68,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -78,6 +89,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '创建者', @@ -86,6 +98,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '开始时间', @@ -134,6 +147,15 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + dictType: DICT_TYPE.PLAN_STATUS, + dictClass: 'string', + isSearch: true, + form: { + value: 'PLAN_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新者', @@ -142,6 +164,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '最后更新时间', @@ -162,6 +185,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '是否可用', @@ -183,6 +207,16 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -196,15 +230,6 @@ export const DeliverPlanMainRules = reactive({ status: [ { required: true, message: '请选择状态', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], @@ -253,6 +278,12 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } }, { label: '物品代码', @@ -289,6 +320,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '创建者', @@ -297,6 +330,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '计划数量', @@ -314,7 +349,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -340,6 +374,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '最后更新者', @@ -348,13 +384,14 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -368,6 +405,17 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ activeValue: 'TRUE' } } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) @@ -379,12 +427,6 @@ export const DeliverPlanDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 5a9da451d..205bb60de 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -13,7 +13,7 @@ export const SaleMain = useCrudSchemas(reactive([ table: { width: 150 }, - + isSearch: true, }, { label: '订单类型', @@ -115,8 +115,11 @@ export const SaleMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isForm: false, + isSearch: true, }, { label: '业务类型', @@ -125,6 +128,12 @@ export const SaleMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'Deliver', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -133,6 +142,7 @@ export const SaleMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -141,6 +151,7 @@ export const SaleMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '创建时间', @@ -161,6 +172,7 @@ export const SaleMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '最后更新者', @@ -169,6 +181,7 @@ export const SaleMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '最后更新时间', @@ -189,6 +202,7 @@ export const SaleMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '当前阶段', @@ -244,12 +258,6 @@ export const SaleMainRules = reactive({ taxRate: [ { required: true, message: '请输入税率', trigger: 'blur' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], number: [ { required: true, message: '请输入单据号', trigger: 'blur' } ], @@ -297,7 +305,6 @@ export const SaleDetail = useCrudSchemas(reactive([ field: 'stdPackUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -320,7 +327,6 @@ export const SaleDetail = useCrudSchemas(reactive([ field: 'customerPackUnit', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -378,6 +384,9 @@ export const SaleDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { label: '金额', @@ -386,6 +395,9 @@ export const SaleDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { label: '单据号', @@ -394,6 +406,12 @@ export const SaleDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } }, { label: '物品代码', @@ -430,6 +448,8 @@ export const SaleDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false }, { label: '创建者', @@ -438,6 +458,8 @@ export const SaleDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '订单数量', @@ -455,7 +477,6 @@ export const SaleDetail = useCrudSchemas(reactive([ field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -481,6 +502,8 @@ export const SaleDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false }, { label: '最后更新者', @@ -489,13 +512,14 @@ export const SaleDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -510,6 +534,17 @@ export const SaleDetail = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 @@ -541,10 +576,4 @@ export const SaleDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index a05df714a..aae717080 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:inventoryinitRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventoryinitRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:inventoryinit-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventoryinit-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 322614f67..9b6388c4a 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -61,7 +61,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -158,7 +158,12 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -270,6 +275,16 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -487,8 +502,6 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -608,6 +621,17 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index d0a4a0e86..85ef462ae 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:scrapRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrapRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:scrap-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index f6ca6bf04..1661b02c4 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -82,7 +82,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -179,7 +179,12 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -291,6 +296,16 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -505,8 +520,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -540,6 +553,17 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 7b70d0ecb..2b77fae10 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:transferissueRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferissueRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:transferissue-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferissue-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index fb14d10d7..74ea5b301 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -141,7 +141,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -238,7 +238,12 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -350,6 +355,16 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -476,8 +491,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建者', @@ -605,6 +618,17 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index cc2ff7083..8da6fb0f4 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:transferreceiptRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferreceiptRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:transferreceipt-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferreceipt-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts index e7d40e815..8e44ff68e 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts @@ -141,7 +141,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -238,7 +238,12 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -350,6 +355,16 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -476,8 +491,6 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedissueRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedissueRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedissue-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedissue-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 0faf72d6f..6d42b2507 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -82,7 +82,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -179,7 +179,12 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -291,6 +296,16 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -411,8 +426,6 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建者', @@ -532,6 +545,17 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index bf8e449c2..437b6e682 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedreceiptRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceiptRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 1b6f4f314..23949d7f2 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -82,7 +82,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -179,7 +179,12 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -291,6 +296,16 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -479,8 +494,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:issueRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:issueRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:issue-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index c0a9b7020..32f902a22 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -116,7 +116,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -213,7 +213,12 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -345,6 +350,16 @@ export const IssueRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) export const IssueRequestMainRules = reactive({ @@ -472,8 +487,6 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -606,6 +619,17 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue index 037c132eb..598c8edfa 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:onlinesettlementRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:onlinesettlementRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:onlinesettlement-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:onlinesettlement-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts index 86a742c87..ed03fdc72 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts @@ -103,7 +103,12 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -161,7 +166,7 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -273,6 +278,16 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -468,8 +483,6 @@ export const OnlinesettlementRequestDetail = useCrudSchemas(reactive @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:pickRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:pickRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:pick-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:pick-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts index 5db40d813..e3b1f2974 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts @@ -109,7 +109,7 @@ export const PickRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -206,7 +206,12 @@ export const PickRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -318,6 +323,16 @@ export const PickRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -406,8 +421,6 @@ export const PickRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -543,6 +556,17 @@ export const PickRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index d5bc89ef8..64a1ee324 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -71,8 +71,11 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isForm: false, + isSearch: true, }, { label: '业务类型', @@ -81,6 +84,12 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'Issue', + componentProps: { + disabled: true + } + } }, { label: '开始时间', @@ -129,6 +138,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '创建时间', @@ -149,6 +159,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '创建者', @@ -157,6 +168,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '最后更新时间', @@ -177,6 +189,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '最后更新者', @@ -185,6 +198,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '状态', @@ -193,6 +207,15 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 150 }, + dictType: DICT_TYPE.PLAN_STATUS, + dictClass: 'string', + isSearch: true, + form: { + value: 'PLAN_NEW', + componentProps: { + disabled: true + } + } }, { label: '是否可用', @@ -214,6 +237,16 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -239,15 +272,6 @@ export const PreparetoissueMainRules = reactive({ status: [ { required: true, message: '请选择状态', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], @@ -300,6 +324,12 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps: { + disabled: true + } + }, + isTableForm: false, }, { label: '物品代码', @@ -336,6 +366,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '创建者', @@ -344,6 +376,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '计划数量', @@ -375,6 +409,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '最后更新时间', @@ -395,6 +431,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '是否可用', @@ -416,6 +454,17 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 @@ -435,10 +484,4 @@ export const PreparetoissueDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 3294dfec0..0d07b8ad0 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:productionreturnRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturnRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:productionreturn-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index bc7fbe309..b9b30c077 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -83,7 +83,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -180,7 +180,12 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -320,6 +325,16 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -464,8 +479,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:repleinshRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:repleinshRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:repleinsh-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:repleinsh-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index f4f1512d6..e30b811f8 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -108,7 +108,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -205,7 +205,12 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -317,6 +322,16 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -405,8 +420,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -542,6 +555,17 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 5c27f526f..a01fd59f4 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:inventorychangeRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorychangeRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:inventorychange-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorychange-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index a75ad3452..52304e036 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -55,7 +55,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -152,7 +152,12 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -264,6 +269,16 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -587,8 +602,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:inventorymoveRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymoveRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:inventorymove-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index e6085d468..7763fce5b 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -108,7 +108,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -205,7 +205,12 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -337,6 +342,16 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -506,8 +521,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建者', @@ -635,6 +648,17 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue index 174890bf2..2f628bc6c 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:offlinesettlementRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:offlinesettlementRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:offlinesettlement-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:offlinesettlement-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts index 10be06e5b..4495f29a3 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts @@ -64,7 +64,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive @@ -197,8 +197,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:productdismantleRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productdismantleRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:productdismantle-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productdismantle-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index fe41b36b8..ce1177894 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -105,7 +105,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -202,7 +202,12 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -314,6 +319,16 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -506,8 +521,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isForm: false, + isSearch: true, }, { label: '顺序', @@ -82,6 +85,12 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'ProductReceipt', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -90,6 +99,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -98,6 +108,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '创建时间', @@ -118,6 +129,7 @@ export const ProductionMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '状态', @@ -125,11 +137,17 @@ export const ProductionMain = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.PLAN_STATUS, dictClass: 'string', - isSearch: true, isTable: true, table: { width: 150 }, + form: { + value: 'PLAN_NEW', + componentProps: { + disabled: true + } + }, + isSearch: true, }, { label: '开始时间', @@ -178,6 +196,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '最后更新时间', @@ -198,6 +217,7 @@ export const ProductionMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '是否可用', @@ -257,15 +277,6 @@ export const ProductionMainRules = reactive({ status: [ { required: true, message: '请选择状态', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], @@ -328,6 +339,12 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } }, { label: '物品代码', @@ -364,6 +381,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '创建者', @@ -372,6 +391,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '计划数量', @@ -382,7 +403,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', - } + }, }, { label: '计量单位', @@ -415,6 +436,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '最后更新者', @@ -423,6 +446,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '是否可用', @@ -443,6 +468,17 @@ export const ProductionDetail = useCrudSchemas(reactive([ activeValue: 'TRUE' } } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) @@ -469,16 +505,7 @@ export const ProductionDetailRules = reactive({ planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' } ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts index 1fc30e248..cae3ed8ef 100644 --- a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts +++ b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts @@ -1,5 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import { fa } from 'element-plus/es/locale' const { t } = useI18n() // 国际化 /** @@ -79,8 +80,11 @@ export const WorkMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isForm: false, + isSearch: true }, { label: '业务类型', @@ -89,6 +93,12 @@ export const WorkMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'ProductReceipt', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -97,6 +107,7 @@ export const WorkMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '创建时间', @@ -117,6 +128,7 @@ export const WorkMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '创建者', @@ -125,6 +137,7 @@ export const WorkMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '最后更新时间', @@ -145,6 +158,7 @@ export const WorkMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '最后更新者', @@ -153,6 +167,7 @@ export const WorkMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '当前阶段', @@ -168,7 +183,15 @@ export const WorkMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true + isTable: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '操作', @@ -248,6 +271,7 @@ export const WorkDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, }, { label: '物品代码', @@ -284,6 +308,8 @@ export const WorkDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, + isTableForm: false, }, { label: '创建者', @@ -292,6 +318,8 @@ export const WorkDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '订单数量', @@ -335,6 +363,8 @@ export const WorkDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, + isTableForm: false, }, { label: '最后更新者', @@ -343,6 +373,8 @@ export const WorkDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '是否可用', @@ -364,6 +396,17 @@ export const WorkDetail = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 @@ -380,16 +423,7 @@ export const WorkDetailRules = reactive({ planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], number: [ { required: true, message: '请输入单据号', trigger: 'blur' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 819c9ea96..675bfcab4 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:productputawayRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productputawayRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:productputaway-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productputaway-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 6aa1ba616..b14b6f442 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -89,7 +89,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -186,7 +186,12 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -326,6 +331,16 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -454,8 +469,6 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -591,6 +604,17 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 0adb41b27..47ad88504 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:productreceiptRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceiptRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:productreceipt-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 92c76c8e3..0fafd56c3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -114,7 +114,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -211,7 +211,12 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -323,6 +328,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -534,8 +549,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -651,6 +664,17 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isForm: false + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index ab5de3241..c14af2974 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:productrepairRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productrepairRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:productrepair-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productrepair-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index aadc00d52..9defa578b 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -105,7 +105,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -202,7 +202,12 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -314,6 +319,16 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -455,8 +470,6 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -575,6 +588,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, isTableForm: false, isForm: false + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index e2b1f42b1..42f6f4680 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:productscrapRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:productscrapRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:productscrap-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:productscrap-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 53f06714f..cba5323e5 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -81,7 +81,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -178,7 +178,12 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -290,6 +295,16 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -507,8 +522,6 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -542,6 +555,17 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index b431c539c..f60e6e6be 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:inspectRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspectRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:inspect-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspect-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts index ee7b30f8f..e991ef63a 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts @@ -98,7 +98,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建者', @@ -195,7 +195,12 @@ export const InspectRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新者', @@ -413,6 +418,16 @@ export const InspectRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -602,6 +617,17 @@ export const InspectRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 69c6d1096..35e983bae 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -198,8 +198,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:purchasereceiptRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchasereceiptRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchasereceipt-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d12a460eb..ed2b32369 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -165,7 +165,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建时间', @@ -292,7 +292,12 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '自动提交', @@ -374,6 +379,16 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -692,8 +707,6 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 4faf56503..6d066601e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -230,7 +230,12 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -239,7 +244,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建者', @@ -385,10 +390,11 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ label: '操作', field: 'action', isDetail: false, - isForm: false , + isForm: false, table: { - width: 300 - } + width: 300, + fixed: 'right' + }, } ])) @@ -601,8 +607,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, }, { label: '创建者', @@ -659,6 +663,17 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isForm: false, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 8a33d0784..05cd2caef 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -196,8 +196,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:putawayRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:putawayRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:putaway-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:putaway-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index b76c6598d..e5baf9729 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -89,7 +89,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -186,7 +186,12 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -325,6 +330,16 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -453,8 +468,6 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTableForm: false, - isForm: false }, { label: '创建时间', @@ -590,6 +603,17 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } ])) //表单校验 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index a64ce1e67..e8b1215b9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -13,6 +13,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, }, { label: '版本号', @@ -89,8 +90,11 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, + isForm: false, + isSearch: true, }, { label: '业务类型', @@ -99,14 +103,26 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTable: false, }, { label: '状态', field: 'status', + dictType: DICT_TYPE.PURCHASE_ORDER_STATUS, + dictClass: 'string', + isTable: true, + isSearch: true, sort: 'custom', table: { width: 150 }, + form: { + value: 'ORDER_READY', + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -115,6 +131,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -136,6 +153,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isForm: false, }, { label: '创建者', @@ -144,6 +162,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '是否可用', @@ -165,6 +184,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ } }, }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) //表单校验 @@ -178,15 +207,9 @@ export const DemandforecastingMainRules = reactive({ number: [ { required: true, message: '请输入单据号', trigger: 'blur' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], + // businessType: [ + // { required: true, message: '请输入业务类型', trigger: 'blur' } + // ], }) /** @@ -220,6 +243,12 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + form: { + componentProps: { + disbaled: true + } + } }, { label: '物品代码', @@ -256,6 +285,8 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '创建者', @@ -264,6 +295,8 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '计划数量', @@ -281,7 +314,6 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -307,6 +339,8 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTableForm: false, + isForm: false, }, { label: '最后更新者', @@ -315,6 +349,19 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) @@ -338,10 +385,4 @@ export const DemandforecastingDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'change' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 6d703d426..ca9c0a997 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -13,7 +13,8 @@ export const PurchaseMain = useCrudSchemas(reactive([ isSearch: true, isForm: false, table: { - width: 150 + width: 150, + fixed: 'left' }, }, { @@ -48,6 +49,12 @@ export const PurchaseMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'ORDER_READY', + componentProps: { + disabled: true + } + } }, { label: '订单日期', @@ -160,6 +167,12 @@ export const PurchaseMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'PurchaseReceipt', + componentProps: { + disabled: true + } + } }, { label: '当前阶段', @@ -288,12 +301,6 @@ export const PurchaseMainRules = reactive({ businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'change' } - ], }) /** @@ -454,7 +461,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } }, { - lable: '计量单位', + label: '计量单位', field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', @@ -470,6 +477,11 @@ export const PurchaseDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps: { + disabled: true + } + } }, { label: '物品代码', @@ -488,10 +500,15 @@ export const PurchaseDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps: { + disabled: true + } + } }, { label: '备注', - fielc: 'remark', + field: 'remark', table: { width: 150 }, @@ -522,6 +539,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '创建时间', @@ -534,7 +552,8 @@ export const PurchaseDetail = useCrudSchemas(reactive([ }, table: { width: 180 - } + }, + isForm: false, }, { label: '最后更新者', @@ -543,6 +562,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '最后更新时间', @@ -555,7 +575,19 @@ export const PurchaseDetail = useCrudSchemas(reactive([ }, table: { width: 150 - } + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, } ])) @@ -606,10 +638,4 @@ export const PurchaseDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], - createTime: [ - { required: true, message: '请选择创建时间', trigger: 'blur' } - ], }) \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 1a3102c9d..155f81620 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -12,7 +12,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ sort: 'custom', isForm: false , table: { - width: 150 + width: 150, + fixed: 'left' }, isSearch: true }, @@ -56,6 +57,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'PurchaseReceipt', + componentProps: { + disabled: true + } + } }, { label: '状态', @@ -68,6 +75,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + value: 'PLAN_PURCHASE_READY', + componentProps: { + disabled: true + } + } }, { label: '开始时间', @@ -118,6 +131,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -183,6 +197,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isSearch: true, }, { label: '操作', @@ -204,12 +219,6 @@ export const PurchasePlanMainRules = reactive({ status: [ { required: true, message: '请选择状态', trigger: 'change' } ], - createTime: [ - { required: true, message: '请输入创建时间', trigger: 'blur' } - ], - creator: [ - { required: true, message: '请输入创建者', trigger: 'blur' } - ], number: [ { required: true, message: '请输入单据号', trigger: 'blur' } ], @@ -245,6 +254,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ isTableForm:false, table: { width: 150 + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -266,7 +280,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ isTableForm:false, table: { width: 180 - } + }, + isForm: false, }, { label: '创建者', @@ -275,7 +290,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ isTableForm:false, table: { width: 150 - } + }, + isForm: false, }, { label: '已发货数量', @@ -318,7 +334,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ isTableForm:false, table: { width: 150 - } + }, + isForm: false, }, { label: '最后更新时间', @@ -331,7 +348,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ }, table: { width: 180 - } + }, + isForm: false, }, { label: '备注', @@ -339,7 +357,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ sort: 'custom', table: { width: 150 - } + }, }, { label: '是否可用', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index fa483edf2..ff59b420d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -33,7 +33,7 @@ @@ -230,8 +230,8 @@ const butttondata = (row) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:supplierdeliverRequestMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierdeliverRequestMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:supplierdeliver-request-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierdeliver-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 9aee31613..b62e5f935 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -179,7 +179,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false + isTable: false }, { label: '创建时间', @@ -276,7 +276,12 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( width: 150 }, isSearch: true, - isForm: false + form: { + value: 'REQUEST_NEW', + componentProps: { + disabled: true + } + } }, { label: '最后更新时间', @@ -387,6 +392,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( disabled:true, } } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, } ])) @@ -623,8 +638,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive([ field: 'number', isForm:false, table: { - width: 150 - } + width: 150, + fixed: 'left' + }, + isSearch: true, }, { label: '发货单号', @@ -58,7 +60,8 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ }, table: { width: 150 - } + }, + isSearch: true, }, { label: '状态', @@ -68,7 +71,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ isSearch: true, isTable: true, form: { - value:'1', + value:'REQUEST_NEW', componentProps:{ disabled:true, } @@ -151,7 +154,6 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, table: { width: 100 @@ -171,7 +173,6 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, table: { width: 100 @@ -191,7 +192,6 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, table: { width: 100 @@ -274,7 +274,8 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ isDetail: false, isForm: false , table: { - width: 300 + width: 300, + fixed: 'right' } } ])) @@ -429,7 +430,6 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( sort: 'custom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, table: { width: 120 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 302a64764..fedc7617a 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 39d31c3b4..bd7b210bc 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -145,7 +145,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false, + isTable: false, }, { label: '创建者', @@ -285,10 +285,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '操作', field: 'action', isDetail: false, - isForm: false , + isForm: false, table: { - width: 300 - } + width: 300, + fixed: 'right' + }, } ])) @@ -419,7 +420,6 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive