From 77b3c6039085d86088ad11bee6a92775080ec784 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 11:25:21 +0800
Subject: [PATCH] 质量监控计划联调
---
src/api/system/user.js | 7 +++++++
src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue | 5 ++++-
src/api/cnas/process/ensureResultsValidity/qualityMonitor.js | 7 -------
src/views/CNAS/process/ensureResultsValidity/index.vue | 4 ++--
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js b/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js
index eb86623..221c369 100644
--- a/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js
+++ b/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js
@@ -148,10 +148,3 @@
data: query
})
}
-// 鏂板鐩戞帶璇勪环
-export function selectUserDepartmentLimsName(query) {
- return request({
- url: '/user/selectUserDepartmentLimsName',
- method: 'get'
- })
-}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 403ace7..14b4c2b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -180,3 +180,10 @@
params: params
})
}
+// 鑾峰彇褰撳墠鐧诲綍浜哄憳閮ㄩ棬
+export function selectUserDepartmentLimsName(query) {
+ return request({
+ url: '/system/newUser/selectUserDepartmentLimsName',
+ method: 'get'
+ })
+}
diff --git a/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue b/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
index 3f671c2..06a9db4 100644
--- a/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
@@ -161,9 +161,10 @@
import ViewRecord from './ViewRecord.vue';
import {
addMonitorEvaluateOpinion, addQualityMonitorEvaluate,
- getQualityMonitorEvaluate, selectUserDepartmentLimsName
+ getQualityMonitorEvaluate
} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
import {selectUserCondition} from "@/api/business/inspectionTask";
+import {selectUserDepartmentLimsName} from "@/api/system/user";
export default {
name: 'evaluateDialog',
@@ -233,6 +234,7 @@
// 鎻愪氦
handleEdit () {
if (this.currentStep === 2) {
+ this.editLoad = true
addMonitorEvaluateOpinion(this.form).then(res => {
this.editLoad = false
this.$message.success('鎿嶄綔鎴愬姛')
@@ -268,6 +270,7 @@
return
}
}
+ this.editLoad = true
addQualityMonitorEvaluate(this.form).then(res => {
this.editLoad = false
this.$message.success('鎿嶄綔鎴愬姛')
diff --git a/src/views/CNAS/process/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResultsValidity/index.vue
index d61209f..c7f1316 100644
--- a/src/views/CNAS/process/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/index.vue
@@ -101,8 +101,8 @@
</el-dialog>
<el-dialog :visible.sync="downloadDialog" title="瀵煎嚭" width="600px">
<span>
- <el-button plain type="primary" @click="controlDown">瀹炴柦璁″垝瀵煎嚭</el-button>
- <el-button plain type="primary" @click="processingDown">璇勪环瀵煎嚭</el-button>
+ <el-button plain type="primary" :disabled="!download.qualityMonitorDetailsId" @click="controlDown">瀹炴柦璁″垝瀵煎嚭</el-button>
+ <el-button plain type="primary" :disabled="!download.qualityMonitorDetailsId" @click="processingDown">璇勪环瀵煎嚭</el-button>
</span>
<span slot="footer" class="dialog-footer">
<el-button @click="downloadDialog = false">鍙� 娑�</el-button>
--
Gitblit v1.9.3