HL-6047QMS来料检验申请，来料检验任务，来料检验记录中增加查看供应商履历表功能

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -125,3 +125,8 @@ export const importTemplate = () => {
 export const deleteOldLabels = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id })
 }
+
+// 查看履历表
+export const querySupplierResume =  (asnNumber:string) => {
+  return  request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber })
+}

src/locales/en-US.ts

@@ -757,6 +757,7 @@ export default {
     物料描述2:'Material Description2',
     项目代码:'Item Code',
     质检明细:'Quality inspection details',
+    履历表明细:'Details of your resume',
     添加附件:'Add Attachment',
     变更记录:'Change Record',
     添加明细:'Add Detail',

src/locales/zh-CN.ts

@@ -759,6 +759,7 @@ export default {
     物料描述2:'物料描述2',
     项目代码:'项目代码',
     质检明细:'质检明细',
+    履历表明细:'履历表明细',
     添加附件:'添加附件',
     变更记录:'变更记录',
     添加明细:'添加明细',

src/permission.ts

@@ -23,7 +23,8 @@ const whiteList = [
   '/bind',
   '/register',
   '/oauthLogin/gitee',
-  '/purchasereceiptReport'
+  '/purchasereceiptReport',
+  '/supplierResume'
 ]
 
 // 路由加载前

src/router/modules/remaining.ts

@@ -265,6 +265,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/supplierResume',
+    component: () => import('@/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue'),
+    name: 'supplierResume',
+    meta: {
+      hidden: true,
+      title: t('ts.查看履历表'),
+      noTagsView: true
+    }
+  },
   {
     path: '/bpm',
     component: Layout,

src/utils/disposition/defaultButtons.ts

@@ -772,6 +772,17 @@ export function mainListPlanCheckQualityReportBtn(option: any) {
     hasPermi: ''
   })
 }
