From a3553516bd728e2446925815b4dd72af7c80caf0 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 05 三月 2025 09:56:51 +0800
Subject: [PATCH] 外来文件批准bug
---
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 4 ++--
src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue | 19 +++++++------------
src/api/cnas/process/ensureResults/qualityControlPlan.js | 18 ++++++++++++++++++
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 2 +-
4 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/api/cnas/process/ensureResults/qualityControlPlan.js b/src/api/cnas/process/ensureResults/qualityControlPlan.js
index 928b55d..c232aa0 100644
--- a/src/api/cnas/process/ensureResults/qualityControlPlan.js
+++ b/src/api/cnas/process/ensureResults/qualityControlPlan.js
@@ -148,3 +148,21 @@
data: data,
});
}
+
+//鏌ヨ鐩戠潱绾犳澶勭悊
+export function getSuperviseDetailCorrect(query) {
+ return request({
+ url: "/qualitySupervise/getSuperviseDetailCorrect",
+ method: "get",
+ params: query,
+ });
+}
+
+// 鏂板鐩戠潱绾犳澶勭悊
+export function addSuperviseDetailCorrect(data) {
+ return request({
+ url: "/qualitySupervise/addSuperviseDetailCorrect",
+ method: "post",
+ data: data,
+ });
+}
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue
index 95f31d7..fd16847 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialog.vue
@@ -198,10 +198,10 @@
<script>
import {
- getSuperviseDetailRecord,
- addSuperviseDetailRecord,
- addSuperviseRecordOpinion,
+ getSuperviseDetailCorrect,
+ addSuperviseDetailCorrect,
} from '@/api/cnas/process/ensureResults/qualityControlPlan.js'
+import { selectUserCondition } from "@/api/system/user";
export default {
name: 'rectifyDialog',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -253,7 +253,7 @@
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
searchInfo(row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
- this.$axios.get(this.$api.qualitySupervise.getSuperviseDetailCorrect + '?superviseDetailsId=' + row.superviseDetailsId).then(res => {
+ getSuperviseDetailCorrect({ superviseDetailsId: row.superviseDetailsId }).then(res => {
if (res.code === 201) return
if (res.data.superviseDetailsCorrectId === null) {
this.showStep = 0
@@ -323,12 +323,7 @@
delete this.form.recordTime
delete this.form.actionsTime
delete this.form.correctTime
- this.$axios.post(this.$api.qualitySupervise.addSuperviseDetailCorrect, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addSuperviseDetailCorrect(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎻愪氦鎴愬姛')
@@ -347,7 +342,7 @@
this.showStep = step
},
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getUserMenu).then(res => {
+ selectUserCondition().then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -359,7 +354,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/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index e4b9fd5..32f288d 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -2,7 +2,7 @@
<!-- 7.7璐ㄩ噺鐩戠潱璁″垝-->
<div>
<div class="table-card">
- <TableCard title="骞村害璁″垝琛�">
+ <TableCard title="骞村害璁″垝琛�" style="margin-top: 10px;">
<template v-slot:form>
<div class="items_center">
<span>璁″垝鍚嶇О锛�</span>
@@ -27,7 +27,7 @@
</TableCard>
</div>
<div class="table-card">
- <TableCard title="骞村害璁″垝鏄庣粏琛�">
+ <TableCard title="骞村害璁″垝鏄庣粏琛�" style="margin-top: 10px;">
<template v-slot:form>
<div class="items_center">
<span>鐩戠潱鐩殑锛�</span>
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index 4ddaefb..a45bf2e 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -170,7 +170,7 @@
name: "鎵瑰噯",
type: "text",
clickFun: (row) => {
- this.handleSubmit(row);
+ this.handleApproval(row);
},
disabled: (row) => {
return !row.submitUserName || !!row.ratifyUserName
--
Gitblit v1.9.3