diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index b3b4b40e7..8bb8d00d1 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -250,13 +250,13 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: getChangeRecordList() // 判断详情新增按钮是否显示 HeadButttondata.value = [ - defaultButtons.defaultAddBtn({hide:isShowMainButton(row,['ORDER_READY','PLAN_NEW','PLAN_PURCHASE_READY','1'])}), // 新增 + defaultButtons.defaultAddBtn({hide:isShowMainButton(row,['ORDER_READY','1','PLAN_PURCHASE_READY','1'])}), // 新增 defaultButtons.defaultFilterBtn(null), // 筛选 ] // 动态显示操作列按钮 buttondata.value = [ - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['ORDER_READY','PLAN_NEW','PLAN_PURCHASE_READY','1'])}), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['ORDER_READY','PLAN_NEW','PLAN_PURCHASE_READY','1'])}), // 删除 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['ORDER_READY','1','PLAN_PURCHASE_READY','1'])}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['ORDER_READY','1','PLAN_PURCHASE_READY','1'])}), // 删除 ] } finally { detailLoading.value = false diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 30d4cf47c..6e078dc49 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -302,7 +302,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ width: 150 }, form: { - value: 'PLAN_NEW', + value: '1', componentProps: { disabled: true } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index aba38bdc9..2b2dc5e7f 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -151,7 +151,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, form: { - value: 'PLAN_NEW', + value: '1', componentProps: { disabled: true } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 80c9ed973..30083602a 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -191,14 +191,14 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['PLAN_CLOSED','PLAN_REFUSED'])}), // 打开 - defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['PLAN_NEW','PLAN_REVIEWING','PLAN_AGREED','PLAN_REFUSED','PLAN_PUBLISHED'])}), // 关闭 - defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['PLAN_NEW'])}), // 提交审批 - defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 驳回 - defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 审批通过 - defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['PLAN_AGREED'])}), // 发布 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:delete'}), // 删除 + defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5','4'])}), // 打开 + defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 + defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 + defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2'])}), // 驳回 + defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 + defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3'])}), // 发布 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 08b3f1fdb..016899420 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -191,14 +191,14 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['PLAN_CLOSED','PLAN_REFUSED'])}), // 打开 - defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['PLAN_NEW','PLAN_REVIEWING','PLAN_AGREED','PLAN_REFUSED','PLAN_PUBLISHED'])}), // 关闭 - defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['PLAN_NEW'])}), // 提交审批 - defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 驳回 - defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 审批通过 - defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['PLAN_AGREED'])}), // 发布 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:delete'}), // 删除 + defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5','4'])}), // 打开 + defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 + defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 + defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2'])}), // 驳回 + defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 + defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3'])}), // 发布 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 64a1ee324..7d5249b53 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -211,7 +211,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, form: { - value: 'PLAN_NEW', + value: '1', componentProps: { disabled: true } diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 10d0c0967..bc334d101 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -191,14 +191,14 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['PLAN_CLOSED','PLAN_REFUSED'])}), // 打开 - defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['PLAN_NEW','PLAN_REVIEWING','PLAN_AGREED','PLAN_REFUSED','PLAN_PUBLISHED'])}), // 关闭 - defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['PLAN_NEW'])}), // 提交审批 - defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 驳回 - defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 审批通过 - defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['PLAN_AGREED'])}), // 发布 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:delete'}), // 删除 + defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5','4'])}), // 打开 + defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 + defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 + defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2'])}), // 驳回 + defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 + defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3'])}), // 发布 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 ] } diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index c8d607a0c..4b5de1e11 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -142,7 +142,7 @@ export const ProductionMain = useCrudSchemas(reactive([ width: 150 }, form: { - value: 'PLAN_NEW', + value: '1', componentProps: { disabled: true }