From 79a9d8883cb6272bf04674fe2c5db2dcb29f2d0f Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期一, 24 六月 2024 16:44:24 +0800
Subject: [PATCH] su

---
 src/views/system/tijian/index.vue |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index c56e90d..28416de 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -645,7 +645,7 @@
                       </template>
                     </el-table-column>
                   </el-table>
-                  <div>鍚堣锛歿{ marryall }}鍏�</div>
+                  <h3 style="font-weight: bold;">鍚堣锛歿{ marryall }}鍏�</h3>
                   <!-- <el-collapse v-model="activeName" accordion v-if="list1">
                     <div>
                       <el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -1319,6 +1319,7 @@
       table: false,
       HistoryList: {},
       index: 0,
+      names:"",
       dictType: [
         {
           value: 0,
@@ -1348,7 +1349,7 @@
       hospName: "",
       currentDate: "",
       currentTime: "",
-      tjCategory: "",
+      tjCategory: "12",
       formIn: {
         tjPro: "浣撴璐�",
       },
@@ -1555,7 +1556,11 @@
     },
     filterNode(value, data) {
       if (!value) return true;
-      return data.proName.indexOf(value) !== -1;
+      if(value == data.proName){
+        return data.proName.indexOf(value) !== -1;
+      }else{
+        return data.proEngName.indexOf(value) !== -1;
+      }
     },
     beforeDestroy() {
       clearInterval(this.timer);
@@ -2030,7 +2035,6 @@
                   if (this.tableData1) {
                     this.tableData1.forEach((item) => {
                       this.TotalPrice1 += item.ysPrice;
-                      console.log(this.TotalPrice1);
                       this.TotalPrice = (
                         this.TotalPrice1 *
                         (this.discount / 10)
@@ -2339,6 +2343,7 @@
       let _this = this;
       _this.pacId = "";
       this.proIds = [];
+      this.tjCategory ="12"
       let data = {
         cusId,
         pacId: _this.pacId,
@@ -2441,7 +2446,6 @@
       }
     },
     handleClick(tab, event) {
-      console.log(tab, event);
       if (tab.label == "鍗曢」") {
         this.DataList = [];
         this.getDataList();
@@ -2460,15 +2464,20 @@
             });
           });
         }
-        this.checkedkey.push(this.Treedata[0].proId);
-        let proId = this.Treedata[0].proId;
+        this.checkedkey.push("1735504273274236929");
+        let proId = "1735504273274236929";
+        this.Treedata.forEach(item =>{
+          if(proId == item.proId){
+            this.names = item.proName
+          }
+        })
         getProSonDxList(proId).then((res) => {
           this.TreedataList = res.data.list;
           this.TreedataList.forEach((item) => {
             this.checkedListkey.push(item.proId);
             this.DataList.push(item);
             this.DataList.forEach((item) => {
-              item.propinName = this.Treedata[0].proName;
+                item.propinName = this.names; 
             });
           });
           this.TotalPrice1 = 0;
@@ -2584,7 +2593,6 @@
     },
     //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      console.log(row, column, rowIndex, columnIndex);
       let fields = ["propinName"];
       let cellValue = row[column.property];
       if (cellValue && fields.includes(column.property)) {
@@ -2632,7 +2640,7 @@
         proIds: this.proIds,
       };
       getaddtTransition(data).then((response) => {
-        if (response.code === 200) {
+        if(response.code==200 ){
           let cusId = this.form.cusIdcard;
           this.proIds = [];
           getTransitionList(cusId).then((response) => {
@@ -2641,8 +2649,8 @@
             if (this.tableData1) {
               this.tableData1.forEach((item) => {
                 this.TotalPrice1 += item.nowPrice;
-                if (item.pacName === null) {
-                  item.pacName = "鍗曢」";
+                if (item.tjCategory!=null ) {
+                  this.tjCategory  = item.tjCategory
                 }
                 if (item.pacName == "鍗曢」") {
                   item.list.forEach((item9) => {
@@ -2659,12 +2667,10 @@
               } else {
                 this.TotalPrice = TotalPrice;
               }
-
               this.list1 = false;
               this.list3 = true;
             } else {
               this.list1 = true;
-
               this.TotalPrice = "0.00";
             }
           });

--
Gitblit v1.8.0