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/recordsDialog.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
index 3c57bb1..73041e3 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
@@ -25,8 +25,8 @@
<p><span class="required-span">* </span>鐩戠潱鍛橈細</p>
</td>
<td colspan="2">
- <el-select v-if="currentStep === 0" @change="usePersonName" v-model="form.supervisorId" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in recordUserList" :key="item.userId" :label="item.userName" :value="item.userId"></el-option>
+ <el-select v-if="currentStep === 0" @change="usePersonName" v-model="form.supervisor" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-option v-for="item in recordUserList" :key="item.userName" :label="item.userName" :value="item.userName"></el-option>
</el-select>
<span v-else class="td-info"> {{ form.supervisor }}</span>
</td>
@@ -235,7 +235,10 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeRecordsDia">鍙� 娑�</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>
@@ -304,7 +307,7 @@
searchInfo (row) {
getSuperviseDetailRecord({superviseDetailsId: row.superviseDetailsId}).then(res => {
// 鏈塻uperviseDetailsRecordId璇存槑鎻愪氦杩囪褰�
- if (res.data.superviseDetailsRecordId) {
+ if (res.data.ratifyUserId) {
// 鏄惁缁撴潫0:鏈粨鏉�, 1:宸茬粨鏉�
if (res.data.isFinish === 0) {
this.currentStep = 1
@@ -322,7 +325,7 @@
})
},
// 鎻愪氦娴佺▼
- handleEdit () {
+ handleEdit (isFinish) {
if (!this.form.testMember || !this.form.supervisor || !this.form.testItem || !this.form.sampleNumber
|| !this.form.testDate) {
this.$message.warning('璇峰～鍐欏畬鏁�')
@@ -331,15 +334,11 @@
if (this.currentStep === 0) {
this.addInfo()
} else {
- this.editInfo()
+ this.editInfo(isFinish)
}
},
// 鎻愪氦璁板綍
addInfo () {
- if (!this.form.ratifyUserId) {
- this.$message.warning('璇烽�夋嫨涓嬩竴姝ユ壒鍑嗕汉')
- return
- }
this.editLoad = true
addSuperviseDetailRecord(this.form).then(res => {
this.editLoad = false
@@ -351,7 +350,7 @@
})
},
// 鎻愪氦鎵瑰噯
- editInfo () {
+ editInfo (isFinish) {
if (!this.form.ratifyOpinion) {
this.$message.warning('璇峰～鍐欏鎵规剰瑙�')
return
@@ -361,6 +360,7 @@
return
}
this.editLoad = true
+ this.form.isFinish = isFinish
addSuperviseRecordOpinion(this.form).then(res => {
this.editLoad = false
this.$message.success('鎿嶄綔鎴愬姛')
--
Gitblit v1.9.3