diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 0b4c77e..b7ebf0f 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -61,7 +61,8 @@ { path: 'order/approved/:id', name: 'OrderDetailApproved', - component: () => import('@/views/resource/person/order/approvedDetail.vue'), + component: () => + import('@/views/resource/person/order/approvedDetail.vue'), meta: { title: '授权(代理)委托书', icon: 'ep:key', @@ -218,7 +219,8 @@ { path: 'historyDoc/:type/:id?', name: 'HistoryDocDetail', - component: () => import('@/views/resource/system/historyDoc/detail.vue'), + component: () => + import('@/views/resource/system/historyDoc/detail.vue'), meta: { title: '历史文件', icon: 'ep:key', @@ -299,7 +301,8 @@ { path: 'method/:type/:id?', name: 'MethodDetail', - component: () => import('@/views/resource/technology/method/detail.vue'), + component: () => + import('@/views/resource/technology/method/detail.vue'), meta: { title: '现行测试校准检定方法', icon: 'ep:key', @@ -333,7 +336,8 @@ { path: 'methodConfirm/:type/:id?', name: 'FileMethodConfirmDetail', - component: () => import('@/views/resource/file/methodConfirm/detail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/detail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -345,7 +349,8 @@ { path: 'methodConfirm/approved/:id', name: 'FileMethodConfirmDetailApproved', - component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/approvedDetail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -367,7 +372,8 @@ { path: 'noveltySearch/:type/:id?', name: 'FileNoveltySearchDetail', - component: () => import('@/views/resource/file/noveltySearch/detail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/detail.vue'), meta: { title: '测试校准检定方法查新记录表详情', icon: 'ep:key', @@ -379,7 +385,8 @@ { path: 'noveltySearch/approved/:id', name: 'FileNoveltySearchDetailApproved', - component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/approvedDetail.vue'), meta: { title: '测试校准检定方法查新记录表', icon: 'ep:key', @@ -426,7 +433,8 @@ { path: 'change/approved/:id', name: 'FileChangeFormDetailApproved', - component: () => import('@/views/resource/file/change/approvedDetail.vue'), + component: () => + import('@/views/resource/file/change/approvedDetail.vue'), meta: { title: '文件更改申请单', icon: 'ep:key', @@ -460,7 +468,8 @@ { path: 'approval/approved/:id', name: 'FileApprovalFormDetailApproved', - component: () => import('@/views/resource/file/approval/approvedDetail.vue'), + component: () => + import('@/views/resource/file/approval/approvedDetail.vue'), meta: { title: '文件审批详情', icon: 'ep:key', @@ -494,7 +503,8 @@ { path: 'grantNotice/approved/:id', name: 'FileGrantNoticeDetailApproved', - component: () => import('@/views/resource/file/grantNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/file/grantNotice/approvedDetail.vue'), meta: { title: '文件发放通知单详情', icon: 'ep:key', @@ -516,7 +526,8 @@ { path: 'recallArchive/:type/:id?', name: 'FileRecallArchiveDetail', - component: () => import('@/views/resource/file/recallArchive/detail.vue'), + component: () => + import('@/views/resource/file/recallArchive/detail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -528,7 +539,8 @@ { path: 'recallArchive/approved/:id', name: 'FileRecallArchiveDetailApproved', - component: () => import('@/views/resource/file/recallArchive/approvedDetail.vue'), + component: () => + import('@/views/resource/file/recallArchive/approvedDetail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -585,7 +597,8 @@ { path: 'revision/:type/:id?/:status?', name: 'RevisionApplyDetail', - component: () => import('@/views/resource/software/revision/detail.vue'), + component: () => + import('@/views/resource/software/revision/detail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -597,7 +610,8 @@ { path: 'revision/approved/:id?', name: 'RevisionApplyDetailApproved', - component: () => import('@/views/resource/software/revision/approvedDetail.vue'), + component: () => + import('@/views/resource/software/revision/approvedDetail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -631,7 +645,8 @@ { path: 'review/approved/:id?', name: 'ReviewReportDetailApproved', - component: () => import('@/views/resource/software/review/approvedDetail.vue'), + component: () => + import('@/views/resource/software/review/approvedDetail.vue'), meta: { title: '软件评审报告详情', icon: 'ep:key', @@ -656,7 +671,8 @@ { path: 'requireList', name: 'EnvironmentRequireList', - component: () => import('@/views/resource/environment/require/list.vue'), + component: () => + import('@/views/resource/environment/require/list.vue'), meta: { title: '工作间环境条件要求一览表', auth: '/resource/environment/require', @@ -666,7 +682,8 @@ { path: 'requireDetail', name: 'EnvironmentRequireDetail', - component: () => import('@/views/resource/environment/require/detail.vue'), + component: () => + import('@/views/resource/environment/require/detail.vue'), meta: { title: '工作间环境条件要求详情', icon: 'ep:key', @@ -678,7 +695,8 @@ { path: 'resistanceList', name: 'EnvironmentResistanceList', - component: () => import('@/views/resource/environment/resistance/list.vue'), + component: () => + import('@/views/resource/environment/resistance/list.vue'), meta: { title: '实验室接地电阻记录', auth: '/resource/environment/resistance', @@ -688,7 +706,8 @@ { path: 'resistance/detail', name: 'EnvironmentResistanceDetail', - component: () => import('@/views/resource/environment/resistance/detail.vue'), + component: () => + import('@/views/resource/environment/resistance/detail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -700,7 +719,8 @@ { path: 'resistance/approved/:type?/:id?', name: 'EnvironmentResistanceDetailApproved', - component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/resistance/approvedDetail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -712,7 +732,8 @@ { path: 'voltageList', name: 'EnvironmentVoltageList', - component: () => import('@/views/resource/environment/voltage/list.vue'), + component: () => + import('@/views/resource/environment/voltage/list.vue'), meta: { title: '工作间供电电压记录', auth: '/resource/environment/voltage', @@ -722,7 +743,8 @@ { path: 'voltage/detail', name: 'EnvironmentVoltageDetail', - component: () => import('@/views/resource/environment/voltage/detail.vue'), + component: () => + import('@/views/resource/environment/voltage/detail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -734,7 +756,8 @@ { path: 'voltage/approved/:type?/:id?', name: 'EnvironmentVoltageDetailApproved', - component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/voltage/approvedDetail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -768,7 +791,8 @@ { path: 'ups/approved/:type?/:id?', name: 'EnvironmentUpsDetailApproved', - component: () => import('@/views/resource/environment/ups/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/ups/approvedDetail.vue'), meta: { title: 'UPS蓄电池内阻测试记录详情', icon: 'ep:key', @@ -790,7 +814,8 @@ { path: 'setting', name: 'EnvironmentSetting', - component: () => import('@/views/resource/environment/record/setting.vue'), + component: () => + import('@/views/resource/environment/record/setting.vue'), meta: { title: '环境记录单设置', icon: 'ep:key', @@ -799,14 +824,28 @@ activeMenu: '/environment/recordList', }, }, + // { + // path: 'bench', + // name: 'EnvironmentBench', + // component: () => import('@/views/dataManagement/index.vue'), + // meta: { + // title: '环境数据看板', + // auth: '/resource/environment/bench', + // icon: 'ep:key', + // breadcrumb: false, + // sidebar: true, + // }, + // }, { - path: 'bench', - name: 'EnvironmentBench', - component: () => import('@/views/resource/environment/bench/index.vue'), + path: '/dataManagement/index', + name: 'DataManagementIndex', + component: () => import('@/views/dataManagement/index.vue'), meta: { title: '环境数据看板', auth: '/resource/environment/bench', icon: 'ep:key', + breadcrumb: false, + sidebar: true, }, }, ], @@ -825,7 +864,8 @@ { path: 'supplierList', name: 'SupplierList', - component: () => import('@/views/resource/outsideService/supplier/list.vue'), + component: () => + import('@/views/resource/outsideService/supplier/list.vue'), meta: { title: '合格供方名录', auth: '/resource/outsideService/supplier', @@ -835,7 +875,8 @@ { path: ':type/:id?/:status?', name: 'SupplierDetail', - component: () => import('@/views/resource/outsideService/supplier/detail.vue'), + component: () => + import('@/views/resource/outsideService/supplier/detail.vue'), meta: { title: '合格供方名录详情', icon: 'ep:key', @@ -847,7 +888,8 @@ { path: 'serviceEvaluateList', name: 'ServiceEvaluateList', - component: () => import('@/views/resource/outsideService/service/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateList.vue'), meta: { title: '外部服务评价表', auth: '/resource/outsideService/serviceEvaluate', @@ -857,7 +899,8 @@ { path: 'service/:type/:id?/:status?', name: 'ServiceEvaluateDetail', - component: () => import('@/views/resource/outsideService/service/evaluateDetail.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateDetail.vue'), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -869,7 +912,10 @@ { path: 'service/approved/:id?', name: 'ServiceEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue' + ), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -881,7 +927,8 @@ { path: 'equipmentEvaluateList', name: 'EquipmentEvaluateList', - component: () => import('@/views/resource/outsideService/equipment/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/equipment/evaluateList.vue'), meta: { title: '设备供方评价表', auth: '/resource/outsideService/equipmentEvaluate', @@ -891,7 +938,10 @@ { path: 'equipment/:type/:id?/:status?', name: 'EquipmentEvaluateDetail', - component: () => import('@/views/resource/outsideService/equipment/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/equipment/evaluateDetail.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -903,7 +953,10 @@ { path: 'equipment/approved/:id?', name: 'EquipmentEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -915,7 +968,8 @@ { path: 'consumableApplyList', name: 'ConsumableApplyList', - component: () => import('@/views/resource/outsideService/consumable/applyList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyList.vue'), meta: { title: '易耗物资申请单', auth: '/resource/outsideService/consumableApply', @@ -925,7 +979,8 @@ { path: 'consumableApply/:type/:id?/:status?', name: 'ConsumableApplyDetail', - component: () => import('@/views/resource/outsideService/consumable/applyDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyDetail.vue'), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -937,7 +992,10 @@ { path: 'consumableApply/approved/:type?/:id?', name: 'ConsumableApplyDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableApply.vue' + ), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -949,7 +1007,8 @@ { path: 'consumableCheckList', name: 'ConsumableCheckList', - component: () => import('@/views/resource/outsideService/consumable/checkList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkList.vue'), meta: { title: '物资验收记录', auth: '/resource/outsideService/consumableCheck', @@ -959,7 +1018,8 @@ { path: 'consumableCheck/:type/:id?/:status?', name: 'ConsumableCheckDetail', - component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkDetail.vue'), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -971,7 +1031,10 @@ { path: 'consumableCheck/approved/:id?', name: 'ConsumableCheckDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableCheck.vue' + ), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -983,7 +1046,8 @@ { path: 'consumableStoreList', name: 'ConsumableStoreList', - component: () => import('@/views/resource/outsideService/consumable/storeList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeList.vue'), meta: { title: '物资入库单', auth: '/resource/outsideService/consumableStore', @@ -993,7 +1057,8 @@ { path: 'consumableStore/:type/:id?/:status?', name: 'ConsumableStoreDetail', - component: () => import('@/views/resource/outsideService/consumable/storeDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeDetail.vue'), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1005,7 +1070,10 @@ { path: 'consumableStore/approved/:type?/:id?', name: 'ConsumableStoreDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableStore.vue' + ), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1017,7 +1085,8 @@ { path: 'consumableUseList', name: 'ConsumableUseList', - component: () => import('@/views/resource/outsideService/consumable/useList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useList.vue'), meta: { title: '易耗物资使用记录', auth: '/resource/outsideService/consumableUse', @@ -1027,7 +1096,8 @@ { path: 'consumable/:type/:id?/:status?', name: 'ConsumableUseDetail', - component: () => import('@/views/resource/outsideService/consumable/useDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useDetail.vue'), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1039,7 +1109,10 @@ { path: 'consumable/approved/:id?', name: 'ConsumableUseDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableUse.vue' + ), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1051,7 +1124,8 @@ { path: 'consumableHandoverList', name: 'ConsumableHandoverList', - component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/handoverList.vue'), meta: { title: '废弃物资处理交接记录', auth: '/resource/outsideService/consumableHandover', @@ -1061,7 +1135,10 @@ { path: 'consumableHandover/:type/:id?', name: 'ConsumableHandoverDetail', - component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/handoverDetail.vue' + ), meta: { title: '废弃物资处理交接记录详情', icon: 'ep:key', @@ -1073,7 +1150,8 @@ { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', - component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/evaluateList.vue'), meta: { title: '易耗物资供方评价表', auth: '/resource/outsideService/consumableEvaluate', @@ -1083,7 +1161,10 @@ { path: 'consumable/supplier/:type/:id?/:status?', name: 'ConsumableEvaluateDetail', - component: () => import('@/views/resource/outsideService/consumable/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/evaluateDetail.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1095,7 +1176,10 @@ { path: 'consumable/supplier/approved/:id?', name: 'ConsumableEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1142,7 +1226,8 @@ { path: 'reviewNoticeList', name: 'ReviewNoticeList', - component: () => import('@/views/resource/customer/reviewNotice/list.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/list.vue'), meta: { title: '检测结果复查通知列表', auth: '/resource/customer/reviewNotice', @@ -1152,7 +1237,8 @@ { path: 'reviewNotice/:type/:id?', name: 'ReviewNoticeDetail', - component: () => import('@/views/resource/customer/reviewNotice/detail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/detail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1164,7 +1250,8 @@ { path: 'reviewNotice/approved/:id?', name: 'NoticeDetailApproved', - component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1176,7 +1263,8 @@ { path: 'situationReportList', name: 'SituationReportList', - component: () => import('@/views/resource/customer/situationReport/list.vue'), + component: () => + import('@/views/resource/customer/situationReport/list.vue'), meta: { title: '委托方情况报告列表', auth: '/resource/customer/situationReport', @@ -1186,7 +1274,8 @@ { path: 'situationReport/:type/:id?', name: 'SituationReportDetail', - component: () => import('@/views/resource/customer/situationReport/detail.vue'), + component: () => + import('@/views/resource/customer/situationReport/detail.vue'), meta: { title: '委托方情况报告详情', icon: 'ep:key', @@ -1198,7 +1287,8 @@ { path: 'questionnaireList', name: 'QuestionnaireList', - component: () => import('@/views/resource/customer/questionnaire/list.vue'), + component: () => + import('@/views/resource/customer/questionnaire/list.vue'), meta: { title: '委托方满意度调查表列表', auth: '/resource/customer/questionnaire', @@ -1208,7 +1298,8 @@ { path: 'questionnaire/:type/:id?', name: 'QuestionnaireDetail', - component: () => import('@/views/resource/customer/questionnaire/detail.vue'), + component: () => + import('@/views/resource/customer/questionnaire/detail.vue'), meta: { title: '委托方满意度调查表详情', icon: 'ep:key', @@ -1220,7 +1311,8 @@ { path: 'suggestFormList', name: 'SuggestFormList', - component: () => import('@/views/resource/customer/suggestForm/list.vue'), + component: () => + import('@/views/resource/customer/suggestForm/list.vue'), meta: { title: '委托方意见登记表列表', auth: '/resource/customer/suggestForm', @@ -1230,7 +1322,8 @@ { path: 'suggestForm/:type/:id?', name: 'SuggestFormDetail', - component: () => import('@/views/resource/customer/suggestForm/detail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/detail.vue'), meta: { title: '委托方意见登记表详情', icon: 'ep:key', @@ -1242,7 +1335,8 @@ { path: 'suggestForm/approved/:id', name: 'SuggestFormDetailApproved', - component: () => import('@/views/resource/customer/suggestForm/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/approvedDetail.vue'), meta: { title: '授权(代委托方意见登记表详情理)委托书', icon: 'ep:key', @@ -1276,7 +1370,8 @@ { path: 'examine/approved/:id?', name: 'ExamineDetailApproved', - component: () => import('@/views/resource/customer/examine/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/examine/approvedDetail.vue'), meta: { title: '要求、委托书及合同评审表详情', icon: 'ep:key', diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 0b4c77e..b7ebf0f 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -61,7 +61,8 @@ { path: 'order/approved/:id', name: 'OrderDetailApproved', - component: () => import('@/views/resource/person/order/approvedDetail.vue'), + component: () => + import('@/views/resource/person/order/approvedDetail.vue'), meta: { title: '授权(代理)委托书', icon: 'ep:key', @@ -218,7 +219,8 @@ { path: 'historyDoc/:type/:id?', name: 'HistoryDocDetail', - component: () => import('@/views/resource/system/historyDoc/detail.vue'), + component: () => + import('@/views/resource/system/historyDoc/detail.vue'), meta: { title: '历史文件', icon: 'ep:key', @@ -299,7 +301,8 @@ { path: 'method/:type/:id?', name: 'MethodDetail', - component: () => import('@/views/resource/technology/method/detail.vue'), + component: () => + import('@/views/resource/technology/method/detail.vue'), meta: { title: '现行测试校准检定方法', icon: 'ep:key', @@ -333,7 +336,8 @@ { path: 'methodConfirm/:type/:id?', name: 'FileMethodConfirmDetail', - component: () => import('@/views/resource/file/methodConfirm/detail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/detail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -345,7 +349,8 @@ { path: 'methodConfirm/approved/:id', name: 'FileMethodConfirmDetailApproved', - component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/approvedDetail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -367,7 +372,8 @@ { path: 'noveltySearch/:type/:id?', name: 'FileNoveltySearchDetail', - component: () => import('@/views/resource/file/noveltySearch/detail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/detail.vue'), meta: { title: '测试校准检定方法查新记录表详情', icon: 'ep:key', @@ -379,7 +385,8 @@ { path: 'noveltySearch/approved/:id', name: 'FileNoveltySearchDetailApproved', - component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/approvedDetail.vue'), meta: { title: '测试校准检定方法查新记录表', icon: 'ep:key', @@ -426,7 +433,8 @@ { path: 'change/approved/:id', name: 'FileChangeFormDetailApproved', - component: () => import('@/views/resource/file/change/approvedDetail.vue'), + component: () => + import('@/views/resource/file/change/approvedDetail.vue'), meta: { title: '文件更改申请单', icon: 'ep:key', @@ -460,7 +468,8 @@ { path: 'approval/approved/:id', name: 'FileApprovalFormDetailApproved', - component: () => import('@/views/resource/file/approval/approvedDetail.vue'), + component: () => + import('@/views/resource/file/approval/approvedDetail.vue'), meta: { title: '文件审批详情', icon: 'ep:key', @@ -494,7 +503,8 @@ { path: 'grantNotice/approved/:id', name: 'FileGrantNoticeDetailApproved', - component: () => import('@/views/resource/file/grantNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/file/grantNotice/approvedDetail.vue'), meta: { title: '文件发放通知单详情', icon: 'ep:key', @@ -516,7 +526,8 @@ { path: 'recallArchive/:type/:id?', name: 'FileRecallArchiveDetail', - component: () => import('@/views/resource/file/recallArchive/detail.vue'), + component: () => + import('@/views/resource/file/recallArchive/detail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -528,7 +539,8 @@ { path: 'recallArchive/approved/:id', name: 'FileRecallArchiveDetailApproved', - component: () => import('@/views/resource/file/recallArchive/approvedDetail.vue'), + component: () => + import('@/views/resource/file/recallArchive/approvedDetail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -585,7 +597,8 @@ { path: 'revision/:type/:id?/:status?', name: 'RevisionApplyDetail', - component: () => import('@/views/resource/software/revision/detail.vue'), + component: () => + import('@/views/resource/software/revision/detail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -597,7 +610,8 @@ { path: 'revision/approved/:id?', name: 'RevisionApplyDetailApproved', - component: () => import('@/views/resource/software/revision/approvedDetail.vue'), + component: () => + import('@/views/resource/software/revision/approvedDetail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -631,7 +645,8 @@ { path: 'review/approved/:id?', name: 'ReviewReportDetailApproved', - component: () => import('@/views/resource/software/review/approvedDetail.vue'), + component: () => + import('@/views/resource/software/review/approvedDetail.vue'), meta: { title: '软件评审报告详情', icon: 'ep:key', @@ -656,7 +671,8 @@ { path: 'requireList', name: 'EnvironmentRequireList', - component: () => import('@/views/resource/environment/require/list.vue'), + component: () => + import('@/views/resource/environment/require/list.vue'), meta: { title: '工作间环境条件要求一览表', auth: '/resource/environment/require', @@ -666,7 +682,8 @@ { path: 'requireDetail', name: 'EnvironmentRequireDetail', - component: () => import('@/views/resource/environment/require/detail.vue'), + component: () => + import('@/views/resource/environment/require/detail.vue'), meta: { title: '工作间环境条件要求详情', icon: 'ep:key', @@ -678,7 +695,8 @@ { path: 'resistanceList', name: 'EnvironmentResistanceList', - component: () => import('@/views/resource/environment/resistance/list.vue'), + component: () => + import('@/views/resource/environment/resistance/list.vue'), meta: { title: '实验室接地电阻记录', auth: '/resource/environment/resistance', @@ -688,7 +706,8 @@ { path: 'resistance/detail', name: 'EnvironmentResistanceDetail', - component: () => import('@/views/resource/environment/resistance/detail.vue'), + component: () => + import('@/views/resource/environment/resistance/detail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -700,7 +719,8 @@ { path: 'resistance/approved/:type?/:id?', name: 'EnvironmentResistanceDetailApproved', - component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/resistance/approvedDetail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -712,7 +732,8 @@ { path: 'voltageList', name: 'EnvironmentVoltageList', - component: () => import('@/views/resource/environment/voltage/list.vue'), + component: () => + import('@/views/resource/environment/voltage/list.vue'), meta: { title: '工作间供电电压记录', auth: '/resource/environment/voltage', @@ -722,7 +743,8 @@ { path: 'voltage/detail', name: 'EnvironmentVoltageDetail', - component: () => import('@/views/resource/environment/voltage/detail.vue'), + component: () => + import('@/views/resource/environment/voltage/detail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -734,7 +756,8 @@ { path: 'voltage/approved/:type?/:id?', name: 'EnvironmentVoltageDetailApproved', - component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/voltage/approvedDetail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -768,7 +791,8 @@ { path: 'ups/approved/:type?/:id?', name: 'EnvironmentUpsDetailApproved', - component: () => import('@/views/resource/environment/ups/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/ups/approvedDetail.vue'), meta: { title: 'UPS蓄电池内阻测试记录详情', icon: 'ep:key', @@ -790,7 +814,8 @@ { path: 'setting', name: 'EnvironmentSetting', - component: () => import('@/views/resource/environment/record/setting.vue'), + component: () => + import('@/views/resource/environment/record/setting.vue'), meta: { title: '环境记录单设置', icon: 'ep:key', @@ -799,14 +824,28 @@ activeMenu: '/environment/recordList', }, }, + // { + // path: 'bench', + // name: 'EnvironmentBench', + // component: () => import('@/views/dataManagement/index.vue'), + // meta: { + // title: '环境数据看板', + // auth: '/resource/environment/bench', + // icon: 'ep:key', + // breadcrumb: false, + // sidebar: true, + // }, + // }, { - path: 'bench', - name: 'EnvironmentBench', - component: () => import('@/views/resource/environment/bench/index.vue'), + path: '/dataManagement/index', + name: 'DataManagementIndex', + component: () => import('@/views/dataManagement/index.vue'), meta: { title: '环境数据看板', auth: '/resource/environment/bench', icon: 'ep:key', + breadcrumb: false, + sidebar: true, }, }, ], @@ -825,7 +864,8 @@ { path: 'supplierList', name: 'SupplierList', - component: () => import('@/views/resource/outsideService/supplier/list.vue'), + component: () => + import('@/views/resource/outsideService/supplier/list.vue'), meta: { title: '合格供方名录', auth: '/resource/outsideService/supplier', @@ -835,7 +875,8 @@ { path: ':type/:id?/:status?', name: 'SupplierDetail', - component: () => import('@/views/resource/outsideService/supplier/detail.vue'), + component: () => + import('@/views/resource/outsideService/supplier/detail.vue'), meta: { title: '合格供方名录详情', icon: 'ep:key', @@ -847,7 +888,8 @@ { path: 'serviceEvaluateList', name: 'ServiceEvaluateList', - component: () => import('@/views/resource/outsideService/service/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateList.vue'), meta: { title: '外部服务评价表', auth: '/resource/outsideService/serviceEvaluate', @@ -857,7 +899,8 @@ { path: 'service/:type/:id?/:status?', name: 'ServiceEvaluateDetail', - component: () => import('@/views/resource/outsideService/service/evaluateDetail.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateDetail.vue'), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -869,7 +912,10 @@ { path: 'service/approved/:id?', name: 'ServiceEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue' + ), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -881,7 +927,8 @@ { path: 'equipmentEvaluateList', name: 'EquipmentEvaluateList', - component: () => import('@/views/resource/outsideService/equipment/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/equipment/evaluateList.vue'), meta: { title: '设备供方评价表', auth: '/resource/outsideService/equipmentEvaluate', @@ -891,7 +938,10 @@ { path: 'equipment/:type/:id?/:status?', name: 'EquipmentEvaluateDetail', - component: () => import('@/views/resource/outsideService/equipment/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/equipment/evaluateDetail.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -903,7 +953,10 @@ { path: 'equipment/approved/:id?', name: 'EquipmentEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -915,7 +968,8 @@ { path: 'consumableApplyList', name: 'ConsumableApplyList', - component: () => import('@/views/resource/outsideService/consumable/applyList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyList.vue'), meta: { title: '易耗物资申请单', auth: '/resource/outsideService/consumableApply', @@ -925,7 +979,8 @@ { path: 'consumableApply/:type/:id?/:status?', name: 'ConsumableApplyDetail', - component: () => import('@/views/resource/outsideService/consumable/applyDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyDetail.vue'), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -937,7 +992,10 @@ { path: 'consumableApply/approved/:type?/:id?', name: 'ConsumableApplyDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableApply.vue' + ), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -949,7 +1007,8 @@ { path: 'consumableCheckList', name: 'ConsumableCheckList', - component: () => import('@/views/resource/outsideService/consumable/checkList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkList.vue'), meta: { title: '物资验收记录', auth: '/resource/outsideService/consumableCheck', @@ -959,7 +1018,8 @@ { path: 'consumableCheck/:type/:id?/:status?', name: 'ConsumableCheckDetail', - component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkDetail.vue'), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -971,7 +1031,10 @@ { path: 'consumableCheck/approved/:id?', name: 'ConsumableCheckDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableCheck.vue' + ), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -983,7 +1046,8 @@ { path: 'consumableStoreList', name: 'ConsumableStoreList', - component: () => import('@/views/resource/outsideService/consumable/storeList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeList.vue'), meta: { title: '物资入库单', auth: '/resource/outsideService/consumableStore', @@ -993,7 +1057,8 @@ { path: 'consumableStore/:type/:id?/:status?', name: 'ConsumableStoreDetail', - component: () => import('@/views/resource/outsideService/consumable/storeDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeDetail.vue'), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1005,7 +1070,10 @@ { path: 'consumableStore/approved/:type?/:id?', name: 'ConsumableStoreDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableStore.vue' + ), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1017,7 +1085,8 @@ { path: 'consumableUseList', name: 'ConsumableUseList', - component: () => import('@/views/resource/outsideService/consumable/useList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useList.vue'), meta: { title: '易耗物资使用记录', auth: '/resource/outsideService/consumableUse', @@ -1027,7 +1096,8 @@ { path: 'consumable/:type/:id?/:status?', name: 'ConsumableUseDetail', - component: () => import('@/views/resource/outsideService/consumable/useDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useDetail.vue'), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1039,7 +1109,10 @@ { path: 'consumable/approved/:id?', name: 'ConsumableUseDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableUse.vue' + ), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1051,7 +1124,8 @@ { path: 'consumableHandoverList', name: 'ConsumableHandoverList', - component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/handoverList.vue'), meta: { title: '废弃物资处理交接记录', auth: '/resource/outsideService/consumableHandover', @@ -1061,7 +1135,10 @@ { path: 'consumableHandover/:type/:id?', name: 'ConsumableHandoverDetail', - component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/handoverDetail.vue' + ), meta: { title: '废弃物资处理交接记录详情', icon: 'ep:key', @@ -1073,7 +1150,8 @@ { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', - component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/evaluateList.vue'), meta: { title: '易耗物资供方评价表', auth: '/resource/outsideService/consumableEvaluate', @@ -1083,7 +1161,10 @@ { path: 'consumable/supplier/:type/:id?/:status?', name: 'ConsumableEvaluateDetail', - component: () => import('@/views/resource/outsideService/consumable/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/evaluateDetail.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1095,7 +1176,10 @@ { path: 'consumable/supplier/approved/:id?', name: 'ConsumableEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1142,7 +1226,8 @@ { path: 'reviewNoticeList', name: 'ReviewNoticeList', - component: () => import('@/views/resource/customer/reviewNotice/list.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/list.vue'), meta: { title: '检测结果复查通知列表', auth: '/resource/customer/reviewNotice', @@ -1152,7 +1237,8 @@ { path: 'reviewNotice/:type/:id?', name: 'ReviewNoticeDetail', - component: () => import('@/views/resource/customer/reviewNotice/detail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/detail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1164,7 +1250,8 @@ { path: 'reviewNotice/approved/:id?', name: 'NoticeDetailApproved', - component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1176,7 +1263,8 @@ { path: 'situationReportList', name: 'SituationReportList', - component: () => import('@/views/resource/customer/situationReport/list.vue'), + component: () => + import('@/views/resource/customer/situationReport/list.vue'), meta: { title: '委托方情况报告列表', auth: '/resource/customer/situationReport', @@ -1186,7 +1274,8 @@ { path: 'situationReport/:type/:id?', name: 'SituationReportDetail', - component: () => import('@/views/resource/customer/situationReport/detail.vue'), + component: () => + import('@/views/resource/customer/situationReport/detail.vue'), meta: { title: '委托方情况报告详情', icon: 'ep:key', @@ -1198,7 +1287,8 @@ { path: 'questionnaireList', name: 'QuestionnaireList', - component: () => import('@/views/resource/customer/questionnaire/list.vue'), + component: () => + import('@/views/resource/customer/questionnaire/list.vue'), meta: { title: '委托方满意度调查表列表', auth: '/resource/customer/questionnaire', @@ -1208,7 +1298,8 @@ { path: 'questionnaire/:type/:id?', name: 'QuestionnaireDetail', - component: () => import('@/views/resource/customer/questionnaire/detail.vue'), + component: () => + import('@/views/resource/customer/questionnaire/detail.vue'), meta: { title: '委托方满意度调查表详情', icon: 'ep:key', @@ -1220,7 +1311,8 @@ { path: 'suggestFormList', name: 'SuggestFormList', - component: () => import('@/views/resource/customer/suggestForm/list.vue'), + component: () => + import('@/views/resource/customer/suggestForm/list.vue'), meta: { title: '委托方意见登记表列表', auth: '/resource/customer/suggestForm', @@ -1230,7 +1322,8 @@ { path: 'suggestForm/:type/:id?', name: 'SuggestFormDetail', - component: () => import('@/views/resource/customer/suggestForm/detail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/detail.vue'), meta: { title: '委托方意见登记表详情', icon: 'ep:key', @@ -1242,7 +1335,8 @@ { path: 'suggestForm/approved/:id', name: 'SuggestFormDetailApproved', - component: () => import('@/views/resource/customer/suggestForm/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/approvedDetail.vue'), meta: { title: '授权(代委托方意见登记表详情理)委托书', icon: 'ep:key', @@ -1276,7 +1370,8 @@ { path: 'examine/approved/:id?', name: 'ExamineDetailApproved', - component: () => import('@/views/resource/customer/examine/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/examine/approvedDetail.vue'), meta: { title: '要求、委托书及合同评审表详情', icon: 'ep:key', diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 801c293..7adabaa 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -207,7 +207,7 @@ [SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL]: '/source/resultConfirm', // 溯源结果确认 [SCHEDULE.TRACE_RESULT_PERFORMANCE_APPROVAL]: '/source/resultComplete', // 溯源结果完成情况 [SCHEDULE.TRACE_CHANGE_APPROVAL]: '/source/sourceChange', // 溯源变更管理 - [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/unpack', // 开箱验收管理 + [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/resume/unpack', // 开箱验收管理 [SCHEDULE.EQUIPMENT_LEND_APPROVAL]: '/resume/lend', // 设备借出管理 [SCHEDULE.EQUIPMENT_BORROW_APPROVAL]: '/resume/borrow', // 设备借用管理 [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: '/resume/error', // 异常情况处置管理 diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 0b4c77e..b7ebf0f 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -61,7 +61,8 @@ { path: 'order/approved/:id', name: 'OrderDetailApproved', - component: () => import('@/views/resource/person/order/approvedDetail.vue'), + component: () => + import('@/views/resource/person/order/approvedDetail.vue'), meta: { title: '授权(代理)委托书', icon: 'ep:key', @@ -218,7 +219,8 @@ { path: 'historyDoc/:type/:id?', name: 'HistoryDocDetail', - component: () => import('@/views/resource/system/historyDoc/detail.vue'), + component: () => + import('@/views/resource/system/historyDoc/detail.vue'), meta: { title: '历史文件', icon: 'ep:key', @@ -299,7 +301,8 @@ { path: 'method/:type/:id?', name: 'MethodDetail', - component: () => import('@/views/resource/technology/method/detail.vue'), + component: () => + import('@/views/resource/technology/method/detail.vue'), meta: { title: '现行测试校准检定方法', icon: 'ep:key', @@ -333,7 +336,8 @@ { path: 'methodConfirm/:type/:id?', name: 'FileMethodConfirmDetail', - component: () => import('@/views/resource/file/methodConfirm/detail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/detail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -345,7 +349,8 @@ { path: 'methodConfirm/approved/:id', name: 'FileMethodConfirmDetailApproved', - component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/approvedDetail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -367,7 +372,8 @@ { path: 'noveltySearch/:type/:id?', name: 'FileNoveltySearchDetail', - component: () => import('@/views/resource/file/noveltySearch/detail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/detail.vue'), meta: { title: '测试校准检定方法查新记录表详情', icon: 'ep:key', @@ -379,7 +385,8 @@ { path: 'noveltySearch/approved/:id', name: 'FileNoveltySearchDetailApproved', - component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/approvedDetail.vue'), meta: { title: '测试校准检定方法查新记录表', icon: 'ep:key', @@ -426,7 +433,8 @@ { path: 'change/approved/:id', name: 'FileChangeFormDetailApproved', - component: () => import('@/views/resource/file/change/approvedDetail.vue'), + component: () => + import('@/views/resource/file/change/approvedDetail.vue'), meta: { title: '文件更改申请单', icon: 'ep:key', @@ -460,7 +468,8 @@ { path: 'approval/approved/:id', name: 'FileApprovalFormDetailApproved', - component: () => import('@/views/resource/file/approval/approvedDetail.vue'), + component: () => + import('@/views/resource/file/approval/approvedDetail.vue'), meta: { title: '文件审批详情', icon: 'ep:key', @@ -494,7 +503,8 @@ { path: 'grantNotice/approved/:id', name: 'FileGrantNoticeDetailApproved', - component: () => import('@/views/resource/file/grantNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/file/grantNotice/approvedDetail.vue'), meta: { title: '文件发放通知单详情', icon: 'ep:key', @@ -516,7 +526,8 @@ { path: 'recallArchive/:type/:id?', name: 'FileRecallArchiveDetail', - component: () => import('@/views/resource/file/recallArchive/detail.vue'), + component: () => + import('@/views/resource/file/recallArchive/detail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -528,7 +539,8 @@ { path: 'recallArchive/approved/:id', name: 'FileRecallArchiveDetailApproved', - component: () => import('@/views/resource/file/recallArchive/approvedDetail.vue'), + component: () => + import('@/views/resource/file/recallArchive/approvedDetail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -585,7 +597,8 @@ { path: 'revision/:type/:id?/:status?', name: 'RevisionApplyDetail', - component: () => import('@/views/resource/software/revision/detail.vue'), + component: () => + import('@/views/resource/software/revision/detail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -597,7 +610,8 @@ { path: 'revision/approved/:id?', name: 'RevisionApplyDetailApproved', - component: () => import('@/views/resource/software/revision/approvedDetail.vue'), + component: () => + import('@/views/resource/software/revision/approvedDetail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -631,7 +645,8 @@ { path: 'review/approved/:id?', name: 'ReviewReportDetailApproved', - component: () => import('@/views/resource/software/review/approvedDetail.vue'), + component: () => + import('@/views/resource/software/review/approvedDetail.vue'), meta: { title: '软件评审报告详情', icon: 'ep:key', @@ -656,7 +671,8 @@ { path: 'requireList', name: 'EnvironmentRequireList', - component: () => import('@/views/resource/environment/require/list.vue'), + component: () => + import('@/views/resource/environment/require/list.vue'), meta: { title: '工作间环境条件要求一览表', auth: '/resource/environment/require', @@ -666,7 +682,8 @@ { path: 'requireDetail', name: 'EnvironmentRequireDetail', - component: () => import('@/views/resource/environment/require/detail.vue'), + component: () => + import('@/views/resource/environment/require/detail.vue'), meta: { title: '工作间环境条件要求详情', icon: 'ep:key', @@ -678,7 +695,8 @@ { path: 'resistanceList', name: 'EnvironmentResistanceList', - component: () => import('@/views/resource/environment/resistance/list.vue'), + component: () => + import('@/views/resource/environment/resistance/list.vue'), meta: { title: '实验室接地电阻记录', auth: '/resource/environment/resistance', @@ -688,7 +706,8 @@ { path: 'resistance/detail', name: 'EnvironmentResistanceDetail', - component: () => import('@/views/resource/environment/resistance/detail.vue'), + component: () => + import('@/views/resource/environment/resistance/detail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -700,7 +719,8 @@ { path: 'resistance/approved/:type?/:id?', name: 'EnvironmentResistanceDetailApproved', - component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/resistance/approvedDetail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -712,7 +732,8 @@ { path: 'voltageList', name: 'EnvironmentVoltageList', - component: () => import('@/views/resource/environment/voltage/list.vue'), + component: () => + import('@/views/resource/environment/voltage/list.vue'), meta: { title: '工作间供电电压记录', auth: '/resource/environment/voltage', @@ -722,7 +743,8 @@ { path: 'voltage/detail', name: 'EnvironmentVoltageDetail', - component: () => import('@/views/resource/environment/voltage/detail.vue'), + component: () => + import('@/views/resource/environment/voltage/detail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -734,7 +756,8 @@ { path: 'voltage/approved/:type?/:id?', name: 'EnvironmentVoltageDetailApproved', - component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/voltage/approvedDetail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -768,7 +791,8 @@ { path: 'ups/approved/:type?/:id?', name: 'EnvironmentUpsDetailApproved', - component: () => import('@/views/resource/environment/ups/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/ups/approvedDetail.vue'), meta: { title: 'UPS蓄电池内阻测试记录详情', icon: 'ep:key', @@ -790,7 +814,8 @@ { path: 'setting', name: 'EnvironmentSetting', - component: () => import('@/views/resource/environment/record/setting.vue'), + component: () => + import('@/views/resource/environment/record/setting.vue'), meta: { title: '环境记录单设置', icon: 'ep:key', @@ -799,14 +824,28 @@ activeMenu: '/environment/recordList', }, }, + // { + // path: 'bench', + // name: 'EnvironmentBench', + // component: () => import('@/views/dataManagement/index.vue'), + // meta: { + // title: '环境数据看板', + // auth: '/resource/environment/bench', + // icon: 'ep:key', + // breadcrumb: false, + // sidebar: true, + // }, + // }, { - path: 'bench', - name: 'EnvironmentBench', - component: () => import('@/views/resource/environment/bench/index.vue'), + path: '/dataManagement/index', + name: 'DataManagementIndex', + component: () => import('@/views/dataManagement/index.vue'), meta: { title: '环境数据看板', auth: '/resource/environment/bench', icon: 'ep:key', + breadcrumb: false, + sidebar: true, }, }, ], @@ -825,7 +864,8 @@ { path: 'supplierList', name: 'SupplierList', - component: () => import('@/views/resource/outsideService/supplier/list.vue'), + component: () => + import('@/views/resource/outsideService/supplier/list.vue'), meta: { title: '合格供方名录', auth: '/resource/outsideService/supplier', @@ -835,7 +875,8 @@ { path: ':type/:id?/:status?', name: 'SupplierDetail', - component: () => import('@/views/resource/outsideService/supplier/detail.vue'), + component: () => + import('@/views/resource/outsideService/supplier/detail.vue'), meta: { title: '合格供方名录详情', icon: 'ep:key', @@ -847,7 +888,8 @@ { path: 'serviceEvaluateList', name: 'ServiceEvaluateList', - component: () => import('@/views/resource/outsideService/service/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateList.vue'), meta: { title: '外部服务评价表', auth: '/resource/outsideService/serviceEvaluate', @@ -857,7 +899,8 @@ { path: 'service/:type/:id?/:status?', name: 'ServiceEvaluateDetail', - component: () => import('@/views/resource/outsideService/service/evaluateDetail.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateDetail.vue'), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -869,7 +912,10 @@ { path: 'service/approved/:id?', name: 'ServiceEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue' + ), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -881,7 +927,8 @@ { path: 'equipmentEvaluateList', name: 'EquipmentEvaluateList', - component: () => import('@/views/resource/outsideService/equipment/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/equipment/evaluateList.vue'), meta: { title: '设备供方评价表', auth: '/resource/outsideService/equipmentEvaluate', @@ -891,7 +938,10 @@ { path: 'equipment/:type/:id?/:status?', name: 'EquipmentEvaluateDetail', - component: () => import('@/views/resource/outsideService/equipment/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/equipment/evaluateDetail.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -903,7 +953,10 @@ { path: 'equipment/approved/:id?', name: 'EquipmentEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -915,7 +968,8 @@ { path: 'consumableApplyList', name: 'ConsumableApplyList', - component: () => import('@/views/resource/outsideService/consumable/applyList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyList.vue'), meta: { title: '易耗物资申请单', auth: '/resource/outsideService/consumableApply', @@ -925,7 +979,8 @@ { path: 'consumableApply/:type/:id?/:status?', name: 'ConsumableApplyDetail', - component: () => import('@/views/resource/outsideService/consumable/applyDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyDetail.vue'), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -937,7 +992,10 @@ { path: 'consumableApply/approved/:type?/:id?', name: 'ConsumableApplyDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableApply.vue' + ), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -949,7 +1007,8 @@ { path: 'consumableCheckList', name: 'ConsumableCheckList', - component: () => import('@/views/resource/outsideService/consumable/checkList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkList.vue'), meta: { title: '物资验收记录', auth: '/resource/outsideService/consumableCheck', @@ -959,7 +1018,8 @@ { path: 'consumableCheck/:type/:id?/:status?', name: 'ConsumableCheckDetail', - component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkDetail.vue'), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -971,7 +1031,10 @@ { path: 'consumableCheck/approved/:id?', name: 'ConsumableCheckDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableCheck.vue' + ), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -983,7 +1046,8 @@ { path: 'consumableStoreList', name: 'ConsumableStoreList', - component: () => import('@/views/resource/outsideService/consumable/storeList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeList.vue'), meta: { title: '物资入库单', auth: '/resource/outsideService/consumableStore', @@ -993,7 +1057,8 @@ { path: 'consumableStore/:type/:id?/:status?', name: 'ConsumableStoreDetail', - component: () => import('@/views/resource/outsideService/consumable/storeDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeDetail.vue'), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1005,7 +1070,10 @@ { path: 'consumableStore/approved/:type?/:id?', name: 'ConsumableStoreDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableStore.vue' + ), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1017,7 +1085,8 @@ { path: 'consumableUseList', name: 'ConsumableUseList', - component: () => import('@/views/resource/outsideService/consumable/useList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useList.vue'), meta: { title: '易耗物资使用记录', auth: '/resource/outsideService/consumableUse', @@ -1027,7 +1096,8 @@ { path: 'consumable/:type/:id?/:status?', name: 'ConsumableUseDetail', - component: () => import('@/views/resource/outsideService/consumable/useDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useDetail.vue'), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1039,7 +1109,10 @@ { path: 'consumable/approved/:id?', name: 'ConsumableUseDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableUse.vue' + ), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1051,7 +1124,8 @@ { path: 'consumableHandoverList', name: 'ConsumableHandoverList', - component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/handoverList.vue'), meta: { title: '废弃物资处理交接记录', auth: '/resource/outsideService/consumableHandover', @@ -1061,7 +1135,10 @@ { path: 'consumableHandover/:type/:id?', name: 'ConsumableHandoverDetail', - component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/handoverDetail.vue' + ), meta: { title: '废弃物资处理交接记录详情', icon: 'ep:key', @@ -1073,7 +1150,8 @@ { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', - component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/evaluateList.vue'), meta: { title: '易耗物资供方评价表', auth: '/resource/outsideService/consumableEvaluate', @@ -1083,7 +1161,10 @@ { path: 'consumable/supplier/:type/:id?/:status?', name: 'ConsumableEvaluateDetail', - component: () => import('@/views/resource/outsideService/consumable/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/evaluateDetail.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1095,7 +1176,10 @@ { path: 'consumable/supplier/approved/:id?', name: 'ConsumableEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1142,7 +1226,8 @@ { path: 'reviewNoticeList', name: 'ReviewNoticeList', - component: () => import('@/views/resource/customer/reviewNotice/list.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/list.vue'), meta: { title: '检测结果复查通知列表', auth: '/resource/customer/reviewNotice', @@ -1152,7 +1237,8 @@ { path: 'reviewNotice/:type/:id?', name: 'ReviewNoticeDetail', - component: () => import('@/views/resource/customer/reviewNotice/detail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/detail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1164,7 +1250,8 @@ { path: 'reviewNotice/approved/:id?', name: 'NoticeDetailApproved', - component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1176,7 +1263,8 @@ { path: 'situationReportList', name: 'SituationReportList', - component: () => import('@/views/resource/customer/situationReport/list.vue'), + component: () => + import('@/views/resource/customer/situationReport/list.vue'), meta: { title: '委托方情况报告列表', auth: '/resource/customer/situationReport', @@ -1186,7 +1274,8 @@ { path: 'situationReport/:type/:id?', name: 'SituationReportDetail', - component: () => import('@/views/resource/customer/situationReport/detail.vue'), + component: () => + import('@/views/resource/customer/situationReport/detail.vue'), meta: { title: '委托方情况报告详情', icon: 'ep:key', @@ -1198,7 +1287,8 @@ { path: 'questionnaireList', name: 'QuestionnaireList', - component: () => import('@/views/resource/customer/questionnaire/list.vue'), + component: () => + import('@/views/resource/customer/questionnaire/list.vue'), meta: { title: '委托方满意度调查表列表', auth: '/resource/customer/questionnaire', @@ -1208,7 +1298,8 @@ { path: 'questionnaire/:type/:id?', name: 'QuestionnaireDetail', - component: () => import('@/views/resource/customer/questionnaire/detail.vue'), + component: () => + import('@/views/resource/customer/questionnaire/detail.vue'), meta: { title: '委托方满意度调查表详情', icon: 'ep:key', @@ -1220,7 +1311,8 @@ { path: 'suggestFormList', name: 'SuggestFormList', - component: () => import('@/views/resource/customer/suggestForm/list.vue'), + component: () => + import('@/views/resource/customer/suggestForm/list.vue'), meta: { title: '委托方意见登记表列表', auth: '/resource/customer/suggestForm', @@ -1230,7 +1322,8 @@ { path: 'suggestForm/:type/:id?', name: 'SuggestFormDetail', - component: () => import('@/views/resource/customer/suggestForm/detail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/detail.vue'), meta: { title: '委托方意见登记表详情', icon: 'ep:key', @@ -1242,7 +1335,8 @@ { path: 'suggestForm/approved/:id', name: 'SuggestFormDetailApproved', - component: () => import('@/views/resource/customer/suggestForm/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/approvedDetail.vue'), meta: { title: '授权(代委托方意见登记表详情理)委托书', icon: 'ep:key', @@ -1276,7 +1370,8 @@ { path: 'examine/approved/:id?', name: 'ExamineDetailApproved', - component: () => import('@/views/resource/customer/examine/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/examine/approvedDetail.vue'), meta: { title: '要求、委托书及合同评审表详情', icon: 'ep:key', diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 801c293..7adabaa 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -207,7 +207,7 @@ [SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL]: '/source/resultConfirm', // 溯源结果确认 [SCHEDULE.TRACE_RESULT_PERFORMANCE_APPROVAL]: '/source/resultComplete', // 溯源结果完成情况 [SCHEDULE.TRACE_CHANGE_APPROVAL]: '/source/sourceChange', // 溯源变更管理 - [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/unpack', // 开箱验收管理 + [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/resume/unpack', // 开箱验收管理 [SCHEDULE.EQUIPMENT_LEND_APPROVAL]: '/resume/lend', // 设备借出管理 [SCHEDULE.EQUIPMENT_BORROW_APPROVAL]: '/resume/borrow', // 设备借用管理 [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: '/resume/error', // 异常情况处置管理 diff --git a/src/views/business/manager/sendReceive/components/processConfig.vue b/src/views/business/manager/sendReceive/components/processConfig.vue index 617aede..62a2e95 100644 --- a/src/views/business/manager/sendReceive/components/processConfig.vue +++ b/src/views/business/manager/sendReceive/components/processConfig.vue @@ -146,7 +146,7 @@ const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { if (!processList.value[index].measurePersonId) { - ElMessage.warning('检定人员不能为空') + ElMessage.warning('检定人员不能为空,请重新选择检定人员') return false } if (!`${processList.value[index].requireCertifications}`) { diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 0b4c77e..b7ebf0f 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -61,7 +61,8 @@ { path: 'order/approved/:id', name: 'OrderDetailApproved', - component: () => import('@/views/resource/person/order/approvedDetail.vue'), + component: () => + import('@/views/resource/person/order/approvedDetail.vue'), meta: { title: '授权(代理)委托书', icon: 'ep:key', @@ -218,7 +219,8 @@ { path: 'historyDoc/:type/:id?', name: 'HistoryDocDetail', - component: () => import('@/views/resource/system/historyDoc/detail.vue'), + component: () => + import('@/views/resource/system/historyDoc/detail.vue'), meta: { title: '历史文件', icon: 'ep:key', @@ -299,7 +301,8 @@ { path: 'method/:type/:id?', name: 'MethodDetail', - component: () => import('@/views/resource/technology/method/detail.vue'), + component: () => + import('@/views/resource/technology/method/detail.vue'), meta: { title: '现行测试校准检定方法', icon: 'ep:key', @@ -333,7 +336,8 @@ { path: 'methodConfirm/:type/:id?', name: 'FileMethodConfirmDetail', - component: () => import('@/views/resource/file/methodConfirm/detail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/detail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -345,7 +349,8 @@ { path: 'methodConfirm/approved/:id', name: 'FileMethodConfirmDetailApproved', - component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/approvedDetail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -367,7 +372,8 @@ { path: 'noveltySearch/:type/:id?', name: 'FileNoveltySearchDetail', - component: () => import('@/views/resource/file/noveltySearch/detail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/detail.vue'), meta: { title: '测试校准检定方法查新记录表详情', icon: 'ep:key', @@ -379,7 +385,8 @@ { path: 'noveltySearch/approved/:id', name: 'FileNoveltySearchDetailApproved', - component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/approvedDetail.vue'), meta: { title: '测试校准检定方法查新记录表', icon: 'ep:key', @@ -426,7 +433,8 @@ { path: 'change/approved/:id', name: 'FileChangeFormDetailApproved', - component: () => import('@/views/resource/file/change/approvedDetail.vue'), + component: () => + import('@/views/resource/file/change/approvedDetail.vue'), meta: { title: '文件更改申请单', icon: 'ep:key', @@ -460,7 +468,8 @@ { path: 'approval/approved/:id', name: 'FileApprovalFormDetailApproved', - component: () => import('@/views/resource/file/approval/approvedDetail.vue'), + component: () => + import('@/views/resource/file/approval/approvedDetail.vue'), meta: { title: '文件审批详情', icon: 'ep:key', @@ -494,7 +503,8 @@ { path: 'grantNotice/approved/:id', name: 'FileGrantNoticeDetailApproved', - component: () => import('@/views/resource/file/grantNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/file/grantNotice/approvedDetail.vue'), meta: { title: '文件发放通知单详情', icon: 'ep:key', @@ -516,7 +526,8 @@ { path: 'recallArchive/:type/:id?', name: 'FileRecallArchiveDetail', - component: () => import('@/views/resource/file/recallArchive/detail.vue'), + component: () => + import('@/views/resource/file/recallArchive/detail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -528,7 +539,8 @@ { path: 'recallArchive/approved/:id', name: 'FileRecallArchiveDetailApproved', - component: () => import('@/views/resource/file/recallArchive/approvedDetail.vue'), + component: () => + import('@/views/resource/file/recallArchive/approvedDetail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -585,7 +597,8 @@ { path: 'revision/:type/:id?/:status?', name: 'RevisionApplyDetail', - component: () => import('@/views/resource/software/revision/detail.vue'), + component: () => + import('@/views/resource/software/revision/detail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -597,7 +610,8 @@ { path: 'revision/approved/:id?', name: 'RevisionApplyDetailApproved', - component: () => import('@/views/resource/software/revision/approvedDetail.vue'), + component: () => + import('@/views/resource/software/revision/approvedDetail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -631,7 +645,8 @@ { path: 'review/approved/:id?', name: 'ReviewReportDetailApproved', - component: () => import('@/views/resource/software/review/approvedDetail.vue'), + component: () => + import('@/views/resource/software/review/approvedDetail.vue'), meta: { title: '软件评审报告详情', icon: 'ep:key', @@ -656,7 +671,8 @@ { path: 'requireList', name: 'EnvironmentRequireList', - component: () => import('@/views/resource/environment/require/list.vue'), + component: () => + import('@/views/resource/environment/require/list.vue'), meta: { title: '工作间环境条件要求一览表', auth: '/resource/environment/require', @@ -666,7 +682,8 @@ { path: 'requireDetail', name: 'EnvironmentRequireDetail', - component: () => import('@/views/resource/environment/require/detail.vue'), + component: () => + import('@/views/resource/environment/require/detail.vue'), meta: { title: '工作间环境条件要求详情', icon: 'ep:key', @@ -678,7 +695,8 @@ { path: 'resistanceList', name: 'EnvironmentResistanceList', - component: () => import('@/views/resource/environment/resistance/list.vue'), + component: () => + import('@/views/resource/environment/resistance/list.vue'), meta: { title: '实验室接地电阻记录', auth: '/resource/environment/resistance', @@ -688,7 +706,8 @@ { path: 'resistance/detail', name: 'EnvironmentResistanceDetail', - component: () => import('@/views/resource/environment/resistance/detail.vue'), + component: () => + import('@/views/resource/environment/resistance/detail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -700,7 +719,8 @@ { path: 'resistance/approved/:type?/:id?', name: 'EnvironmentResistanceDetailApproved', - component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/resistance/approvedDetail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -712,7 +732,8 @@ { path: 'voltageList', name: 'EnvironmentVoltageList', - component: () => import('@/views/resource/environment/voltage/list.vue'), + component: () => + import('@/views/resource/environment/voltage/list.vue'), meta: { title: '工作间供电电压记录', auth: '/resource/environment/voltage', @@ -722,7 +743,8 @@ { path: 'voltage/detail', name: 'EnvironmentVoltageDetail', - component: () => import('@/views/resource/environment/voltage/detail.vue'), + component: () => + import('@/views/resource/environment/voltage/detail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -734,7 +756,8 @@ { path: 'voltage/approved/:type?/:id?', name: 'EnvironmentVoltageDetailApproved', - component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/voltage/approvedDetail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -768,7 +791,8 @@ { path: 'ups/approved/:type?/:id?', name: 'EnvironmentUpsDetailApproved', - component: () => import('@/views/resource/environment/ups/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/ups/approvedDetail.vue'), meta: { title: 'UPS蓄电池内阻测试记录详情', icon: 'ep:key', @@ -790,7 +814,8 @@ { path: 'setting', name: 'EnvironmentSetting', - component: () => import('@/views/resource/environment/record/setting.vue'), + component: () => + import('@/views/resource/environment/record/setting.vue'), meta: { title: '环境记录单设置', icon: 'ep:key', @@ -799,14 +824,28 @@ activeMenu: '/environment/recordList', }, }, + // { + // path: 'bench', + // name: 'EnvironmentBench', + // component: () => import('@/views/dataManagement/index.vue'), + // meta: { + // title: '环境数据看板', + // auth: '/resource/environment/bench', + // icon: 'ep:key', + // breadcrumb: false, + // sidebar: true, + // }, + // }, { - path: 'bench', - name: 'EnvironmentBench', - component: () => import('@/views/resource/environment/bench/index.vue'), + path: '/dataManagement/index', + name: 'DataManagementIndex', + component: () => import('@/views/dataManagement/index.vue'), meta: { title: '环境数据看板', auth: '/resource/environment/bench', icon: 'ep:key', + breadcrumb: false, + sidebar: true, }, }, ], @@ -825,7 +864,8 @@ { path: 'supplierList', name: 'SupplierList', - component: () => import('@/views/resource/outsideService/supplier/list.vue'), + component: () => + import('@/views/resource/outsideService/supplier/list.vue'), meta: { title: '合格供方名录', auth: '/resource/outsideService/supplier', @@ -835,7 +875,8 @@ { path: ':type/:id?/:status?', name: 'SupplierDetail', - component: () => import('@/views/resource/outsideService/supplier/detail.vue'), + component: () => + import('@/views/resource/outsideService/supplier/detail.vue'), meta: { title: '合格供方名录详情', icon: 'ep:key', @@ -847,7 +888,8 @@ { path: 'serviceEvaluateList', name: 'ServiceEvaluateList', - component: () => import('@/views/resource/outsideService/service/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateList.vue'), meta: { title: '外部服务评价表', auth: '/resource/outsideService/serviceEvaluate', @@ -857,7 +899,8 @@ { path: 'service/:type/:id?/:status?', name: 'ServiceEvaluateDetail', - component: () => import('@/views/resource/outsideService/service/evaluateDetail.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateDetail.vue'), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -869,7 +912,10 @@ { path: 'service/approved/:id?', name: 'ServiceEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue' + ), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -881,7 +927,8 @@ { path: 'equipmentEvaluateList', name: 'EquipmentEvaluateList', - component: () => import('@/views/resource/outsideService/equipment/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/equipment/evaluateList.vue'), meta: { title: '设备供方评价表', auth: '/resource/outsideService/equipmentEvaluate', @@ -891,7 +938,10 @@ { path: 'equipment/:type/:id?/:status?', name: 'EquipmentEvaluateDetail', - component: () => import('@/views/resource/outsideService/equipment/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/equipment/evaluateDetail.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -903,7 +953,10 @@ { path: 'equipment/approved/:id?', name: 'EquipmentEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -915,7 +968,8 @@ { path: 'consumableApplyList', name: 'ConsumableApplyList', - component: () => import('@/views/resource/outsideService/consumable/applyList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyList.vue'), meta: { title: '易耗物资申请单', auth: '/resource/outsideService/consumableApply', @@ -925,7 +979,8 @@ { path: 'consumableApply/:type/:id?/:status?', name: 'ConsumableApplyDetail', - component: () => import('@/views/resource/outsideService/consumable/applyDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyDetail.vue'), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -937,7 +992,10 @@ { path: 'consumableApply/approved/:type?/:id?', name: 'ConsumableApplyDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableApply.vue' + ), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -949,7 +1007,8 @@ { path: 'consumableCheckList', name: 'ConsumableCheckList', - component: () => import('@/views/resource/outsideService/consumable/checkList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkList.vue'), meta: { title: '物资验收记录', auth: '/resource/outsideService/consumableCheck', @@ -959,7 +1018,8 @@ { path: 'consumableCheck/:type/:id?/:status?', name: 'ConsumableCheckDetail', - component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkDetail.vue'), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -971,7 +1031,10 @@ { path: 'consumableCheck/approved/:id?', name: 'ConsumableCheckDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableCheck.vue' + ), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -983,7 +1046,8 @@ { path: 'consumableStoreList', name: 'ConsumableStoreList', - component: () => import('@/views/resource/outsideService/consumable/storeList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeList.vue'), meta: { title: '物资入库单', auth: '/resource/outsideService/consumableStore', @@ -993,7 +1057,8 @@ { path: 'consumableStore/:type/:id?/:status?', name: 'ConsumableStoreDetail', - component: () => import('@/views/resource/outsideService/consumable/storeDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeDetail.vue'), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1005,7 +1070,10 @@ { path: 'consumableStore/approved/:type?/:id?', name: 'ConsumableStoreDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableStore.vue' + ), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1017,7 +1085,8 @@ { path: 'consumableUseList', name: 'ConsumableUseList', - component: () => import('@/views/resource/outsideService/consumable/useList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useList.vue'), meta: { title: '易耗物资使用记录', auth: '/resource/outsideService/consumableUse', @@ -1027,7 +1096,8 @@ { path: 'consumable/:type/:id?/:status?', name: 'ConsumableUseDetail', - component: () => import('@/views/resource/outsideService/consumable/useDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useDetail.vue'), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1039,7 +1109,10 @@ { path: 'consumable/approved/:id?', name: 'ConsumableUseDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableUse.vue' + ), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1051,7 +1124,8 @@ { path: 'consumableHandoverList', name: 'ConsumableHandoverList', - component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/handoverList.vue'), meta: { title: '废弃物资处理交接记录', auth: '/resource/outsideService/consumableHandover', @@ -1061,7 +1135,10 @@ { path: 'consumableHandover/:type/:id?', name: 'ConsumableHandoverDetail', - component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/handoverDetail.vue' + ), meta: { title: '废弃物资处理交接记录详情', icon: 'ep:key', @@ -1073,7 +1150,8 @@ { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', - component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/evaluateList.vue'), meta: { title: '易耗物资供方评价表', auth: '/resource/outsideService/consumableEvaluate', @@ -1083,7 +1161,10 @@ { path: 'consumable/supplier/:type/:id?/:status?', name: 'ConsumableEvaluateDetail', - component: () => import('@/views/resource/outsideService/consumable/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/evaluateDetail.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1095,7 +1176,10 @@ { path: 'consumable/supplier/approved/:id?', name: 'ConsumableEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1142,7 +1226,8 @@ { path: 'reviewNoticeList', name: 'ReviewNoticeList', - component: () => import('@/views/resource/customer/reviewNotice/list.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/list.vue'), meta: { title: '检测结果复查通知列表', auth: '/resource/customer/reviewNotice', @@ -1152,7 +1237,8 @@ { path: 'reviewNotice/:type/:id?', name: 'ReviewNoticeDetail', - component: () => import('@/views/resource/customer/reviewNotice/detail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/detail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1164,7 +1250,8 @@ { path: 'reviewNotice/approved/:id?', name: 'NoticeDetailApproved', - component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1176,7 +1263,8 @@ { path: 'situationReportList', name: 'SituationReportList', - component: () => import('@/views/resource/customer/situationReport/list.vue'), + component: () => + import('@/views/resource/customer/situationReport/list.vue'), meta: { title: '委托方情况报告列表', auth: '/resource/customer/situationReport', @@ -1186,7 +1274,8 @@ { path: 'situationReport/:type/:id?', name: 'SituationReportDetail', - component: () => import('@/views/resource/customer/situationReport/detail.vue'), + component: () => + import('@/views/resource/customer/situationReport/detail.vue'), meta: { title: '委托方情况报告详情', icon: 'ep:key', @@ -1198,7 +1287,8 @@ { path: 'questionnaireList', name: 'QuestionnaireList', - component: () => import('@/views/resource/customer/questionnaire/list.vue'), + component: () => + import('@/views/resource/customer/questionnaire/list.vue'), meta: { title: '委托方满意度调查表列表', auth: '/resource/customer/questionnaire', @@ -1208,7 +1298,8 @@ { path: 'questionnaire/:type/:id?', name: 'QuestionnaireDetail', - component: () => import('@/views/resource/customer/questionnaire/detail.vue'), + component: () => + import('@/views/resource/customer/questionnaire/detail.vue'), meta: { title: '委托方满意度调查表详情', icon: 'ep:key', @@ -1220,7 +1311,8 @@ { path: 'suggestFormList', name: 'SuggestFormList', - component: () => import('@/views/resource/customer/suggestForm/list.vue'), + component: () => + import('@/views/resource/customer/suggestForm/list.vue'), meta: { title: '委托方意见登记表列表', auth: '/resource/customer/suggestForm', @@ -1230,7 +1322,8 @@ { path: 'suggestForm/:type/:id?', name: 'SuggestFormDetail', - component: () => import('@/views/resource/customer/suggestForm/detail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/detail.vue'), meta: { title: '委托方意见登记表详情', icon: 'ep:key', @@ -1242,7 +1335,8 @@ { path: 'suggestForm/approved/:id', name: 'SuggestFormDetailApproved', - component: () => import('@/views/resource/customer/suggestForm/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/approvedDetail.vue'), meta: { title: '授权(代委托方意见登记表详情理)委托书', icon: 'ep:key', @@ -1276,7 +1370,8 @@ { path: 'examine/approved/:id?', name: 'ExamineDetailApproved', - component: () => import('@/views/resource/customer/examine/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/examine/approvedDetail.vue'), meta: { title: '要求、委托书及合同评审表详情', icon: 'ep:key', diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 801c293..7adabaa 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -207,7 +207,7 @@ [SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL]: '/source/resultConfirm', // 溯源结果确认 [SCHEDULE.TRACE_RESULT_PERFORMANCE_APPROVAL]: '/source/resultComplete', // 溯源结果完成情况 [SCHEDULE.TRACE_CHANGE_APPROVAL]: '/source/sourceChange', // 溯源变更管理 - [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/unpack', // 开箱验收管理 + [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/resume/unpack', // 开箱验收管理 [SCHEDULE.EQUIPMENT_LEND_APPROVAL]: '/resume/lend', // 设备借出管理 [SCHEDULE.EQUIPMENT_BORROW_APPROVAL]: '/resume/borrow', // 设备借用管理 [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: '/resume/error', // 异常情况处置管理 diff --git a/src/views/business/manager/sendReceive/components/processConfig.vue b/src/views/business/manager/sendReceive/components/processConfig.vue index 617aede..62a2e95 100644 --- a/src/views/business/manager/sendReceive/components/processConfig.vue +++ b/src/views/business/manager/sendReceive/components/processConfig.vue @@ -146,7 +146,7 @@ const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { if (!processList.value[index].measurePersonId) { - ElMessage.warning('检定人员不能为空') + ElMessage.warning('检定人员不能为空,请重新选择检定人员') return false } if (!`${processList.value[index].requireCertifications}`) { diff --git a/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue b/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue index 866592e..4873aab 100644 --- a/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue +++ b/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue @@ -6,7 +6,7 @@ import { getDictByCode } from '@/api/system/dict' import type { dictType } from '@/global' import { batchTerminate } from '@/api/business/manager/sendReceive' -const emit = defineEmits(['confirm']) +const emits = defineEmits(['onSuccess']) // 弹窗显示状态 const dialogVisible = ref(false) // 默认表单 @@ -21,6 +21,8 @@ sampleId: '', // 样品id }) +const getList = ref([]) as any + // 保存按钮加载状态 const btnLoading = ref(false) // -------------------------------------------字典---------------------------------------------+ @@ -56,7 +58,15 @@ * @param orderId 委托书id * @param sampleId 样品id */ -function initDialog(row: any) { +function initDialog(list: any) { + if (list && list.length) { + getList.value = list.map((item: any) => { + return { + orderId: item.orderId, // 委托书id + sampleId: item.sampleId, // 样品id + } + }) + } getDict() dialogVisible.value = true } @@ -67,14 +77,26 @@ formEl.validate((valid) => { if (valid) { btnLoading.value = true - // interchangeListTerminate([formData.value]).then((res) => { - // ElMessage.success('操作成功') - // btnLoading.value = false - // dialogVisible.value = false - // emit('onSuccess') - // }).catch((_) => { - // btnLoading.value = false - // }) + const param = getList.value.map((item: any) => { + return { + ...item, + checkOrganization: '中国西昌卫星发射中心计量测试站', // 检定校准机构 + traceDate: form.value.traceDate, // 检定日期 + measureValidDate: form.value.measureValidDate, // 检定有效期至 + conclusion: form.value.conclusion, // 检定结论 + meterIdentify: form.value.meterIdentify, // 计量标识 + restrictionInstruction: form.value.restrictionInstruction, // 限用说明 + status: '5', // 完成状态需要变为5 + } + }) + batchTerminate(param).then((res) => { + ElMessage.success('操作成功') + btnLoading.value = false + dialogVisible.value = false + emits('onSuccess') + }).catch((_) => { + btnLoading.value = false + }) } }) } diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 0b4c77e..b7ebf0f 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -61,7 +61,8 @@ { path: 'order/approved/:id', name: 'OrderDetailApproved', - component: () => import('@/views/resource/person/order/approvedDetail.vue'), + component: () => + import('@/views/resource/person/order/approvedDetail.vue'), meta: { title: '授权(代理)委托书', icon: 'ep:key', @@ -218,7 +219,8 @@ { path: 'historyDoc/:type/:id?', name: 'HistoryDocDetail', - component: () => import('@/views/resource/system/historyDoc/detail.vue'), + component: () => + import('@/views/resource/system/historyDoc/detail.vue'), meta: { title: '历史文件', icon: 'ep:key', @@ -299,7 +301,8 @@ { path: 'method/:type/:id?', name: 'MethodDetail', - component: () => import('@/views/resource/technology/method/detail.vue'), + component: () => + import('@/views/resource/technology/method/detail.vue'), meta: { title: '现行测试校准检定方法', icon: 'ep:key', @@ -333,7 +336,8 @@ { path: 'methodConfirm/:type/:id?', name: 'FileMethodConfirmDetail', - component: () => import('@/views/resource/file/methodConfirm/detail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/detail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -345,7 +349,8 @@ { path: 'methodConfirm/approved/:id', name: 'FileMethodConfirmDetailApproved', - component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/approvedDetail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -367,7 +372,8 @@ { path: 'noveltySearch/:type/:id?', name: 'FileNoveltySearchDetail', - component: () => import('@/views/resource/file/noveltySearch/detail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/detail.vue'), meta: { title: '测试校准检定方法查新记录表详情', icon: 'ep:key', @@ -379,7 +385,8 @@ { path: 'noveltySearch/approved/:id', name: 'FileNoveltySearchDetailApproved', - component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/approvedDetail.vue'), meta: { title: '测试校准检定方法查新记录表', icon: 'ep:key', @@ -426,7 +433,8 @@ { path: 'change/approved/:id', name: 'FileChangeFormDetailApproved', - component: () => import('@/views/resource/file/change/approvedDetail.vue'), + component: () => + import('@/views/resource/file/change/approvedDetail.vue'), meta: { title: '文件更改申请单', icon: 'ep:key', @@ -460,7 +468,8 @@ { path: 'approval/approved/:id', name: 'FileApprovalFormDetailApproved', - component: () => import('@/views/resource/file/approval/approvedDetail.vue'), + component: () => + import('@/views/resource/file/approval/approvedDetail.vue'), meta: { title: '文件审批详情', icon: 'ep:key', @@ -494,7 +503,8 @@ { path: 'grantNotice/approved/:id', name: 'FileGrantNoticeDetailApproved', - component: () => import('@/views/resource/file/grantNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/file/grantNotice/approvedDetail.vue'), meta: { title: '文件发放通知单详情', icon: 'ep:key', @@ -516,7 +526,8 @@ { path: 'recallArchive/:type/:id?', name: 'FileRecallArchiveDetail', - component: () => import('@/views/resource/file/recallArchive/detail.vue'), + component: () => + import('@/views/resource/file/recallArchive/detail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -528,7 +539,8 @@ { path: 'recallArchive/approved/:id', name: 'FileRecallArchiveDetailApproved', - component: () => import('@/views/resource/file/recallArchive/approvedDetail.vue'), + component: () => + import('@/views/resource/file/recallArchive/approvedDetail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -585,7 +597,8 @@ { path: 'revision/:type/:id?/:status?', name: 'RevisionApplyDetail', - component: () => import('@/views/resource/software/revision/detail.vue'), + component: () => + import('@/views/resource/software/revision/detail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -597,7 +610,8 @@ { path: 'revision/approved/:id?', name: 'RevisionApplyDetailApproved', - component: () => import('@/views/resource/software/revision/approvedDetail.vue'), + component: () => + import('@/views/resource/software/revision/approvedDetail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -631,7 +645,8 @@ { path: 'review/approved/:id?', name: 'ReviewReportDetailApproved', - component: () => import('@/views/resource/software/review/approvedDetail.vue'), + component: () => + import('@/views/resource/software/review/approvedDetail.vue'), meta: { title: '软件评审报告详情', icon: 'ep:key', @@ -656,7 +671,8 @@ { path: 'requireList', name: 'EnvironmentRequireList', - component: () => import('@/views/resource/environment/require/list.vue'), + component: () => + import('@/views/resource/environment/require/list.vue'), meta: { title: '工作间环境条件要求一览表', auth: '/resource/environment/require', @@ -666,7 +682,8 @@ { path: 'requireDetail', name: 'EnvironmentRequireDetail', - component: () => import('@/views/resource/environment/require/detail.vue'), + component: () => + import('@/views/resource/environment/require/detail.vue'), meta: { title: '工作间环境条件要求详情', icon: 'ep:key', @@ -678,7 +695,8 @@ { path: 'resistanceList', name: 'EnvironmentResistanceList', - component: () => import('@/views/resource/environment/resistance/list.vue'), + component: () => + import('@/views/resource/environment/resistance/list.vue'), meta: { title: '实验室接地电阻记录', auth: '/resource/environment/resistance', @@ -688,7 +706,8 @@ { path: 'resistance/detail', name: 'EnvironmentResistanceDetail', - component: () => import('@/views/resource/environment/resistance/detail.vue'), + component: () => + import('@/views/resource/environment/resistance/detail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -700,7 +719,8 @@ { path: 'resistance/approved/:type?/:id?', name: 'EnvironmentResistanceDetailApproved', - component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/resistance/approvedDetail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -712,7 +732,8 @@ { path: 'voltageList', name: 'EnvironmentVoltageList', - component: () => import('@/views/resource/environment/voltage/list.vue'), + component: () => + import('@/views/resource/environment/voltage/list.vue'), meta: { title: '工作间供电电压记录', auth: '/resource/environment/voltage', @@ -722,7 +743,8 @@ { path: 'voltage/detail', name: 'EnvironmentVoltageDetail', - component: () => import('@/views/resource/environment/voltage/detail.vue'), + component: () => + import('@/views/resource/environment/voltage/detail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -734,7 +756,8 @@ { path: 'voltage/approved/:type?/:id?', name: 'EnvironmentVoltageDetailApproved', - component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/voltage/approvedDetail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -768,7 +791,8 @@ { path: 'ups/approved/:type?/:id?', name: 'EnvironmentUpsDetailApproved', - component: () => import('@/views/resource/environment/ups/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/ups/approvedDetail.vue'), meta: { title: 'UPS蓄电池内阻测试记录详情', icon: 'ep:key', @@ -790,7 +814,8 @@ { path: 'setting', name: 'EnvironmentSetting', - component: () => import('@/views/resource/environment/record/setting.vue'), + component: () => + import('@/views/resource/environment/record/setting.vue'), meta: { title: '环境记录单设置', icon: 'ep:key', @@ -799,14 +824,28 @@ activeMenu: '/environment/recordList', }, }, + // { + // path: 'bench', + // name: 'EnvironmentBench', + // component: () => import('@/views/dataManagement/index.vue'), + // meta: { + // title: '环境数据看板', + // auth: '/resource/environment/bench', + // icon: 'ep:key', + // breadcrumb: false, + // sidebar: true, + // }, + // }, { - path: 'bench', - name: 'EnvironmentBench', - component: () => import('@/views/resource/environment/bench/index.vue'), + path: '/dataManagement/index', + name: 'DataManagementIndex', + component: () => import('@/views/dataManagement/index.vue'), meta: { title: '环境数据看板', auth: '/resource/environment/bench', icon: 'ep:key', + breadcrumb: false, + sidebar: true, }, }, ], @@ -825,7 +864,8 @@ { path: 'supplierList', name: 'SupplierList', - component: () => import('@/views/resource/outsideService/supplier/list.vue'), + component: () => + import('@/views/resource/outsideService/supplier/list.vue'), meta: { title: '合格供方名录', auth: '/resource/outsideService/supplier', @@ -835,7 +875,8 @@ { path: ':type/:id?/:status?', name: 'SupplierDetail', - component: () => import('@/views/resource/outsideService/supplier/detail.vue'), + component: () => + import('@/views/resource/outsideService/supplier/detail.vue'), meta: { title: '合格供方名录详情', icon: 'ep:key', @@ -847,7 +888,8 @@ { path: 'serviceEvaluateList', name: 'ServiceEvaluateList', - component: () => import('@/views/resource/outsideService/service/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateList.vue'), meta: { title: '外部服务评价表', auth: '/resource/outsideService/serviceEvaluate', @@ -857,7 +899,8 @@ { path: 'service/:type/:id?/:status?', name: 'ServiceEvaluateDetail', - component: () => import('@/views/resource/outsideService/service/evaluateDetail.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateDetail.vue'), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -869,7 +912,10 @@ { path: 'service/approved/:id?', name: 'ServiceEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue' + ), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -881,7 +927,8 @@ { path: 'equipmentEvaluateList', name: 'EquipmentEvaluateList', - component: () => import('@/views/resource/outsideService/equipment/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/equipment/evaluateList.vue'), meta: { title: '设备供方评价表', auth: '/resource/outsideService/equipmentEvaluate', @@ -891,7 +938,10 @@ { path: 'equipment/:type/:id?/:status?', name: 'EquipmentEvaluateDetail', - component: () => import('@/views/resource/outsideService/equipment/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/equipment/evaluateDetail.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -903,7 +953,10 @@ { path: 'equipment/approved/:id?', name: 'EquipmentEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -915,7 +968,8 @@ { path: 'consumableApplyList', name: 'ConsumableApplyList', - component: () => import('@/views/resource/outsideService/consumable/applyList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyList.vue'), meta: { title: '易耗物资申请单', auth: '/resource/outsideService/consumableApply', @@ -925,7 +979,8 @@ { path: 'consumableApply/:type/:id?/:status?', name: 'ConsumableApplyDetail', - component: () => import('@/views/resource/outsideService/consumable/applyDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyDetail.vue'), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -937,7 +992,10 @@ { path: 'consumableApply/approved/:type?/:id?', name: 'ConsumableApplyDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableApply.vue' + ), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -949,7 +1007,8 @@ { path: 'consumableCheckList', name: 'ConsumableCheckList', - component: () => import('@/views/resource/outsideService/consumable/checkList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkList.vue'), meta: { title: '物资验收记录', auth: '/resource/outsideService/consumableCheck', @@ -959,7 +1018,8 @@ { path: 'consumableCheck/:type/:id?/:status?', name: 'ConsumableCheckDetail', - component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkDetail.vue'), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -971,7 +1031,10 @@ { path: 'consumableCheck/approved/:id?', name: 'ConsumableCheckDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableCheck.vue' + ), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -983,7 +1046,8 @@ { path: 'consumableStoreList', name: 'ConsumableStoreList', - component: () => import('@/views/resource/outsideService/consumable/storeList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeList.vue'), meta: { title: '物资入库单', auth: '/resource/outsideService/consumableStore', @@ -993,7 +1057,8 @@ { path: 'consumableStore/:type/:id?/:status?', name: 'ConsumableStoreDetail', - component: () => import('@/views/resource/outsideService/consumable/storeDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeDetail.vue'), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1005,7 +1070,10 @@ { path: 'consumableStore/approved/:type?/:id?', name: 'ConsumableStoreDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableStore.vue' + ), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1017,7 +1085,8 @@ { path: 'consumableUseList', name: 'ConsumableUseList', - component: () => import('@/views/resource/outsideService/consumable/useList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useList.vue'), meta: { title: '易耗物资使用记录', auth: '/resource/outsideService/consumableUse', @@ -1027,7 +1096,8 @@ { path: 'consumable/:type/:id?/:status?', name: 'ConsumableUseDetail', - component: () => import('@/views/resource/outsideService/consumable/useDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useDetail.vue'), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1039,7 +1109,10 @@ { path: 'consumable/approved/:id?', name: 'ConsumableUseDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableUse.vue' + ), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1051,7 +1124,8 @@ { path: 'consumableHandoverList', name: 'ConsumableHandoverList', - component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/handoverList.vue'), meta: { title: '废弃物资处理交接记录', auth: '/resource/outsideService/consumableHandover', @@ -1061,7 +1135,10 @@ { path: 'consumableHandover/:type/:id?', name: 'ConsumableHandoverDetail', - component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/handoverDetail.vue' + ), meta: { title: '废弃物资处理交接记录详情', icon: 'ep:key', @@ -1073,7 +1150,8 @@ { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', - component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/evaluateList.vue'), meta: { title: '易耗物资供方评价表', auth: '/resource/outsideService/consumableEvaluate', @@ -1083,7 +1161,10 @@ { path: 'consumable/supplier/:type/:id?/:status?', name: 'ConsumableEvaluateDetail', - component: () => import('@/views/resource/outsideService/consumable/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/evaluateDetail.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1095,7 +1176,10 @@ { path: 'consumable/supplier/approved/:id?', name: 'ConsumableEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1142,7 +1226,8 @@ { path: 'reviewNoticeList', name: 'ReviewNoticeList', - component: () => import('@/views/resource/customer/reviewNotice/list.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/list.vue'), meta: { title: '检测结果复查通知列表', auth: '/resource/customer/reviewNotice', @@ -1152,7 +1237,8 @@ { path: 'reviewNotice/:type/:id?', name: 'ReviewNoticeDetail', - component: () => import('@/views/resource/customer/reviewNotice/detail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/detail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1164,7 +1250,8 @@ { path: 'reviewNotice/approved/:id?', name: 'NoticeDetailApproved', - component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1176,7 +1263,8 @@ { path: 'situationReportList', name: 'SituationReportList', - component: () => import('@/views/resource/customer/situationReport/list.vue'), + component: () => + import('@/views/resource/customer/situationReport/list.vue'), meta: { title: '委托方情况报告列表', auth: '/resource/customer/situationReport', @@ -1186,7 +1274,8 @@ { path: 'situationReport/:type/:id?', name: 'SituationReportDetail', - component: () => import('@/views/resource/customer/situationReport/detail.vue'), + component: () => + import('@/views/resource/customer/situationReport/detail.vue'), meta: { title: '委托方情况报告详情', icon: 'ep:key', @@ -1198,7 +1287,8 @@ { path: 'questionnaireList', name: 'QuestionnaireList', - component: () => import('@/views/resource/customer/questionnaire/list.vue'), + component: () => + import('@/views/resource/customer/questionnaire/list.vue'), meta: { title: '委托方满意度调查表列表', auth: '/resource/customer/questionnaire', @@ -1208,7 +1298,8 @@ { path: 'questionnaire/:type/:id?', name: 'QuestionnaireDetail', - component: () => import('@/views/resource/customer/questionnaire/detail.vue'), + component: () => + import('@/views/resource/customer/questionnaire/detail.vue'), meta: { title: '委托方满意度调查表详情', icon: 'ep:key', @@ -1220,7 +1311,8 @@ { path: 'suggestFormList', name: 'SuggestFormList', - component: () => import('@/views/resource/customer/suggestForm/list.vue'), + component: () => + import('@/views/resource/customer/suggestForm/list.vue'), meta: { title: '委托方意见登记表列表', auth: '/resource/customer/suggestForm', @@ -1230,7 +1322,8 @@ { path: 'suggestForm/:type/:id?', name: 'SuggestFormDetail', - component: () => import('@/views/resource/customer/suggestForm/detail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/detail.vue'), meta: { title: '委托方意见登记表详情', icon: 'ep:key', @@ -1242,7 +1335,8 @@ { path: 'suggestForm/approved/:id', name: 'SuggestFormDetailApproved', - component: () => import('@/views/resource/customer/suggestForm/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/approvedDetail.vue'), meta: { title: '授权(代委托方意见登记表详情理)委托书', icon: 'ep:key', @@ -1276,7 +1370,8 @@ { path: 'examine/approved/:id?', name: 'ExamineDetailApproved', - component: () => import('@/views/resource/customer/examine/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/examine/approvedDetail.vue'), meta: { title: '要求、委托书及合同评审表详情', icon: 'ep:key', diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 801c293..7adabaa 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -207,7 +207,7 @@ [SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL]: '/source/resultConfirm', // 溯源结果确认 [SCHEDULE.TRACE_RESULT_PERFORMANCE_APPROVAL]: '/source/resultComplete', // 溯源结果完成情况 [SCHEDULE.TRACE_CHANGE_APPROVAL]: '/source/sourceChange', // 溯源变更管理 - [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/unpack', // 开箱验收管理 + [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/resume/unpack', // 开箱验收管理 [SCHEDULE.EQUIPMENT_LEND_APPROVAL]: '/resume/lend', // 设备借出管理 [SCHEDULE.EQUIPMENT_BORROW_APPROVAL]: '/resume/borrow', // 设备借用管理 [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: '/resume/error', // 异常情况处置管理 diff --git a/src/views/business/manager/sendReceive/components/processConfig.vue b/src/views/business/manager/sendReceive/components/processConfig.vue index 617aede..62a2e95 100644 --- a/src/views/business/manager/sendReceive/components/processConfig.vue +++ b/src/views/business/manager/sendReceive/components/processConfig.vue @@ -146,7 +146,7 @@ const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { if (!processList.value[index].measurePersonId) { - ElMessage.warning('检定人员不能为空') + ElMessage.warning('检定人员不能为空,请重新选择检定人员') return false } if (!`${processList.value[index].requireCertifications}`) { diff --git a/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue b/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue index 866592e..4873aab 100644 --- a/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue +++ b/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue @@ -6,7 +6,7 @@ import { getDictByCode } from '@/api/system/dict' import type { dictType } from '@/global' import { batchTerminate } from '@/api/business/manager/sendReceive' -const emit = defineEmits(['confirm']) +const emits = defineEmits(['onSuccess']) // 弹窗显示状态 const dialogVisible = ref(false) // 默认表单 @@ -21,6 +21,8 @@ sampleId: '', // 样品id }) +const getList = ref([]) as any + // 保存按钮加载状态 const btnLoading = ref(false) // -------------------------------------------字典---------------------------------------------+ @@ -56,7 +58,15 @@ * @param orderId 委托书id * @param sampleId 样品id */ -function initDialog(row: any) { +function initDialog(list: any) { + if (list && list.length) { + getList.value = list.map((item: any) => { + return { + orderId: item.orderId, // 委托书id + sampleId: item.sampleId, // 样品id + } + }) + } getDict() dialogVisible.value = true } @@ -67,14 +77,26 @@ formEl.validate((valid) => { if (valid) { btnLoading.value = true - // interchangeListTerminate([formData.value]).then((res) => { - // ElMessage.success('操作成功') - // btnLoading.value = false - // dialogVisible.value = false - // emit('onSuccess') - // }).catch((_) => { - // btnLoading.value = false - // }) + const param = getList.value.map((item: any) => { + return { + ...item, + checkOrganization: '中国西昌卫星发射中心计量测试站', // 检定校准机构 + traceDate: form.value.traceDate, // 检定日期 + measureValidDate: form.value.measureValidDate, // 检定有效期至 + conclusion: form.value.conclusion, // 检定结论 + meterIdentify: form.value.meterIdentify, // 计量标识 + restrictionInstruction: form.value.restrictionInstruction, // 限用说明 + status: '5', // 完成状态需要变为5 + } + }) + batchTerminate(param).then((res) => { + ElMessage.success('操作成功') + btnLoading.value = false + dialogVisible.value = false + emits('onSuccess') + }).catch((_) => { + btnLoading.value = false + }) } }) } diff --git a/src/views/business/manager/sendReceive/list.vue b/src/views/business/manager/sendReceive/list.vue index 0b9853c..877a0ce 100644 --- a/src/views/business/manager/sendReceive/list.vue +++ b/src/views/business/manager/sendReceive/list.vue @@ -390,7 +390,7 @@ ElMessage.warning('请选中') return false } - batchFinishDialogRef.value.initDialog() + batchFinishDialogRef.value.initDialog(checkoutList.value) } // 导出 @@ -778,7 +778,7 @@ - + diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 0b4c77e..b7ebf0f 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -61,7 +61,8 @@ { path: 'order/approved/:id', name: 'OrderDetailApproved', - component: () => import('@/views/resource/person/order/approvedDetail.vue'), + component: () => + import('@/views/resource/person/order/approvedDetail.vue'), meta: { title: '授权(代理)委托书', icon: 'ep:key', @@ -218,7 +219,8 @@ { path: 'historyDoc/:type/:id?', name: 'HistoryDocDetail', - component: () => import('@/views/resource/system/historyDoc/detail.vue'), + component: () => + import('@/views/resource/system/historyDoc/detail.vue'), meta: { title: '历史文件', icon: 'ep:key', @@ -299,7 +301,8 @@ { path: 'method/:type/:id?', name: 'MethodDetail', - component: () => import('@/views/resource/technology/method/detail.vue'), + component: () => + import('@/views/resource/technology/method/detail.vue'), meta: { title: '现行测试校准检定方法', icon: 'ep:key', @@ -333,7 +336,8 @@ { path: 'methodConfirm/:type/:id?', name: 'FileMethodConfirmDetail', - component: () => import('@/views/resource/file/methodConfirm/detail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/detail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -345,7 +349,8 @@ { path: 'methodConfirm/approved/:id', name: 'FileMethodConfirmDetailApproved', - component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'), + component: () => + import('@/views/resource/file/methodConfirm/approvedDetail.vue'), meta: { title: '方法确认登记表详情', icon: 'ep:key', @@ -367,7 +372,8 @@ { path: 'noveltySearch/:type/:id?', name: 'FileNoveltySearchDetail', - component: () => import('@/views/resource/file/noveltySearch/detail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/detail.vue'), meta: { title: '测试校准检定方法查新记录表详情', icon: 'ep:key', @@ -379,7 +385,8 @@ { path: 'noveltySearch/approved/:id', name: 'FileNoveltySearchDetailApproved', - component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'), + component: () => + import('@/views/resource/file/noveltySearch/approvedDetail.vue'), meta: { title: '测试校准检定方法查新记录表', icon: 'ep:key', @@ -426,7 +433,8 @@ { path: 'change/approved/:id', name: 'FileChangeFormDetailApproved', - component: () => import('@/views/resource/file/change/approvedDetail.vue'), + component: () => + import('@/views/resource/file/change/approvedDetail.vue'), meta: { title: '文件更改申请单', icon: 'ep:key', @@ -460,7 +468,8 @@ { path: 'approval/approved/:id', name: 'FileApprovalFormDetailApproved', - component: () => import('@/views/resource/file/approval/approvedDetail.vue'), + component: () => + import('@/views/resource/file/approval/approvedDetail.vue'), meta: { title: '文件审批详情', icon: 'ep:key', @@ -494,7 +503,8 @@ { path: 'grantNotice/approved/:id', name: 'FileGrantNoticeDetailApproved', - component: () => import('@/views/resource/file/grantNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/file/grantNotice/approvedDetail.vue'), meta: { title: '文件发放通知单详情', icon: 'ep:key', @@ -516,7 +526,8 @@ { path: 'recallArchive/:type/:id?', name: 'FileRecallArchiveDetail', - component: () => import('@/views/resource/file/recallArchive/detail.vue'), + component: () => + import('@/views/resource/file/recallArchive/detail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -528,7 +539,8 @@ { path: 'recallArchive/approved/:id', name: 'FileRecallArchiveDetailApproved', - component: () => import('@/views/resource/file/recallArchive/approvedDetail.vue'), + component: () => + import('@/views/resource/file/recallArchive/approvedDetail.vue'), meta: { title: '文件收回存档登记表详情', icon: 'ep:key', @@ -585,7 +597,8 @@ { path: 'revision/:type/:id?/:status?', name: 'RevisionApplyDetail', - component: () => import('@/views/resource/software/revision/detail.vue'), + component: () => + import('@/views/resource/software/revision/detail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -597,7 +610,8 @@ { path: 'revision/approved/:id?', name: 'RevisionApplyDetailApproved', - component: () => import('@/views/resource/software/revision/approvedDetail.vue'), + component: () => + import('@/views/resource/software/revision/approvedDetail.vue'), meta: { title: '软件修订申请详情', icon: 'ep:key', @@ -631,7 +645,8 @@ { path: 'review/approved/:id?', name: 'ReviewReportDetailApproved', - component: () => import('@/views/resource/software/review/approvedDetail.vue'), + component: () => + import('@/views/resource/software/review/approvedDetail.vue'), meta: { title: '软件评审报告详情', icon: 'ep:key', @@ -656,7 +671,8 @@ { path: 'requireList', name: 'EnvironmentRequireList', - component: () => import('@/views/resource/environment/require/list.vue'), + component: () => + import('@/views/resource/environment/require/list.vue'), meta: { title: '工作间环境条件要求一览表', auth: '/resource/environment/require', @@ -666,7 +682,8 @@ { path: 'requireDetail', name: 'EnvironmentRequireDetail', - component: () => import('@/views/resource/environment/require/detail.vue'), + component: () => + import('@/views/resource/environment/require/detail.vue'), meta: { title: '工作间环境条件要求详情', icon: 'ep:key', @@ -678,7 +695,8 @@ { path: 'resistanceList', name: 'EnvironmentResistanceList', - component: () => import('@/views/resource/environment/resistance/list.vue'), + component: () => + import('@/views/resource/environment/resistance/list.vue'), meta: { title: '实验室接地电阻记录', auth: '/resource/environment/resistance', @@ -688,7 +706,8 @@ { path: 'resistance/detail', name: 'EnvironmentResistanceDetail', - component: () => import('@/views/resource/environment/resistance/detail.vue'), + component: () => + import('@/views/resource/environment/resistance/detail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -700,7 +719,8 @@ { path: 'resistance/approved/:type?/:id?', name: 'EnvironmentResistanceDetailApproved', - component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/resistance/approvedDetail.vue'), meta: { title: '实验室接地电阻记录详情', icon: 'ep:key', @@ -712,7 +732,8 @@ { path: 'voltageList', name: 'EnvironmentVoltageList', - component: () => import('@/views/resource/environment/voltage/list.vue'), + component: () => + import('@/views/resource/environment/voltage/list.vue'), meta: { title: '工作间供电电压记录', auth: '/resource/environment/voltage', @@ -722,7 +743,8 @@ { path: 'voltage/detail', name: 'EnvironmentVoltageDetail', - component: () => import('@/views/resource/environment/voltage/detail.vue'), + component: () => + import('@/views/resource/environment/voltage/detail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -734,7 +756,8 @@ { path: 'voltage/approved/:type?/:id?', name: 'EnvironmentVoltageDetailApproved', - component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/voltage/approvedDetail.vue'), meta: { title: '工作间供电电压记录详情', icon: 'ep:key', @@ -768,7 +791,8 @@ { path: 'ups/approved/:type?/:id?', name: 'EnvironmentUpsDetailApproved', - component: () => import('@/views/resource/environment/ups/approvedDetail.vue'), + component: () => + import('@/views/resource/environment/ups/approvedDetail.vue'), meta: { title: 'UPS蓄电池内阻测试记录详情', icon: 'ep:key', @@ -790,7 +814,8 @@ { path: 'setting', name: 'EnvironmentSetting', - component: () => import('@/views/resource/environment/record/setting.vue'), + component: () => + import('@/views/resource/environment/record/setting.vue'), meta: { title: '环境记录单设置', icon: 'ep:key', @@ -799,14 +824,28 @@ activeMenu: '/environment/recordList', }, }, + // { + // path: 'bench', + // name: 'EnvironmentBench', + // component: () => import('@/views/dataManagement/index.vue'), + // meta: { + // title: '环境数据看板', + // auth: '/resource/environment/bench', + // icon: 'ep:key', + // breadcrumb: false, + // sidebar: true, + // }, + // }, { - path: 'bench', - name: 'EnvironmentBench', - component: () => import('@/views/resource/environment/bench/index.vue'), + path: '/dataManagement/index', + name: 'DataManagementIndex', + component: () => import('@/views/dataManagement/index.vue'), meta: { title: '环境数据看板', auth: '/resource/environment/bench', icon: 'ep:key', + breadcrumb: false, + sidebar: true, }, }, ], @@ -825,7 +864,8 @@ { path: 'supplierList', name: 'SupplierList', - component: () => import('@/views/resource/outsideService/supplier/list.vue'), + component: () => + import('@/views/resource/outsideService/supplier/list.vue'), meta: { title: '合格供方名录', auth: '/resource/outsideService/supplier', @@ -835,7 +875,8 @@ { path: ':type/:id?/:status?', name: 'SupplierDetail', - component: () => import('@/views/resource/outsideService/supplier/detail.vue'), + component: () => + import('@/views/resource/outsideService/supplier/detail.vue'), meta: { title: '合格供方名录详情', icon: 'ep:key', @@ -847,7 +888,8 @@ { path: 'serviceEvaluateList', name: 'ServiceEvaluateList', - component: () => import('@/views/resource/outsideService/service/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateList.vue'), meta: { title: '外部服务评价表', auth: '/resource/outsideService/serviceEvaluate', @@ -857,7 +899,8 @@ { path: 'service/:type/:id?/:status?', name: 'ServiceEvaluateDetail', - component: () => import('@/views/resource/outsideService/service/evaluateDetail.vue'), + component: () => + import('@/views/resource/outsideService/service/evaluateDetail.vue'), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -869,7 +912,10 @@ { path: 'service/approved/:id?', name: 'ServiceEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue' + ), meta: { title: '外部服务评价表详情', icon: 'ep:key', @@ -881,7 +927,8 @@ { path: 'equipmentEvaluateList', name: 'EquipmentEvaluateList', - component: () => import('@/views/resource/outsideService/equipment/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/equipment/evaluateList.vue'), meta: { title: '设备供方评价表', auth: '/resource/outsideService/equipmentEvaluate', @@ -891,7 +938,10 @@ { path: 'equipment/:type/:id?/:status?', name: 'EquipmentEvaluateDetail', - component: () => import('@/views/resource/outsideService/equipment/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/equipment/evaluateDetail.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -903,7 +953,10 @@ { path: 'equipment/approved/:id?', name: 'EquipmentEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue' + ), meta: { title: '设备供方评价表详情', icon: 'ep:key', @@ -915,7 +968,8 @@ { path: 'consumableApplyList', name: 'ConsumableApplyList', - component: () => import('@/views/resource/outsideService/consumable/applyList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyList.vue'), meta: { title: '易耗物资申请单', auth: '/resource/outsideService/consumableApply', @@ -925,7 +979,8 @@ { path: 'consumableApply/:type/:id?/:status?', name: 'ConsumableApplyDetail', - component: () => import('@/views/resource/outsideService/consumable/applyDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/applyDetail.vue'), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -937,7 +992,10 @@ { path: 'consumableApply/approved/:type?/:id?', name: 'ConsumableApplyDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableApply.vue' + ), meta: { title: '易耗物资申请单详情', icon: 'ep:key', @@ -949,7 +1007,8 @@ { path: 'consumableCheckList', name: 'ConsumableCheckList', - component: () => import('@/views/resource/outsideService/consumable/checkList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkList.vue'), meta: { title: '物资验收记录', auth: '/resource/outsideService/consumableCheck', @@ -959,7 +1018,8 @@ { path: 'consumableCheck/:type/:id?/:status?', name: 'ConsumableCheckDetail', - component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/checkDetail.vue'), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -971,7 +1031,10 @@ { path: 'consumableCheck/approved/:id?', name: 'ConsumableCheckDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableCheck.vue' + ), meta: { title: '物资验收记录详情', icon: 'ep:key', @@ -983,7 +1046,8 @@ { path: 'consumableStoreList', name: 'ConsumableStoreList', - component: () => import('@/views/resource/outsideService/consumable/storeList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeList.vue'), meta: { title: '物资入库单', auth: '/resource/outsideService/consumableStore', @@ -993,7 +1057,8 @@ { path: 'consumableStore/:type/:id?/:status?', name: 'ConsumableStoreDetail', - component: () => import('@/views/resource/outsideService/consumable/storeDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/storeDetail.vue'), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1005,7 +1070,10 @@ { path: 'consumableStore/approved/:type?/:id?', name: 'ConsumableStoreDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableStore.vue' + ), meta: { title: '物资入库单详情', icon: 'ep:key', @@ -1017,7 +1085,8 @@ { path: 'consumableUseList', name: 'ConsumableUseList', - component: () => import('@/views/resource/outsideService/consumable/useList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useList.vue'), meta: { title: '易耗物资使用记录', auth: '/resource/outsideService/consumableUse', @@ -1027,7 +1096,8 @@ { path: 'consumable/:type/:id?/:status?', name: 'ConsumableUseDetail', - component: () => import('@/views/resource/outsideService/consumable/useDetail.vue'), + component: () => + import('@/views/resource/outsideService/consumable/useDetail.vue'), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1039,7 +1109,10 @@ { path: 'consumable/approved/:id?', name: 'ConsumableUseDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableUse.vue' + ), meta: { title: '易耗物资使用记录详情', icon: 'ep:key', @@ -1051,7 +1124,8 @@ { path: 'consumableHandoverList', name: 'ConsumableHandoverList', - component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/handoverList.vue'), meta: { title: '废弃物资处理交接记录', auth: '/resource/outsideService/consumableHandover', @@ -1061,7 +1135,10 @@ { path: 'consumableHandover/:type/:id?', name: 'ConsumableHandoverDetail', - component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/handoverDetail.vue' + ), meta: { title: '废弃物资处理交接记录详情', icon: 'ep:key', @@ -1073,7 +1150,8 @@ { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', - component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), + component: () => + import('@/views/resource/outsideService/consumable/evaluateList.vue'), meta: { title: '易耗物资供方评价表', auth: '/resource/outsideService/consumableEvaluate', @@ -1083,7 +1161,10 @@ { path: 'consumable/supplier/:type/:id?/:status?', name: 'ConsumableEvaluateDetail', - component: () => import('@/views/resource/outsideService/consumable/evaluateDetail.vue'), + component: () => + import( + '@/views/resource/outsideService/consumable/evaluateDetail.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1095,7 +1176,10 @@ { path: 'consumable/supplier/approved/:id?', name: 'ConsumableEvaluateDetailApproved', - component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'), + component: () => + import( + '@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue' + ), meta: { title: '易耗物资供方评价表详情', icon: 'ep:key', @@ -1142,7 +1226,8 @@ { path: 'reviewNoticeList', name: 'ReviewNoticeList', - component: () => import('@/views/resource/customer/reviewNotice/list.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/list.vue'), meta: { title: '检测结果复查通知列表', auth: '/resource/customer/reviewNotice', @@ -1152,7 +1237,8 @@ { path: 'reviewNotice/:type/:id?', name: 'ReviewNoticeDetail', - component: () => import('@/views/resource/customer/reviewNotice/detail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/detail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1164,7 +1250,8 @@ { path: 'reviewNotice/approved/:id?', name: 'NoticeDetailApproved', - component: () => import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/reviewNotice/approvedDetail.vue'), meta: { title: '检测结果复查通知详情', icon: 'ep:key', @@ -1176,7 +1263,8 @@ { path: 'situationReportList', name: 'SituationReportList', - component: () => import('@/views/resource/customer/situationReport/list.vue'), + component: () => + import('@/views/resource/customer/situationReport/list.vue'), meta: { title: '委托方情况报告列表', auth: '/resource/customer/situationReport', @@ -1186,7 +1274,8 @@ { path: 'situationReport/:type/:id?', name: 'SituationReportDetail', - component: () => import('@/views/resource/customer/situationReport/detail.vue'), + component: () => + import('@/views/resource/customer/situationReport/detail.vue'), meta: { title: '委托方情况报告详情', icon: 'ep:key', @@ -1198,7 +1287,8 @@ { path: 'questionnaireList', name: 'QuestionnaireList', - component: () => import('@/views/resource/customer/questionnaire/list.vue'), + component: () => + import('@/views/resource/customer/questionnaire/list.vue'), meta: { title: '委托方满意度调查表列表', auth: '/resource/customer/questionnaire', @@ -1208,7 +1298,8 @@ { path: 'questionnaire/:type/:id?', name: 'QuestionnaireDetail', - component: () => import('@/views/resource/customer/questionnaire/detail.vue'), + component: () => + import('@/views/resource/customer/questionnaire/detail.vue'), meta: { title: '委托方满意度调查表详情', icon: 'ep:key', @@ -1220,7 +1311,8 @@ { path: 'suggestFormList', name: 'SuggestFormList', - component: () => import('@/views/resource/customer/suggestForm/list.vue'), + component: () => + import('@/views/resource/customer/suggestForm/list.vue'), meta: { title: '委托方意见登记表列表', auth: '/resource/customer/suggestForm', @@ -1230,7 +1322,8 @@ { path: 'suggestForm/:type/:id?', name: 'SuggestFormDetail', - component: () => import('@/views/resource/customer/suggestForm/detail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/detail.vue'), meta: { title: '委托方意见登记表详情', icon: 'ep:key', @@ -1242,7 +1335,8 @@ { path: 'suggestForm/approved/:id', name: 'SuggestFormDetailApproved', - component: () => import('@/views/resource/customer/suggestForm/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/suggestForm/approvedDetail.vue'), meta: { title: '授权(代委托方意见登记表详情理)委托书', icon: 'ep:key', @@ -1276,7 +1370,8 @@ { path: 'examine/approved/:id?', name: 'ExamineDetailApproved', - component: () => import('@/views/resource/customer/examine/approvedDetail.vue'), + component: () => + import('@/views/resource/customer/examine/approvedDetail.vue'), meta: { title: '要求、委托书及合同评审表详情', icon: 'ep:key', diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 801c293..7adabaa 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -207,7 +207,7 @@ [SCHEDULE.TRACE_RESULT_VERIFICATION_APPROVAL]: '/source/resultConfirm', // 溯源结果确认 [SCHEDULE.TRACE_RESULT_PERFORMANCE_APPROVAL]: '/source/resultComplete', // 溯源结果完成情况 [SCHEDULE.TRACE_CHANGE_APPROVAL]: '/source/sourceChange', // 溯源变更管理 - [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/unpack', // 开箱验收管理 + [SCHEDULE.UNPACKING_INSPECTING_APPROVAL]: '/resume/unpack', // 开箱验收管理 [SCHEDULE.EQUIPMENT_LEND_APPROVAL]: '/resume/lend', // 设备借出管理 [SCHEDULE.EQUIPMENT_BORROW_APPROVAL]: '/resume/borrow', // 设备借用管理 [SCHEDULE.EXCEPTION_HANDLING_APPROVAL]: '/resume/error', // 异常情况处置管理 diff --git a/src/views/business/manager/sendReceive/components/processConfig.vue b/src/views/business/manager/sendReceive/components/processConfig.vue index 617aede..62a2e95 100644 --- a/src/views/business/manager/sendReceive/components/processConfig.vue +++ b/src/views/business/manager/sendReceive/components/processConfig.vue @@ -146,7 +146,7 @@ const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId) if (index !== -1) { if (!processList.value[index].measurePersonId) { - ElMessage.warning('检定人员不能为空') + ElMessage.warning('检定人员不能为空,请重新选择检定人员') return false } if (!`${processList.value[index].requireCertifications}`) { diff --git a/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue b/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue index 866592e..4873aab 100644 --- a/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue +++ b/src/views/business/manager/sendReceive/dialog/batchFinishDialog.vue @@ -6,7 +6,7 @@ import { getDictByCode } from '@/api/system/dict' import type { dictType } from '@/global' import { batchTerminate } from '@/api/business/manager/sendReceive' -const emit = defineEmits(['confirm']) +const emits = defineEmits(['onSuccess']) // 弹窗显示状态 const dialogVisible = ref(false) // 默认表单 @@ -21,6 +21,8 @@ sampleId: '', // 样品id }) +const getList = ref([]) as any + // 保存按钮加载状态 const btnLoading = ref(false) // -------------------------------------------字典---------------------------------------------+ @@ -56,7 +58,15 @@ * @param orderId 委托书id * @param sampleId 样品id */ -function initDialog(row: any) { +function initDialog(list: any) { + if (list && list.length) { + getList.value = list.map((item: any) => { + return { + orderId: item.orderId, // 委托书id + sampleId: item.sampleId, // 样品id + } + }) + } getDict() dialogVisible.value = true } @@ -67,14 +77,26 @@ formEl.validate((valid) => { if (valid) { btnLoading.value = true - // interchangeListTerminate([formData.value]).then((res) => { - // ElMessage.success('操作成功') - // btnLoading.value = false - // dialogVisible.value = false - // emit('onSuccess') - // }).catch((_) => { - // btnLoading.value = false - // }) + const param = getList.value.map((item: any) => { + return { + ...item, + checkOrganization: '中国西昌卫星发射中心计量测试站', // 检定校准机构 + traceDate: form.value.traceDate, // 检定日期 + measureValidDate: form.value.measureValidDate, // 检定有效期至 + conclusion: form.value.conclusion, // 检定结论 + meterIdentify: form.value.meterIdentify, // 计量标识 + restrictionInstruction: form.value.restrictionInstruction, // 限用说明 + status: '5', // 完成状态需要变为5 + } + }) + batchTerminate(param).then((res) => { + ElMessage.success('操作成功') + btnLoading.value = false + dialogVisible.value = false + emits('onSuccess') + }).catch((_) => { + btnLoading.value = false + }) } }) } diff --git a/src/views/business/manager/sendReceive/list.vue b/src/views/business/manager/sendReceive/list.vue index 0b9853c..877a0ce 100644 --- a/src/views/business/manager/sendReceive/list.vue +++ b/src/views/business/manager/sendReceive/list.vue @@ -390,7 +390,7 @@ ElMessage.warning('请选中') return false } - batchFinishDialogRef.value.initDialog() + batchFinishDialogRef.value.initDialog(checkoutList.value) } // 导出 @@ -778,7 +778,7 @@ - + diff --git a/src/views/resource/environment/bench/index.vue b/src/views/resource/environment/bench/index.vue index f53a199..07a7b62 100644 --- a/src/views/resource/environment/bench/index.vue +++ b/src/views/resource/environment/bench/index.vue @@ -1,3 +1,8 @@ + +