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/process/ensureResults/qualityControlPlan/components/processingSheet.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
index 97b3b36..5d2f2c8 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
@@ -297,9 +297,9 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeProcessingDia">鍙� 娑�</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 == approverUserId" :loading="editLoad" @click="handleEdit(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="currentStep === 1 && userId == approverUserId" :loading="editLoad" type="primary" @click="handleEdit(1)">閫�
杩�</el-button>
</span>
</el-dialog>
@@ -312,6 +312,7 @@
getSuperviseDetailAccording
} from "@/api/cnas/process/ensureResults/qualitySupervise";
import {selectUserCondition} from "@/api/business/inspectionTask";
+import {mapGetters} from "vuex";
export default {
name: 'processingSheet',
@@ -356,13 +357,19 @@
editLoad: false,
personList: [],
supervisedUserList: [],
+ supervisedUserId: '',
+ approverUserId: ''
};
+ },
+ computed: {
+ ...mapGetters(["userId"]),
},
// 鏂规硶闆嗗悎
methods: {
openDia (row) {
this.formDia = true
this.form.superviseDetailsId = row.superviseDetailsId
+ this.supervisedUserId = row.supervisedUserId
this.searchInfo(row)
this.form.approveId = row.approveId
this.getAuthorizedPerson() // 鑾峰彇浜哄憳鍒楄〃
@@ -373,17 +380,19 @@
getSuperviseDetailAccording({superviseDetailsId: this.form.superviseDetailsId}).then(res => {
this.form.supervisedUserId = res.data.supervisedUserId
this.form.supervisedUserName = res.data.supervisedUserName
- if (!res.data.approverUserId) {
- this.currentStep = 0
- } else {
- if (res.data.isFinish === 0) {
+ if (res.data.approverUserId) {
+ // 鏄惁缁撴潫0:鏈粨鏉�, 1:宸茬粨鏉�
+ if (res.data.isFinish != 1) {
this.currentStep = 1
- } else {
+ } else if (res.data.isFinish == 1) {
this.currentStep = 2
}
+ } else {
+ this.currentStep = 0
}
this.form = res.data
this.form.superviseDetailsId = row.superviseDetailsId
+ this.approverUserId = res.data.approverUserId
}).catch(err => {
console.log('err---', err);
})
--
Gitblit v1.9.3