diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index a4d7aaa94..16c5c260d 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -238,6 +238,14 @@ const isShowMainButton = (row, val) => { } } +const isShowMainButton3 = (row) => { + if (row.asnNumber) { + return false + } else { + return true + } +} + // 根据状态返回该按钮是否显示 const isShowMainButton2 = (row, val) => { if (val.indexOf(row.isStaging) > -1) { @@ -283,7 +291,9 @@ const butttondata = (row) => { hasPermi: 'qms:inspection-job-main:execute' }), // 发布 defaultButtons.mainListPackageBtn(null), // 包装 - defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 + defaultButtons.mainListPlanCheckQualityReportBtn({ + hide: isShowMainButton3(row) + }) // 查看质检报告 ] } const listTableRef = ref() diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts index 32c7b00bf..660fbb2e3 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts @@ -42,7 +42,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isSearch: true + isSearch: false }, { label: '申请时间', diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts index 761dbda4f..62fe54e2d 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts @@ -801,12 +801,66 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive