From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
index a43d0c9..a0d5d32 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
@@ -73,7 +73,8 @@
<el-button v-if="currentStep === 0" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
</div>
<div style="margin: 10px 0">
- <el-table ref="yearTable" :data="recordContrastDetailsList" height="300px" style="width: 100% ;">
+ <el-table ref="yearTable" :data="recordContrastDetailsList" height="300px" style="width: 100% ;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="鏍告煡椤圭洰" min-width="170" prop="checkItems">
<template slot-scope="scope">
@@ -127,10 +128,10 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="resetForm">鍙� 娑�</el-button>
- <el-button v-if="currentStep === 0" :loading="submitFormLoading" type="primary" @click="submitCheck">纭�
+ <el-button v-if="currentStep === 0 && userId == checkChargerUserId" :loading="submitFormLoading" type="primary" @click="submitCheck">纭�
瀹�</el-button>
- <el-button v-if="currentStep === 1" :loading="submitFormLoading" @click="examine(0)">涓嶉�氳繃</el-button>
- <el-button v-if="currentStep === 1" :loading="submitFormLoading" type="primary" @click="examine(1)">閫�
+ <el-button v-if="currentStep === 1 && userId == reviewUserId" :loading="submitFormLoading" @click="examine(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="currentStep === 1 && userId == reviewUserId" :loading="submitFormLoading" type="primary" @click="examine(1)">閫�
杩�</el-button>
</span>
</el-dialog>
@@ -145,6 +146,7 @@
addExamineRecordContrast,
} from '@/api/cnas/resourceDemand/device.js'
import { selectUserCondition } from "@/api/business/inspectionTask";
+import {mapGetters} from "vuex";
export default {
name: "equipment-check",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -177,16 +179,22 @@
equipOptions: [],
recordContrastDetailsList: [],
userList: [],
+ checkChargerUserId: '',
+ reviewUserId: ''
}
},
mounted() {
+ },
+ computed: {
+ ...mapGetters(["userId"]),
},
// 鏂规硶闆嗗悎
methods: {
openDialog(row) {
this.dialogVisible = true
this.form.planDetailsId = row.planDetailsId
+ this.checkChargerUserId = row.checkChargerUserId
this.getEquipOptions()
this.getUserList()
this.searchInfo()
@@ -204,6 +212,7 @@
if (this.form.reviewStatus === 1) {
this.currentStep = 2
}
+ this.reviewUserId = this.form.reviewUserId
}
}).catch(error => {
console.error(error)
--
Gitblit v1.9.3