From 41490d6a55c4d9d33cbbedaad5d3c0ee07eb0c0a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 11:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue b/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue
index 22a138b..205ec80 100644
--- a/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue
@@ -8,7 +8,7 @@
<el-step title="瀹炴柦"></el-step>
<el-step title="鎵瑰噯"></el-step>
</el-steps>
- <div style="height: 620px;overflow-y: auto">
+ <div style="height: 520px;overflow-y: auto">
<table border="1" cellspacing="10" class="tables">
<tr>
<td class="td-title">
@@ -181,6 +181,12 @@
<script>
+import {
+ addQualityMonitorRatify, addQualityMonitorRatifyOpinion,
+ getQualityMonitorRatify
+} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
+import {selectUserCondition} from "@/api/business/inspectionTask";
+
export default {
name: 'carryOutDialog',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -219,8 +225,7 @@
},
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
searchInfo (row) {
- this.$axios.get(this.$api.qualityMonitor.getQualityMonitorRatify + '?qualityMonitorDetailsId=' + row.qualityMonitorDetailsId).then(res => {
- if (res.code === 201) return
+ getQualityMonitorRatify({qualityMonitorDetailsId: row.qualityMonitorDetailsId}).then(res => {
// 鏈塪etailsRatifyId鍒欒鏄庢彁浜よ繃瀹炴柦淇℃伅
if (res.data.detailsRatifyId) {
// 鏄惁缁撴潫0:鏈粨鏉�, 1:宸茬粨鏉�
@@ -252,12 +257,7 @@
},
// 鎻愪氦瀹炴柦
addInfo () {
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorRatify, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addQualityMonitorRatify(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
@@ -269,12 +269,7 @@
},
// 鎻愪氦鎵瑰噯
editInfo () {
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorRatifyOpinion, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addQualityMonitorRatifyOpinion(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
@@ -290,25 +285,22 @@
this.$emit('closeCarryOutDia')
},
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;
+ });
},
}
};
</script>
<style scoped>
->>>.el-dialog {
- margin: 20px auto 50px !important;
-}
.tables {
table-layout: fixed;
width: 100%;
--
Gitblit v1.9.3