+export function mainListSupplierResumeBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.查看履历表`).replace('ts.', ''),
+    name: 'mainSupplierResume',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 
 // 主列表-计划流程-提交审批按钮
 export function mainListPlanSubBtn(option: any) {

src/views/qms/inspectionJob/index.vue

@@ -78,7 +78,7 @@
   />
   <el-dialog
     v-model="showQualityReport"
-    :title="t('质检明细')"
+    :title="reportTitle"
     :append-to-body="false"
     destroy-on-close
     fullscreen
@@ -285,7 +285,10 @@ const butttondata = (row) => {
     defaultButtons.mainListPackageBtn(null), // 包装
     defaultButtons.mainListPlanCheckQualityReportBtn({
       hide: isShowMainButton3(row)
-    }) // 查看质检报告
+    }), // 查看质检报告
+    defaultButtons.mainListSupplierResumeBtn({
+      hide: isShowMainButton3(row)
+    }) // 查看履历表
   ]
 }
 const listTableRef = ref()
@@ -313,6 +316,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanCheckQualityReport') {
     // 查看质检报告
     checkQualityReport(row)
+  } else if (val == 'mainSupplierResume') {
+    // 查看履历表
+    checkSupplierResume(row)
   } else if (val == 'mainJobAcc') {
     // 承接
     handleAccept(row.id)
@@ -323,11 +329,19 @@ const buttonTableClick = async (val, row) => {
 const reportHeight = ref(window.innerHeight - 120)
 const showQualityReport = ref(false)
 const qualityReport = ref('')
+const reportTitle = ref('')
+
 const checkQualityReport = async (row) => {
+  reportTitle.value = t('ts.质检明细')
   showQualityReport.value = true
   qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
 }
-
+// 查看履历表
+const checkSupplierResume = async (row) => {
+  reportTitle.value = t('ts.履历表明细')
+  showQualityReport.value = true
+  qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber
+}
 /** 添加/修改操作 */
 // const formRef = ref()
 // const openForm = async (type : string, row ?: number) => {

src/views/qms/inspectionJob/inspectionJobMain.data.ts

@@ -686,7 +686,7 @@ export const InspectionJobMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 300,
+        width: 390,
         fixed: 'right'
       }
     }

src/views/qms/inspectionRecord/index.vue

@@ -85,7 +85,7 @@
   />
   <el-dialog
     v-model="showQualityReport"
-    :title="t('质检明细')"
+    :title="reportTitle"
     :append-to-body="false"
     destroy-on-close
     fullscreen
@@ -257,7 +257,8 @@ const butttondata = (row) => {
     // hasPermi: 'qms:inspection-recode-main:execute',
     //  }), // 执行
     defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+    defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表
   ]
 }
 
@@ -306,6 +307,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanCheckQualityReport') {
     // 查看质检报告
     checkQualityReport(row)
+  } else if (val == 'mainSupplierResume') {
+    // 查看履历表
+    checkSupplierResume(row)
   } else if (val == 'edit') {
     //修改
     // 执行
@@ -317,10 +321,18 @@ const buttonTableClick = async (val, row) => {
 const reportHeight = ref(window.innerHeight - 120)
 const showQualityReport = ref(false)
 const qualityReport = ref('')
+const reportTitle = ref('')
 const checkQualityReport = async (row) => {
+  reportTitle.value = t('ts.质检明细')
   showQualityReport.value = true
   qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
 }
+// 查看履历表
+const checkSupplierResume = async (row) => {
+  reportTitle.value = t('ts.履历表明细')
+  showQualityReport.value = true
+  qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber
+}
 /** 添加/修改操作 */
 const basicFormRef = ref()
 // const openForm = async (type : string, row ?: number) => {

src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@@ -603,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 340,
+        width: 430,
         fixed: 'right'
       }
     }

src/views/qms/inspectionRecord/inspectionRecordPurchase.vue

@@ -5,7 +5,7 @@
 <script setup lang="ts">
 import index from './index.vue'
   
-// 采购订单
+// 采购检验记录
 defineOptions({ name: 'inspectionRecordPurchase' })
 const indesRef = ref()
 onActivated(() => {

src/views/qms/inspectionRequest/index.vue

@@ -89,7 +89,7 @@
 
     <el-dialog
     v-model="showQualityReport"
-    :title="t('质检明细')"
+    :title="reportTitle"
     :append-to-body="false"
     destroy-on-close
     fullscreen
@@ -118,6 +118,7 @@ import { getReportUrl } from '@/utils/systemParam'
 // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
+// 检验申请
 defineOptions({ name: 'inspectionMain' })
 
 const message = useMessage() // 消息弹窗
@@ -238,7 +239,9 @@ const butttondata = (row) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'qms:inspection-request-main:edit'
     }),// 编辑
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+    defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表
+    
   ]
 }
 const listTableRef = ref()
@@ -278,6 +281,9 @@ const buttonTableClick = async (val, row) => {
   }else if (val == 'mainPlanCheckQualityReport') {
     // 查看质检报告
     checkQualityReport(row)
+  }else if (val == 'mainSupplierResume') {
+    // 查看履历表
+    checkSupplierResume(row)
   } 
 }
 
@@ -369,10 +375,18 @@ const handleSubmit = async (id: number) => {
 const reportHeight = ref(window.innerHeight - 120)
 const showQualityReport = ref(false)
 const qualityReport = ref('')
+const reportTitle = ref('')
 const checkQualityReport = async (row) => {
+  reportTitle.value = t('ts.质检明细')
   showQualityReport.value = true
   qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
 }
+// 查看履历表
+const checkSupplierResume = async (row) => {
+  reportTitle.value = t('ts.履历表明细')
+  showQualityReport.value = true
+  qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber
+}
 
 /** 添加/修改操作 */
 const formRef = ref()

src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@@ -576,7 +576,7 @@ export const InspectionMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 300,
+        width: 390,
         fixed: 'right'
       }
     }