From 6a7df5a967b18ce38b541479d3cf5ab29780b1d5 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Sat, 12 Oct 2024 17:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8F=91=E9=80=81=E5=88=B0=E8=B4=A7=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=E5=8E=BB=E6=8E=89=20=20YT-?= =?UTF-8?q?349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain.data.ts | 136 +++++++++--------- .../purchasereceiptJobMain/index.vue | 12 +- .../purchasereceiptRecordMTypeMain/index.vue | 12 +- .../purchasereceiptRecordMain/index.vue | 24 ++-- .../purchasereceiptRecordRefuseMain/index.vue | 9 +- .../purchasereceiptRequestMain/index.vue | 9 +- 6 files changed, 104 insertions(+), 98 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index fd3e49d1e..143740125 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -625,74 +625,74 @@ export const ProductreceiptRequestMainRules = reactive({ * @returns {Array} 制品收货申请子表 */ export const ProductreceiptRequestDetail = useCrudSchemas(reactive([ - { - label: '生产线代码', - field: 'productionLineCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - tableForm:{ - disabled:true, - multiple: true, - // isInpuFocusShow: true, - searchListPlaceholder: '请选择生产线代码', - searchField: 'code', - searchTitle: '生产线信息', - searchAllSchemas: Productionline.allSchemas, - searchPage: ProductionlineApi.getProductionlinePage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'workshopCode', - value: 'workshopCode', - message: '请填写车间代码！', - isMainValue: true - }], - verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 - isShowTableFormSearch: true, - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择生产线代码', - searchField: 'code', - searchTitle: '生产线信息', - searchAllSchemas: Productionline.allSchemas, - searchPage: ProductionlineApi.getProductionlinePage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'workshopCode', - value: 'workshopCode', - message: '请填写车间代码！', - isMainValue: true - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '生产线代码', + // field: 'productionLineCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // tableForm:{ + // disabled:true, + // multiple: true, + // // isInpuFocusShow: true, + // searchListPlaceholder: '请选择生产线代码', + // searchField: 'code', + // searchTitle: '生产线信息', + // searchAllSchemas: Productionline.allSchemas, + // searchPage: ProductionlineApi.getProductionlinePage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'workshopCode', + // value: 'workshopCode', + // message: '请填写车间代码！', + // isMainValue: true + // }], + // verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 + // isShowTableFormSearch: true, + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择生产线代码', + // searchField: 'code', + // searchTitle: '生产线信息', + // searchAllSchemas: Productionline.allSchemas, + // searchPage: ProductionlineApi.getProductionlinePage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'workshopCode', + // value: 'workshopCode', + // message: '请填写车间代码！', + // isMainValue: true + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, { label: '工位代码', field: 'workStationCode', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 82a8384bd..2e1e4d1fe 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -239,7 +239,7 @@ const butttondata = (row,$index) => { hasPermi: 'wms:purchasereceipt-job-main:refusal', link: true // 文本展现按钮 }, - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -258,10 +258,12 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-承接') await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId) buttonBaseClick('refresh',null) - } else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) - } else if(val == 'mainJobRefusal'){ + } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } + else if(val == 'mainJobRefusal'){ // handleRefusal(row.masterId) resonSubmit(row) } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue index 0f08e0c3f..4a01ed300 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue @@ -181,16 +181,16 @@ const isShowSourceTypeButton = (row) => { // 列表-操作按钮 const butttondata = (row,$index) => { - const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>-1&&findIndex<$index){ - return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] - } + // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 + // if(findIndex>-1&&findIndex<$index){ + // return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] + // } 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({hide:row.orderTypeM == "2"}), // 查看质检报告 - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 - defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index e5f926a9b..7195d526a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -181,17 +181,17 @@ const isShowSourceTypeButton = (row) => { // 列表-操作按钮 const butttondata = (row,$index) => { - const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>-1&&findIndex<$index){ - return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] - } + // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 + // if(findIndex>-1&&findIndex<$index){ + // return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] + // } return [ - defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 + // 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.mainPurchasereturnRecordBtn({hasPermi:'wms:purchasereceipt-record-main:createPurchasereturnRecord',hide:row.purchasereturnRecordFlag == "FALSE" }),// 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 - defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 - defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) ] } @@ -203,10 +203,12 @@ const buttonTableClick = async (val, row) => { handleCreateInspectRequest(row.number) }else if(val == 'purchasereturnRecord'){//生成采购退后记录申请 handleCreatePurchasereturnRecord(row.number) - }else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) - }else if (val == 'printInspection'){ + } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } + else if (val == 'printInspection'){ handlePrint(row) } } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue index 9e8c619ed..08a5d6413 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue @@ -176,7 +176,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({}), // 查看质检报告 ] } @@ -186,10 +186,11 @@ const buttonTableClick = async (val, row) => { handleCreatePutawayRequest(row.number) }else if(val == 'inspectRequest'){//生成到货检验申请 handleCreateInspectRequest(row.number) - }else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } } // 查看质检报告 const showQualityReport = ref(false) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index caadd7bdd..75c48c672 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -415,7 +415,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','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({hide:isShowSourceTypeButton(row)}), // 查看质检报告 + // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -460,10 +460,11 @@ const buttonTableClick = async (val, row) => { }else if (val == 'point') { // 标签打印 labelPrint(row) - }else if(val == 'mainPlanCheckQualityReport'){ - // 查看质检报告 - checkQualityReport(row) } + // else if(val == 'mainPlanCheckQualityReport'){ + // // 查看质检报告 + // checkQualityReport(row) + // } } // 生成标签选择 const onChangeLabel =(field,e,row, index) => {