diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 869231e59..f32d747da 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -173,7 +173,7 @@ const butttondata = (row,$index) => { return [ defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 - defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 0f8416636..27b1a655d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -729,9 +729,11 @@ const submitForm = async (formType, submitData) => { data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { + data.orderTypeM='1'; await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data) message.success(t('common.createSuccess')) } else { + data.orderTypeM='1'; await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue index f93c5f128..8863f857d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue @@ -353,20 +353,20 @@ const butttondata = (row,$index) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 - { - label: '生成标签', - name: 'ssbq', - hide: isASNShowMainButton(row, ['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true // 文本展现按钮 - }, - defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印 + // { + // label: '生成标签', + // name: 'ssbq', + // hide: isASNShowMainButton(row, ['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true // 文本展现按钮 + // }, + // defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 - defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + // defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 ] } @@ -729,9 +729,11 @@ const submitForm = async (formType, submitData) => { data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { + data.orderTypeM='2'; await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data) message.success(t('common.createSuccess')) } else { + data.orderTypeM='2'; await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts index 2a7c4a340..5a46ecd78 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts @@ -535,6 +535,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE', + disabled:true } } }, @@ -589,9 +590,6 @@ export const PurchasereceiptRequestMainRules = reactive({ autoExecute: [ { required: true, message: '请选择是否自动执行', trigger: 'change' } ], - directCreateRecord: [ - { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } - ], businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index f79b3655e..45c2359b6 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -590,9 +590,11 @@ const submitForm = async (formType, submitData) => { data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { + data.orderTypeM='1'; await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMainSpare(data) message.success(t('common.createSuccess')) } else { + data.orderTypeM='1'; await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) message.success(t('common.updateSuccess')) }