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 +++++-----
src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue | 32 ++++++----------
src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue | 44 ++++-----------------
3 files changed, 32 insertions(+), 66 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('鎵瑰噯鎴愬姛')
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('鎿嶄綔鎴愬姛')
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