From cafcefa1f4e77dd545915f10758e95b8f64330d8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 三月 2025 17:07:40 +0800
Subject: [PATCH] 质量监控计划-流程修改
---
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue | 19 ++++++++++++++++++-
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue | 3 ---
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue | 18 +++++++++---------
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue | 4 ++--
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
index 8f666c5..eebccca 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
@@ -5,7 +5,7 @@
<el-upload ref='upload'
:action="fileAction"
:auto-upload="true"
- :before-upload="fileBeforeUpload" :data="{detailsEvaluateId: info.detailsEvaluateId}"
+ :before-upload="fileBeforeUpload" :data="{qualityMonitorDetailsId: info.qualityMonitorDetailsId}"
:headers="uploadHeader" :on-error="onError"
:on-success="handleSuccessUp"
:show-file-list="false"
@@ -101,7 +101,7 @@
// 鏌ヨ闄勪欢鍒楄〃
searchTableList () {
this.tableLoading = true
- getEvaluateFileList({detailsEvaluateId:this.info.detailsEvaluateId}).then(res => {
+ getEvaluateFileList({qualityMonitorDetailsId:this.info.qualityMonitorDetailsId}).then(res => {
this.tableLoading = false
if (res.code === 200){
this.tableData = res.data
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
index f3fd3c5..1249f83 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
@@ -145,7 +145,10 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeCarryOutDia">鍙� 娑�</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>
@@ -199,7 +202,7 @@
searchInfo(row) {
getQualityMonitorRatify({ qualityMonitorDetailsId: row.qualityMonitorDetailsId }).then(res => {
// 鏈塪etailsRatifyId鍒欒鏄庢彁浜よ繃瀹炴柦淇℃伅
- if (res.data.detailsRatifyId) {
+ if (res.data.ratifyUserId) {
// 鏄惁缁撴潫0:鏈粨鏉�, 1:宸茬粨鏉�
if (res.data.isFinish == 0) {
this.currentStep = 1
@@ -215,16 +218,12 @@
})
},
// 鎻愪氦
- handleEdit() {
- if (!this.form.ratifyUserId) {
- this.$message.warning('璇烽�夋嫨鎵瑰噯浜�')
- return
- }
+ handleEdit(isFinish) {
this.editLoad = true
if (this.currentStep == 0) {
this.addInfo()
} else {
- this.editInfo()
+ this.editInfo(isFinish)
}
},
// 鎻愪氦瀹炴柦
@@ -239,7 +238,8 @@
})
},
// 鎻愪氦鎵瑰噯
- editInfo() {
+ editInfo(isFinish) {
+ this.form.isFinish = isFinish
addQualityMonitorRatifyOpinion(this.form).then(res => {
this.editLoad = false
this.$message.success('鎿嶄綔鎴愬姛')
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue
index 25d5c22..0d35fc6 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue
@@ -4,9 +4,6 @@
:visible.sync="formDia"
title="璐ㄩ噺鐩戞帶璇勪环"
width="60%" @close="closeEvaDia">
- <div style="text-align: right">
- <el-button size="small" type="primary" @click="viewTestRecord" :disabled="currentStep === 0">闄勪欢涓婁紶</el-button>
- </div>
<el-steps :active="currentStep" align-center finish-status="success">
<el-step title="鐩戞帶璁″垝瀹炴柦鎯呭喌" @click.native="setStep(0)"></el-step>
<el-step title="鐩戞帶缁撴灉璇勪环" @click.native="setStep(1)"></el-step>
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index d12d8a3..25b9c4d 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -156,6 +156,7 @@
<el-button :loading="uploading1" type="primary" @click="submitUpload1()">涓� 浼�</el-button>
</span>
</el-dialog>
+ <view-record v-if="ViewRecord" ref="ViewRecord"></view-record>
</div>
</template>
@@ -174,14 +175,16 @@
} from "@/api/cnas/process/ensureResults/qualityMonitor";
import { selectUserCondition } from "@/api/performance/class";
import { mapGetters } from "vuex";
+import ViewRecord from "./components/ViewRecord.vue";
export default {
name: 'EnsureResultsValidity',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { limsTable, filePreview, EvaluateDialog, CarryOutDialog, DetailFormDialog },
+ components: {ViewRecord, limsTable, filePreview, EvaluateDialog, CarryOutDialog, DetailFormDialog },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ ViewRecord: false,
examineUserId: '',
responsibleOptions: [],
yearForm: {
@@ -495,6 +498,13 @@
type: 'text',
clickFun: (row) => {
this.evaluate(row)
+ }
+ },
+ {
+ name: '闄勪欢涓婁紶',
+ type: 'text',
+ clickFun: (row) => {
+ this.viewTestRecord(row)
}
},
{
@@ -831,6 +841,13 @@
this.evaluateDialog = false
this.getYearDetailPlanList()
},
+ // 闄勪欢涓婁紶
+ viewTestRecord (row) {
+ this.ViewRecord = true
+ this.$nextTick(() => {
+ this.$refs.ViewRecord.openDia(row)
+ })
+ },
// 鎵撳紑瀵煎嚭寮规
downLoadPost(row) {
this.downloadDialog = true
--
Gitblit v1.9.3