From 64922c22f6488dbce8b0dd05a261f60cde2f31e0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 三月 2025 16:59:14 +0800
Subject: [PATCH] 质量监督计划-流程修改
---
src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
index 0b7fb4b..97b3b36 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
@@ -82,12 +82,6 @@
<p><span class="required-span">* </span>琚洃鐫ｄ汉锛�</p>
</td>
<td class="td-info">
-<!-- <el-select v-if="currentStep === 0" v-model="form.supervisedUserId" clearable-->
-<!-- filterable-->
-<!-- placeholder="璇烽�夋嫨" size="small">-->
-<!-- <el-option v-for="(item,i) in supervisedUserList" :key="i" :label="item.label" :value="item.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
<span class="td-info1"> {{ form.supervisedUserName }}</span>
</td>
<td class="td-title">
@@ -303,7 +297,10 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeProcessingDia">鍙� 娑�</el-button>
- <el-button v-if="currentStep !== 2" :loading="editLoad" type="primary" @click="handleEdit">鎻� 浜�</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>
</span>
</el-dialog>
</div>
@@ -365,36 +362,34 @@
methods: {
openDia (row) {
this.formDia = true
- this.searchInfo(row)
this.form.superviseDetailsId = row.superviseDetailsId
+ this.searchInfo(row)
this.form.approveId = row.approveId
this.getAuthorizedPerson() // 鑾峰彇浜哄憳鍒楄〃
// this.getSupervisedUserList() // 鑾峰彇褰撳墠閮ㄩ棬浜哄憳
},
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
searchInfo (row) {
- this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
- getSuperviseDetailAccording({superviseDetailsId: row.superviseDetailsId}).then(res => {
+ getSuperviseDetailAccording({superviseDetailsId: this.form.superviseDetailsId}).then(res => {
this.form.supervisedUserId = res.data.supervisedUserId
this.form.supervisedUserName = res.data.supervisedUserName
- if (res.data.superviseDetailsAccordingId === null) {
+ if (!res.data.approverUserId) {
this.currentStep = 0
} else {
- this.form = res.data
if (res.data.isFinish === 0) {
- if (res.data.approverUserId) {
- this.currentStep = 1
- }
+ this.currentStep = 1
} else {
this.currentStep = 2
}
}
+ this.form = res.data
+ this.form.superviseDetailsId = row.superviseDetailsId
}).catch(err => {
console.log('err---', err);
})
},
// 鎻愪氦
- handleEdit () {
+ handleEdit (isFinish) {
if (this.currentStep === 0) {
if (this.form.findWay === null) {
this.$message.warning('璇烽�夋嫨涓嶇鍚堝伐浣滃彂鐜伴�斿緞')
@@ -416,10 +411,6 @@
this.$message.warning('璇烽�夋嫨鏄惁闇�瑕侀噰鍙栫籂姝ｆ帾鏂�')
return
}
- if (!this.form.approverUserId) {
- this.$message.warning('璇烽�夋嫨鎵瑰噯浜�')
- return
- }
}
this.editLoad = true
this.form.flowType = this.currentStep
@@ -433,6 +424,7 @@
this.editLoad = false
})
} else {
+ this.form.isFinish = isFinish
approverEquipSuperviseDetailAccording(this.form).then(res => {
this.editLoad = false
this.$message.success('鎵瑰噯鎴愬姛')
--
Gitblit v1.9.3