From b32ec53311698aa550848b54cd6ef619471ed39c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 05 三月 2025 09:49:37 +0800
Subject: [PATCH] 外来文件记录bug修改
---
src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue | 125 ++++++-----------
src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue | 2
src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue | 101 ++++++--------
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 104 --------------
src/api/cnas/process/ensureResults/qualityControlPlan.js | 27 +++
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 2
6 files changed, 117 insertions(+), 244 deletions(-)
diff --git a/src/api/cnas/process/ensureResults/qualityControlPlan.js b/src/api/cnas/process/ensureResults/qualityControlPlan.js
index 12a58f7..928b55d 100644
--- a/src/api/cnas/process/ensureResults/qualityControlPlan.js
+++ b/src/api/cnas/process/ensureResults/qualityControlPlan.js
@@ -121,3 +121,30 @@
data: data,
});
}
+
+//鏌ヨ鐩戠潱璁″垝璁板綍娴佺▼璇︽儏
+export function getSuperviseDetailRecord(query) {
+ return request({
+ url: "/qualitySupervise/getSuperviseDetailRecord",
+ method: "get",
+ params: query,
+ });
+}
+
+// 鏂板鐩戠潱璁板綍淇℃伅
+export function addSuperviseDetailRecord(data) {
+ return request({
+ url: "/qualitySupervise/addSuperviseDetailRecord",
+ method: "post",
+ data: data,
+ });
+}
+
+// 鎻愪氦鐩戠潱璁板綍鎵瑰噯
+export function addSuperviseRecordOpinion(data) {
+ return request({
+ url: "/qualitySupervise/addSuperviseRecordOpinion",
+ method: "post",
+ data: data,
+ });
+}
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
index cacf12c..bf7c63f 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
@@ -442,7 +442,7 @@
})
},
getSupervisedUserList() {
- this.$axios.get(this.$api.user.selectDepartmentLimsUserList).then(res => {
+ selectUserCondition().then(res => {
let data = []
res.data.forEach(a => {
data.push({
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
index e1a814b..d66ced2 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
@@ -1,9 +1,7 @@
<template>
<div>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
- :visible.sync="formDia"
- title="妫�娴嬪伐浣滅洃鐫h褰曡〃"
- width="70%" @close="closeRecordsDia">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="formDia" title="妫�娴嬪伐浣滅洃鐫h褰曡〃"
+ width="70%" @close="closeRecordsDia">
<el-steps :active="currentStep" align-center finish-status="success">
<el-step title="瀹炴柦"></el-step>
<el-step title="鎵瑰噯"></el-step>
@@ -15,9 +13,7 @@
<p><span class="required-span">* </span>妫�娴嬩汉鍛橈細</p>
</td>
<td colspan="2">
- <el-input v-if="currentStep === 0" v-model="form.testMember"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.testMember" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.testMember }}</span>
</td>
@@ -25,9 +21,7 @@
<p><span class="required-span">* </span>鐩戠潱鍛橈細</p>
</td>
<td colspan="2">
- <el-input v-if="currentStep === 0" v-model="form.supervisor"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.supervisor" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.supervisor }}</span>
</td>
@@ -37,9 +31,7 @@
<p><span class="required-span">* </span>妫�娴嬮」鐩細</p>
</td>
<td>
- <el-input v-if="currentStep === 0" v-model="form.testItem"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.testItem" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.testItem }}</span>
</td>
@@ -47,9 +39,7 @@
<p><span class="required-span">* </span>鏍峰搧缂栧彿锛�</p>
</td>
<td>
- <el-input v-if="currentStep === 0" v-model="form.sampleNumber"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.sampleNumber" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.sampleNumber }}</span>
</td>
@@ -57,9 +47,7 @@
<p><span class="required-span">* </span>妫�娴嬫棩鏈燂細</p>
</td>
<td>
- <el-input v-if="currentStep === 0" v-model="form.testDate"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.testDate" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.testDate }}</span>
</td>
@@ -69,9 +57,7 @@
<p><span class="required-span">* </span>浜哄憳锛�</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.personnel"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.personnel" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.personnel }}</span>
</td>
@@ -81,9 +67,7 @@
<p><span class="required-span">* </span>浠櫒璁惧锛�</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.device"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.device" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.device }}</span>
</td>
@@ -93,9 +77,7 @@
<p><span class="required-span">* </span>宸ヤ綔鐜锛�</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.environment"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.environment" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.environment }}</span>
</td>
@@ -105,9 +87,7 @@
<p><span class="required-span">* </span>鏍峰搧閲囬泦锛�</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.sampleCollection"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.sampleCollection" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.sampleCollection }}</span>
</td>
@@ -117,9 +97,7 @@
<p><span class="required-span">* </span>鏍峰搧鐨勫噯澶囷細</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.samplePreparation"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.samplePreparation" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.samplePreparation }}</span>
</td>
@@ -129,9 +107,7 @@
<p><span class="required-span">* </span>妫�娴嬫柟娉曪細</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.detectionMethod"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.detectionMethod" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.detectionMethod }}</span>
</td>
@@ -141,9 +117,7 @@
<p><span class="required-span">* </span>妫�娴嬭褰曪細</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.inspectionRecord"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.inspectionRecord" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.inspectionRecord }}</span>
</td>
@@ -153,9 +127,7 @@
<p><span class="required-span">* </span>妫�娴嬫姤鍛婏細</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.examiningReport"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small">
+ <el-input v-if="currentStep === 0" v-model="form.examiningReport" placeholder="璇疯緭鍏ュ唴瀹�" size="small">
</el-input>
<span v-else class="td-info"> {{ form.examiningReport }}</span>
</td>
@@ -165,11 +137,8 @@
<p><span class="required-span">* </span>鐩戠潱鎯呭喌璇勪环锛�</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.supervisionEvaluation"
- :rows="4"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="currentStep === 0" v-model="form.supervisionEvaluation" :rows="4" placeholder="璇疯緭鍏ュ唴瀹�"
+ size="small" type="textarea">
</el-input>
<span v-else class="td-info"> {{ form.supervisionEvaluation }}</span>
</td>
@@ -179,11 +148,8 @@
<p><span class="required-span">* </span>涓嶇鍚堝鐞嗘剰瑙侊細</p>
</td>
<td colspan="5">
- <el-input v-if="currentStep === 0" v-model="form.handlingAdvice"
- :rows="4"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="currentStep === 0" v-model="form.handlingAdvice" :rows="4" placeholder="璇疯緭鍏ュ唴瀹�"
+ size="small" type="textarea">
</el-input>
<span v-else class="td-info"> {{ form.handlingAdvice }}</span>
</td>
@@ -193,9 +159,8 @@
<p><span class="required-span">* </span>璇烽�夋嫨涓嬩竴姝ユ壒鍑嗕汉锛�</p>
</td>
<td v-if="currentStep === 0" colspan="5">
- <el-select v-model="form.ratifyUserId" clearable filterable
- placeholder="璇烽�夋嫨" size="small">
- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
+ <el-select v-model="form.ratifyUserId" 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>
@@ -203,7 +168,7 @@
<p>鎵瑰噯璐熻矗浜猴細</p>
</td>
<td v-if="currentStep === 1" class="td-info" colspan="5">
- {{form.ratifyUserName}}
+ {{ form.ratifyUserName }}
</td>
</tr>
<tr v-if="currentStep === 1 || currentStep === 2">
@@ -211,12 +176,8 @@
<p><span class="required-span">* </span>瀹℃壒缁撹锛�</p>
</td>
<td colspan="2">
- <el-input v-if="currentStep === 1"
- v-model="form.ratifyOpinion"
- :rows="4"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="currentStep === 1" v-model="form.ratifyOpinion" :rows="4" placeholder="璇疯緭鍏ュ唴瀹�" size="small"
+ type="textarea">
</el-input>
<span v-if="currentStep === 2" class="td-info"> {{ form.ratifyOpinion }}</span>
</td>
@@ -243,6 +204,12 @@
</template>
<script>
+import {
+ getSuperviseDetailRecord,
+ addSuperviseDetailRecord,
+ addSuperviseRecordOpinion,
+} from '@/api/cnas/process/ensureResults/qualityControlPlan.js'
+import { selectUserCondition } from "@/api/system/user";
export default {
name: 'recordsDialog',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -287,8 +254,8 @@
this.getAuthorizedPerson()
},
// 鏌ヨ鐩戠潱璁″垝璇︽儏璁板綍娴佺▼淇℃伅
- searchInfo (row) {
- this.$axios.get(this.$api.qualitySupervise.getSuperviseDetailRecord + '?superviseDetailsId=' + row.superviseDetailsId).then(res => {
+ searchInfo(row) {
+ getSuperviseDetailRecord({ superviseDetailsId: row.superviseDetailsId }).then(res => {
if (res.code === 201) return
// 鏈塻uperviseDetailsRecordId璇存槑鎻愪氦杩囪褰�
if (res.data.superviseDetailsRecordId) {
@@ -308,7 +275,7 @@
})
},
// 鎻愪氦娴佺▼
- handleEdit () {
+ handleEdit() {
if (!this.form.testMember || !this.form.supervisor || !this.form.testItem || !this.form.sampleNumber
|| !this.form.testDate) {
this.$message.warning('璇峰~鍐欏畬鏁�')
@@ -321,18 +288,13 @@
}
},
// 鎻愪氦璁板綍
- addInfo () {
+ addInfo() {
if (!this.form.ratifyUserId) {
this.$message.warning('璇烽�夋嫨涓嬩竴姝ユ壒鍑嗕汉')
return
}
this.editLoad = true
- this.$axios.post(this.$api.qualitySupervise.addSuperviseDetailRecord, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addSuperviseDetailRecord(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
@@ -343,7 +305,7 @@
})
},
// 鎻愪氦鎵瑰噯
- editInfo () {
+ editInfo() {
if (!this.form.ratifyOpinion) {
this.$message.warning('璇峰~鍐欏鎵规剰瑙�')
return
@@ -354,12 +316,7 @@
return
}
this.editLoad = true
- this.$axios.post(this.$api.qualitySupervise.addSuperviseRecordOpinion, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addSuperviseRecordOpinion(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
@@ -370,12 +327,12 @@
})
},
// 鍏抽棴寮规
- closeRecordsDia () {
+ closeRecordsDia() {
this.formDia = false
this.$emit('closeRecordsDia')
},
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getUserMenu).then(res => {
+ selectUserCondition().then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -394,11 +351,13 @@
>>>.el-dialog {
margin: 20px auto 50px !important;
}
+
.tables {
table-layout: fixed;
width: 100%;
margin-top: 10px;
}
+
.td-title {
height: 40px;
text-align: center;
@@ -407,12 +366,14 @@
white-space: normal;
padding: 6px;
}
+
.td-info {
text-align: center;
font-size: 14px;
word-wrap: break-word;
white-space: normal;
}
+
.tables td {
height: 40px;
font-size: 14px;
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue
index dd02732..95f31d7 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue
@@ -1,9 +1,7 @@
<template>
<div>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
- :visible.sync="formDia"
- title="绾犳鎺柦澶勭悊鍗�"
- width="60%" @close="closeRectifyDia">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="formDia" title="绾犳鎺柦澶勭悊鍗�"
+ width="60%" @close="closeRectifyDia">
<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>
@@ -17,11 +15,8 @@
<p><span class="required-span">* </span>涓嶅悎鏍兼垨鍋忕浜嬪疄鐨勬弿杩帮細</p>
</td>
<td class="td-info" colspan="3">
- <el-input v-if="showStep === 0 && currentStep === 0" v-model="form.raiseResult"
- :rows="4"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="showStep === 0 && currentStep === 0" v-model="form.raiseResult" :rows="4"
+ placeholder="璇疯緭鍏ュ唴瀹�" size="small" type="textarea">
</el-input>
<span v-if="showStep === 0 && currentStep !== 0" class="td-info1"> {{ form.raiseResult }}</span>
</td>
@@ -31,9 +26,8 @@
<p><span class="required-span">* </span>璇烽�夋嫨涓嬩竴姝ヨ礋璐d汉锛�</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-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>
@@ -43,13 +37,13 @@
<p>鎻愬嚭浜猴細</p>
</td>
<td class="td-info">
- {{form.raiseUserName}}
+ {{ form.raiseUserName }}
</td>
<td class="td-title">
<p>鎻愬嚭閮ㄩ棬锛�</p>
</td>
<td class="td-info">
- {{form.raiseDepartment}}
+ {{ form.raiseDepartment }}
</td>
</tr>
<tr v-if="showStep === 0 && currentStep !== 0">
@@ -57,7 +51,7 @@
<p>鏃ユ湡锛�</p>
</td>
<td class="td-info" colspan="3">
- {{form.raiseTime}}
+ {{ form.raiseTime }}
</td>
</tr>
<tr v-if="showStep === 1">
@@ -65,11 +59,8 @@
<p><span class="required-span">* </span>鍘熷洜鍒嗘瀽锛�</p>
</td>
<td class="td-info" colspan="3">
- <el-input v-if="showStep === 1 && currentStep === 1" v-model="form.causeResult"
- :rows="5"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="showStep === 1 && currentStep === 1" v-model="form.causeResult" :rows="5"
+ placeholder="璇疯緭鍏ュ唴瀹�" size="small" type="textarea">
</el-input>
<span v-if="showStep === 1 && currentStep !== 1" class="td-info1"> {{ form.causeResult }}</span>
</td>
@@ -79,13 +70,13 @@
<p>鍘熷洜鍒嗘瀽浜猴細</p>
</td>
<td class="td-info">
- {{form.causeUserName}}
+ {{ form.causeUserName }}
</td>
<td class="td-title">
<p>璐d换閮ㄩ棬锛�</p>
</td>
<td class="td-info">
- {{form.causeDepartment}}
+ {{ form.causeDepartment }}
</td>
</tr>
<tr v-if="showStep === 1 && currentStep !== 1">
@@ -93,7 +84,7 @@
<p>鍘熷洜鍒嗘瀽鏃ユ湡锛�</p>
</td>
<td class="td-info" colspan="3">
- {{form.causeTime}}
+ {{ form.causeTime }}
</td>
</tr>
<tr v-if="showStep === 1">
@@ -101,9 +92,8 @@
<p><span class="required-span">* </span>璇烽�夋嫨涓嬩竴姝ヨ礋璐d汉锛�</p>
</td>
<td v-if="currentStep === 1" 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-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>
@@ -113,11 +103,8 @@
<p><span class="required-span">* </span>绾犳鎺柦锛�</p>
</td>
<td class="td-info" colspan="3">
- <el-input v-if="showStep === 2 && currentStep === 2" v-model="form.correctResult"
- :rows="5"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="showStep === 2 && currentStep === 2" v-model="form.correctResult" :rows="5"
+ placeholder="璇疯緭鍏ュ唴瀹�" size="small" type="textarea">
</el-input>
<span v-if="showStep === 2 && currentStep !== 2" class="td-info1"> {{ form.correctResult }}</span>
</td>
@@ -127,11 +114,8 @@
<p>鎻愬嚭瑕佹眰閮ㄩ棬纭锛�</p>
</td>
<td class="td-info" colspan="3">
- <el-input v-if="showStep === 2 && currentStep === 2" v-model="form.raiseDepartmentAffirm"
- :rows="5"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="showStep === 2 && currentStep === 2" v-model="form.raiseDepartmentAffirm" :rows="5"
+ placeholder="璇疯緭鍏ュ唴瀹�" size="small" type="textarea">
</el-input>
<span v-if="showStep === 2 && currentStep !== 2" class="td-info1"> {{ form.raiseDepartmentAffirm }}</span>
</td>
@@ -141,13 +125,13 @@
<p>绾犳浜猴細</p>
</td>
<td class="td-info">
- {{form.correctUserName}}
+ {{ form.correctUserName }}
</td>
<td class="td-title">
<p>璐d换閮ㄩ棬锛�</p>
</td>
<td class="td-info">
- {{form.correctDepartment}}
+ {{ form.correctDepartment }}
</td>
</tr>
<tr v-if="showStep === 2 && currentStep !== 2">
@@ -155,7 +139,7 @@
<p>绾犳鏃ユ湡锛�</p>
</td>
<td class="td-info" colspan="3">
- {{form.correctTime}}
+ {{ form.correctTime }}
</td>
</tr>
<tr v-if="showStep === 2">
@@ -163,9 +147,8 @@
<p><span class="required-span">* </span>璇烽�夋嫨涓嬩竴姝ヨ礋璐d汉锛�</p>
</td>
<td v-if="currentStep === 2" class="td-info" colspan="3">
- <el-select v-model="form.validationUserId" clearable filterable
- placeholder="璇烽�夋嫨" size="small">
- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
+ <el-select v-model="form.validationUserId" 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>
@@ -175,11 +158,8 @@
<p><span class="required-span">* </span>瀹炴柦楠岃瘉缁撴灉锛�</p>
</td>
<td class="td-info" colspan="3">
- <el-input v-if="showStep === 3 && currentStep === 3" v-model="form.validationResult"
- :rows="5"
- placeholder="璇疯緭鍏ュ唴瀹�"
- size="small"
- type="textarea">
+ <el-input v-if="showStep === 3 && currentStep === 3" v-model="form.validationResult" :rows="5"
+ placeholder="璇疯緭鍏ュ唴瀹�" size="small" type="textarea">
</el-input>
<span v-if="showStep === 3 && currentStep !== 3" class="td-info1"> {{ form.validationResult }}</span>
</td>
@@ -189,13 +169,13 @@
<p>楠岃瘉浜猴細</p>
</td>
<td class="td-info">
- {{form.validationUserName}}
+ {{ form.validationUserName }}
</td>
<td class="td-title">
<p>璐d换閮ㄩ棬锛�</p>
</td>
<td class="td-info">
- {{form.validationDepartment}}
+ {{ form.validationDepartment }}
</td>
</tr>
<tr v-if="showStep === 3 && currentStep !== 3">
@@ -203,7 +183,7 @@
<p>楠岃瘉鏃ユ湡锛�</p>
</td>
<td class="td-info" colspan="3">
- {{form.validationTime}}
+ {{ form.validationTime }}
</td>
</tr>
</table>
@@ -217,6 +197,11 @@
</template>
<script>
+import {
+ getSuperviseDetailRecord,
+ addSuperviseDetailRecord,
+ addSuperviseRecordOpinion,
+} from '@/api/cnas/process/ensureResults/qualityControlPlan.js'
export default {
name: 'rectifyDialog',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -258,7 +243,7 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia (row) {
+ openDia(row) {
this.formDia = true
this.searchInfo(row)
this.form.superviseDetailsId = row.superviseDetailsId
@@ -266,7 +251,7 @@
this.getSupervisedUserList() // 鑾峰彇褰撳墠閮ㄩ棬浜哄憳
},
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
- searchInfo (row) {
+ searchInfo(row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
this.$axios.get(this.$api.qualitySupervise.getSuperviseDetailCorrect + '?superviseDetailsId=' + row.superviseDetailsId).then(res => {
if (res.code === 201) return
@@ -298,7 +283,7 @@
})
},
// 鎻愪氦
- handleEdit () {
+ handleEdit() {
if (this.currentStep === 0) {
if (!this.form.raiseResult) {
this.$message.warning('璇峰~鍐欎笉鍚堟牸鎻忚堪')
@@ -354,11 +339,11 @@
})
},
// 鍏抽棴寮规
- closeRectifyDia () {
+ closeRectifyDia() {
this.formDia = false
this.$emit('closeRectifyDia')
},
- setStep (step) {
+ setStep(step) {
this.showStep = step
},
getAuthorizedPerson() {
@@ -373,7 +358,7 @@
this.personList = data
})
},
- getSupervisedUserList () {
+ getSupervisedUserList() {
this.$axios.get(this.$api.user.selectDepartmentLimsUserList).then(res => {
let data = []
res.data.forEach(a => {
@@ -393,11 +378,13 @@
>>>.el-dialog {
margin: 10vh auto 50px !important;
}
+
.tables {
table-layout: fixed;
width: 100%;
margin-top: 10px;
}
+
.td-title {
height: 40px;
width: 170px;
@@ -407,9 +394,11 @@
white-space: normal;
padding: 6px;
}
+
.td-info {
padding: 6px;
}
+
.td-info1 {
display: inline-block;
width: 100%;
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index f323f0d..4ddaefb 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -169,7 +169,7 @@
{
name: "鎵瑰噯",
type: "text",
- clickFun: (handleApproval) => {
+ clickFun: (row) => {
this.handleSubmit(row);
},
disabled: (row) => {
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 9bb9cdb..7a8b2df 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -159,110 +159,6 @@
lookDialogVisible: false,
noCheckLoading: false,
checkLoading: false,
- componentData: {
- entity: {
- documentName: null,
- documentCode: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- // selectMethod: 'handleChangeTask',
- do: [{
- id: 'handleEdit',
- font: '淇敼',
- type: 'text',
- method: 'handleEdit',
- field: [],
- }, {
- id: 'delete',
- font: '鍒犻櫎',
- type: 'text',
- method: 'doDiy',
- }],
- tagField: {
- // documentType:{
- // select: []
- // },
- // receiveUserName:{
- // select: []
- // },
- },
- selectField: {
- // documentType:{
- // select: []
- // },
- // receiveUserName:{
- // select: []
- // },
- },
- addUpload: ['signatoryUrl'],
- requiredAdd: [],
- requiredUp: [],
- datePicker: ['receiveDate'],
- noHead: ['signedUserName', 'signedDate', 'departLims'],//涓嶅弬涓庢柊澧炵紪杈戠殑瀛楁
- needSort: [],
- inputType: ''
- },
- componentData0: {
- entity: {
- year: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [{
- id: 'handleLook',
- font: '鏌ョ湅',
- type: 'text',
- method: 'handleLook',
- disabled: (row, index) => {
- return !row.url
- }
- }, {
- id: 'handleDown0',
- font: '涓嬭浇',
- type: 'text',
- method: 'handleDown0',
- disabled: (row, index) => {
- return !row.url
- }
- },
- {
- id: 'handleSubmit',
- font: '鎻愪氦',
- type: 'text',
- method: 'handleSubmit',
- disabled: (row, index) => {
- return !!row.submitUserName
- }
- }, {
- id: 'handleApproval',
- font: '鎵瑰噯',
- type: 'text',
- method: 'handleApproval',
- disabled: (row, index) => {
- return !row.submitUserName || !!row.ratifyUserName
- }
- }],
- tagField: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- needSort: [],
- inputType: ''
- },
- entityCopy: {},
- entityCopy0: {},
- upIndex: 0,
addInfo: {},
title: '鏂板',
addInfo: {},
--
Gitblit v1.9.3