From cc8da3c68c347ac93459bc9f3547356c84fe61f6 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 19 三月 2025 11:02:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 895265f..36da145 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -136,7 +136,7 @@
import { mapGetters } from "vuex";
export default {
- name: 'a7-quality-control-plan',
+ name: 'QualityControlPlan',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, RectifyDialogNew, ProcessingSheet, RecordsDialog, DetailFormDialog },
data() {
@@ -200,7 +200,6 @@
minWidth: '160'
}, {
dataType: 'action',
- minWidth: '170',
label: '鎿嶄綔',
fixed: 'right',
operation: [
@@ -284,7 +283,6 @@
minWidth: '150px'
}, {
dataType: 'action',
- width: '260',
label: '鎿嶄綔',
fixed: 'right',
operation: [
@@ -473,7 +471,7 @@
this.getUserList()
},
getUserList() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 2 }).then((res) => {
this.userList = res.data;
})
},
@@ -571,7 +569,7 @@
showDialog(type, row) {
this.formDia = true
this.$nextTick(() => {
- this.$refs.formDia.openDia(type, row)
+ this.$refs.formDia.openDia(type, row, this.yearDetailForm.causeType)
})
},
closeDia() {
--
Gitblit v1.9.3