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/process/ensureResults/qualityControlPlan/components/recordsDialog.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
index 73041e3..9a8bf6b 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
@@ -235,9 +235,9 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeRecordsDia">鍙� 娑�</el-button>
- <el-button v-if="currentStep === 0" :loading="editLoad" type="primary" @click="handleEdit">鎻� 浜�</el-button>
- <el-button v-if="currentStep === 1" :loading="editLoad" @click="handleEdit(0)">涓嶉�氳繃</el-button>
- <el-button v-if="currentStep === 1" :loading="editLoad" type="primary" @click="handleEdit(1)">閫�
+ <el-button v-if="currentStep === 0 && userId == supervisedUserId" :loading="editLoad" type="primary" @click="handleEdit">鎻� 浜�</el-button>
+ <el-button v-if="currentStep === 1 && userId == ratifyUserId" :loading="editLoad" @click="handleEdit(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="currentStep === 1 && userId == ratifyUserId" :loading="editLoad" type="primary" @click="handleEdit(1)">閫�
杩�</el-button>
</span>
</el-dialog>
@@ -251,6 +251,7 @@
getSuperviseDetailRecord
} from "@/api/cnas/process/ensureResults/qualitySupervise";
import {selectUserCondition} from "@/api/business/inspectionTask";
+import {mapGetters} from "vuex";
export default {
name: 'recordsDialog',
@@ -288,12 +289,18 @@
editLoad: false,
personList: [],
recordUserList: [],
+ supervisedUserId: '',
+ ratifyUserId: '',
};
+ },
+ computed: {
+ ...mapGetters(["userId"]),
},
// 鏂规硶闆嗗悎
methods: {
openDia(row) {
this.formDia = true
+ this.supervisedUserId = row.supervisedUserId
this.searchInfo(row)
this.getAuthorizedPerson()
},
@@ -309,9 +316,9 @@
// 鏈塻uperviseDetailsRecordId璇存槑鎻愪氦杩囪褰�
if (res.data.ratifyUserId) {
// 鏄惁缁撴潫0:鏈粨鏉�, 1:宸茬粨鏉�
- if (res.data.isFinish === 0) {
+ if (res.data.isFinish != 1) {
this.currentStep = 1
- } else if (res.data.isFinish === 1) {
+ } else if (res.data.isFinish == 1) {
this.currentStep = 2
}
} else {
@@ -319,6 +326,7 @@
}
this.form = res.data
this.form.superviseDetailsId = row.superviseDetailsId
+ this.ratifyUserId = res.data.ratifyUserId
this.getRecordUser()
}).catch(err => {
console.log('err---', err);
--
Gitblit v1.9.3