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/rectifyDialogNew.vue | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
index da1212b..b3838eb 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
@@ -38,18 +38,6 @@
<span v-if="currentStep !== 0" class="td-info1"> {{ form.raiseResult }}</span>
</td>
</tr>
-<!-- <tr v-if="showStep === 0">-->
-<!-- <td v-if="currentStep === 0" class="td-title">-->
-<!-- <p><span class="required-span">* </span>璇烽�夋嫨涓嬩竴姝ヨ礋璐ｄ汉锛�</p>-->
-<!-- </td>-->
-<!-- <td v-if="currentStep === 0" class="td-info" colspan="3">-->
-<!-- <el-select v-model="form.causeUserId" clearable filterable-->
-<!-- placeholder="璇烽�夋嫨" size="small">-->
-<!-- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </td>-->
-<!-- </tr>-->
<tr v-if="currentStep !== 0">
<td class="td-title">
<p>鎻愬嚭浜猴細</p>
@@ -130,18 +118,6 @@
{{form.causeTime}}
</td>
</tr>
-<!-- <tr v-if="showStep === 0">-->
-<!-- <td v-if="currentStep === 0" class="td-title">-->
-<!-- <p><span class="required-span">* </span>璇烽�夋嫨涓嬩竴姝ヨ礋璐ｄ汉锛�</p>-->
-<!-- </td>-->
-<!-- <td v-if="currentStep === 0" class="td-info" colspan="3">-->
-<!-- <el-select v-model="form.correctUserId" clearable filterable-->
-<!-- placeholder="璇烽�夋嫨" size="small">-->
-<!-- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </td>-->
-<!-- </tr>-->
<tr>
<td class="td-title">
<p><span class="required-span">* </span>绾犳鎺柦锛�</p>
@@ -266,7 +242,10 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeRectifyDia">鍙� 娑�</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>
@@ -289,7 +268,6 @@
return {
formDia: false,
currentStep: 0,
- showStep: 0,
form: {
superviseDetailsId: '',
raiseResult: '',
@@ -336,27 +314,22 @@
searchInfo (row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
getSuperviseDetailCorrect({superviseDetailsId: row.superviseDetailsId}).then(res => {
- if (res.data.superviseDetailsCorrectId === null) {
- this.showStep = 0
+ if (!res.data.approverUserId) {
this.currentStep = 0
} else {
- this.form = res.data
if (res.data.isFinish === 0) {
- if (res.data.approverUserId) {
- this.showStep = 1
- this.currentStep = 1
- }
+ this.currentStep = 1
} else {
this.currentStep = 2
- this.showStep = 1
}
}
+ this.form = res.data
}).catch(err => {
console.log('err---', err);
})
},
// 鎻愪氦
- handleEdit () {
+ handleEdit (isFinish) {
if (this.currentStep === 0) {
if (!this.form.raiseResult) {
this.$message.warning('璇峰～鍐欎笉鍚堟牸鎻忚堪')
@@ -387,6 +360,7 @@
this.editLoad = false
})
} else {
+ this.form.isFinish = isFinish
approveEquipSuperviseDetailCorrect(this.form).then(res => {
this.editLoad = false
this.$message.success('鎵瑰噯鎴愬姛')
--
Gitblit v1.9.3