From e6fc429bc28eea2ff4d5f79942159e71bb352192 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 15 八月 2025 17:34:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/doctor/check/index.vue | 95 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 75 insertions(+), 20 deletions(-)
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index a35f190..25d2aee 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -682,7 +682,7 @@
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
- <el-button @click="taocan = false">鍙� 娑�</el-button>
+ <el-button @click="quzxiao">鍙� 娑�</el-button>
<el-button type="primary" @click="queding">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -976,6 +976,18 @@
});
}
});
+ }else {
+ if (this.focusrow.proResult != this.focusrow.project.proDefault) {
+ const substrings = ["姝ｅ父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"];
+ let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
+ if (containsAllSubstrings) {
+ this.focusrow.exceptionDesc = false;
+ } else {
+ this.focusrow.exceptionDesc = true;
+ }
+ } else {
+ this.focusrow.exceptionDesc = false;
+ }
}
},
@@ -1081,6 +1093,18 @@
});
}
});
+ }else {
+ if (this.focusrow.proResult != this.focusrow.project.proDefault) {
+ const substrings = ["姝ｅ父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"];
+ let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
+ if (containsAllSubstrings) {
+ this.focusrow.exceptionDesc = false;
+ } else {
+ this.focusrow.exceptionDesc = true;
+ }
+ } else {
+ this.focusrow.exceptionDesc = false;
+ }
}
this.rows.push(row);
},
@@ -1330,30 +1354,51 @@
bzxz() {
this.taocan = true;
- var deptAdviceList1 =[]
- let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
- getAdviceByTjNumAndPro(data).then((res) => {
- if (res.data) {
- this.deptAdviceList3 = res.data;
+ var deptAdviceList1 = []
+ // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
+ // getAdviceByTjNumAndPro(data).then((res) => {
+ // if (res.data) {
+ // this.deptAdviceList3 = res.data;
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ if (this.vaids.length != 0) {
+ const result = this.vaids.reduce((acc, item) => {
+ const matches = this.deptAdviceList.filter(items => {
+ return item == items.id; // 鎴� === 鏍规嵁闇�姹�
+ });
+ return acc.concat(matches);
+ }, []);
+ deptAdviceList1 = result;
+
+ return this.deptAdviceList1 = [
+ ...new Set(deptAdviceList1),
+ ];
+ } else {
this.proParentList.xiaoJieIds.forEach(item => {
- this.deptAdviceList3.forEach((items) => {
+ this.deptAdviceList.forEach((items) => {
if (item == items.id) {
deptAdviceList1.push(items)
}
});
})
- this.deptAdviceList1 = [
+ return this.deptAdviceList1 = [
...new Set(deptAdviceList1),
];
- // this.deptAdviceList1 = [
- // ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
- // ];
- // this.deptAdviceList3.forEach((items) => {
- // this.idss.push(items.id);
- // this.remakes += items.advice + ",";
- // });
}
- });
+
+
+ } else if (this.proParentList.xiaoJieIds == null) {
+ this.deptAdviceList1 = []
+ }
+
+ // this.deptAdviceList1 = [
+ // ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
+ // ];
+ // this.deptAdviceList3.forEach((items) => {
+ // this.idss.push(items.id);
+ // this.remakes += items.advice + ",";
+ // });
+ // }
+ // });
},
result() {
@@ -1412,8 +1457,8 @@
// ...new Set(this.deptAdviceList2),
// ];
this.deptAdviceList1 = [...new Set(
- this.deptAdviceList2.map(item => JSON.stringify(item))
-)].map(str => JSON.parse(str));
+ this.deptAdviceList2.map(item => JSON.stringify(item))
+ )].map(str => JSON.parse(str));
// if( this.deptAdviceList1.length == 0){
// this.deptAdviceList1 = selection
// }else{
@@ -1421,7 +1466,10 @@
// }
},
-
+ quzxiao() {
+ this.taocan = false;
+ this.deptAdviceList1 = []
+ },
queding() {
if (this.proParentList.xiaoJie.length != 0) {
this.remakes = "";
@@ -1601,7 +1649,14 @@
eventchange(data) {
this.dataText = data;
- data.forEach((item) => (this.proParentList.remark += item.advice));
+ //data.forEach((item) => (this.proParentList.remark += item.advice));
+ data.forEach((item) => {
+ if (item.advice) {
+ this.proParentList.remark += item.advice
+ } else if (item.jynr) {
+ this.proParentList.remark += item.jynr
+ }
+ })
},
proposalChange() {
--
Gitblit v1.8.0