From a95990a4d6022e2d854a33fbc4c3396409854e08 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 15 八月 2025 17:33:50 +0800
Subject: [PATCH] qx

---
 src/views/doctor/check/index.vue |  105 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 0f9fc61..25d2aee 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -976,6 +976,18 @@
             });
           }
         });
+      }else {
+        if (this.focusrow.proResult != this.focusrow.project.proDefault) {
+          const substrings = ["姝e父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"];
+          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 = ["姝e父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"];
+          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);
     },
@@ -1333,46 +1357,46 @@
       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;
+      // 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.deptAdviceList.forEach((items) => {
-                  if (item == items.id) {
-                    deptAdviceList1.push(items)
-                  }
-                });
-              })
-              return this.deptAdviceList1 = [
-                ...new Set(deptAdviceList1),
-              ];
-            }
+          return this.deptAdviceList1 = [
+            ...new Set(deptAdviceList1),
+          ];
+        } else {
+          this.proParentList.xiaoJieIds.forEach(item => {
+            this.deptAdviceList.forEach((items) => {
+              if (item == items.id) {
+                deptAdviceList1.push(items)
+              }
+            });
+          })
+          return this.deptAdviceList1 = [
+            ...new Set(deptAdviceList1),
+          ];
+        }
 
 
-          } else if (this.proParentList.xiaoJieIds == null) {
-            this.deptAdviceList1 = []
-          }
+      } 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 + ",";
-          // });
+      // this.deptAdviceList1 = [
+      //   ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
+      // ];
+      // this.deptAdviceList3.forEach((items) => {
+      //   this.idss.push(items.id);
+      //   this.remakes += items.advice + ",";
+      // });
       //   }
       // });
     },
@@ -1625,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