From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/checkRecord.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/checkRecord.vue b/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
index a8a2376..d84fea0 100644
--- a/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
+++ b/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
@@ -85,7 +85,7 @@
</el-col>
</el-row>
<el-button size="small" style="margin: 10px 0" type="primary" @click="addRow">娣诲姞</el-button>
- <el-table :data="recordDetailList" height="300" style="width: 100%">
+ <el-table :data="recordDetailList" height="300" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="娴嬭瘯鐐�" min-width="130" prop="testPoint">
<template slot-scope="scope">
<el-input v-model="scope.row.testPoint" clearable size="small"></el-input>
@@ -210,10 +210,10 @@
</el-row>
<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 && checkChargerUserId == userId" :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>
@@ -228,6 +228,7 @@
deviceScopeSearch,
} from '@/api/cnas/resourceDemand/device.js'
import { selectUserCondition } from "@/api/performance/class";
+import {mapGetters} from "vuex";
export default {
name: "check-record",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -272,7 +273,7 @@
determine: '',
remark: '',
planDetailsId: '',
- checkerUserId: '',
+ reviewUserId: '',
},
currentStep: 0,
distributionDetailList: [
@@ -282,16 +283,22 @@
equipOptions: [],
submitFormLoading: false,
userList: [],
+ reviewUserId: '',
+ checkChargerUserId: '',
}
},
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()
@@ -303,7 +310,7 @@
this.form = { ...res.data }
this.form.planDetailsId = planDetailsId
this.recordDetailList = this.form.recordDetailList || []
- if (!this.form.checkerUserId) {
+ if (!this.form.reviewUserId) {
this.currentStep = 0
} else {
this.currentStep = 1
@@ -311,6 +318,7 @@
if (this.form.reviewStatus === 1) {
this.currentStep = 2
}
+ this.reviewUserId = this.form.reviewUserId
}
}).catch(error => {
console.error(error)
--
Gitblit v1.9.3