From c67a8c5b44524e06cd58d9751e4b72aa62954412 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 13:48:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue b/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
index d63fc50..06a9db4 100644
--- a/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
@@ -159,6 +159,12 @@
<script>
import ViewRecord from './ViewRecord.vue';
+import {
+ addMonitorEvaluateOpinion, addQualityMonitorEvaluate,
+ getQualityMonitorEvaluate
+} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
+import {selectUserCondition} from "@/api/business/inspectionTask";
+import {selectUserDepartmentLimsName} from "@/api/system/user";
export default {
name: 'evaluateDialog',
@@ -202,8 +208,7 @@
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
searchInfo (row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
- this.$axios.get(this.$api.qualityMonitor.getQualityMonitorEvaluate + '?qualityMonitorDetailsId=' + row.qualityMonitorDetailsId).then(res => {
- if (res.code === 201) return
+ getQualityMonitorEvaluate({qualityMonitorDetailsId: row.qualityMonitorDetailsId}).then(res => {
if (res.data === null) {
this.showStep = 0
this.currentStep = 0
@@ -229,14 +234,9 @@
// 鎻愪氦
handleEdit () {
if (this.currentStep === 2) {
- this.$axios.post(this.$api.qualityMonitor.addMonitorEvaluateOpinion, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ this.editLoad = true
+ addMonitorEvaluateOpinion(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeEvaDia()
}).catch(err => {
@@ -270,14 +270,9 @@
return
}
}
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorEvaluate, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ this.editLoad = true
+ addQualityMonitorEvaluate(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeEvaDia()
}).catch(err => {
@@ -301,20 +296,19 @@
})
},
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getUserMenu).then(res => {
- let data = []
- res.data.forEach(a => {
+ selectUserCondition({ type: 1 }).then((res) => {
+ let data = [];
+ res.data.forEach((a) => {
data.push({
label: a.name,
- value: a.id
- })
- })
- this.personList = data
- })
+ value: a.id,
+ });
+ });
+ this.personList = data;
+ });
},
getDepartment() {
- this.$axios.get(this.$api.user.selectUserDepartmentLimsName).then(res => {
- if (res.code === 201) return
+ selectUserDepartmentLimsName().then(res => {
this.form.implementDepartment = res.data
})
},
--
Gitblit v1.9.3