新分支

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -206,7 +206,7 @@
 
       </div>
      
-      <!-- <el-table
+      <el-table
         v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
@@ -240,7 +240,8 @@
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link">
-                {{ getAdviceContent(scope.row, 1)}}
+                <!-- {{ getAdviceContent(scope.row, 1)}} -->
+                {{ scope.row.advice_name }}
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -252,7 +253,9 @@
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
-                &emsp;{{ getAdviceContent(scope.row, 2)}}
+                &emsp;
+                {{ scope.row.advice_name }}
+                <!-- {{ getAdviceContent(scope.row, 2)}} -->
 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -299,103 +302,11 @@
             </span>
           </template>
         </el-table-column>
-      </el-table> -->
-
+      </el-table>
 
 
-      <el-table
-        v-if="his_is_open !=1 && is_advice_open!=1"
-        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
-        :data="doctor_advices_one"
-        border
-        style="width: 100%"
-        v-show="showAdvicePanel"
-        ref="advices_list"
-        @row-click="cellMouseEnter"
-        :row-class-name="tableRowClassName"
-        
-        :cell-class-name="adviceNameShow"
-        :modal-append-to-body="false"
-        highlight-current-row
 
-      >
-    
-       <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
-          <template slot-scope="scope">
-            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
-          <template slot-scope="scope">
-            <span>
-              {{scope.row.start_time | parseTime('{y}-{m}-{d} {h}:{i}')}}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
-          <template slot-scope="scope">
-            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
-              <span class="el-dropdown-link">
-                {{ getAdviceContent(scope.row, 1)}}
-                <i class="el-icon-arrow-down el-icon--right"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1 " @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1 " @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-
-            <el-dropdown trigger="click">
-              <span class="el-dropdown-link" v-for="(it,index) in scope.row.children" :key="index">
-                &emsp;{{ getAdviceContentOne(it, 2)}}
-                <i class="el-icon-arrow-down el-icon--right"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="execution_time"
-          align="center"
-          min-width="30px"
-          label="执行时间"
-          sortable
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.execution_time != 0">
-              {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
-            </span>
-            <span v-else></span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士"><!--bug642-->
-          <template slot-scope="scope">
-            <span>
-              {{getXuserName(scope.row.execution_staff)}}
-            </span>
-
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="(template_id != 6 && org_id!=10223 && org_id!=10445)  || org_id == 10460"
-          prop="checker"
-          min-width="30px"
-          align="center"
-          label="核对人员"
-        >
-          <template slot-scope="scope">
-            <span>
-              {{getXuserName(scope.row.checker)}}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table>
+   
 
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
@@ -889,18 +800,17 @@
 
     },
     methods: {
+      
       handleSpanTempArrOne() {
           this.tempArrOne = [];
-
+          console.log("数据哦噢#",this.doctor_advices)
           for (let i = 0; i < this.doctor_advices.length; i++) {
             if (i === 0) {
               this.tempArrOne.push(1);
               this.pos = 0;
             } else {
               // 判断当前元素与上一个元素是否相同
-              if (
-                this.doctor_advices[i].groupno ===
-                this.doctor_advices[i - 1].groupno
+              if (this.doctor_advices[i].groupno === this.doctor_advices[i - 1].groupno
               ) {
                 this.tempArrOne[this.pos] += 1;
                 this.tempArrOne.push(0);
@@ -909,6 +819,7 @@
                 this.pos = i;
               }
             }
+            console.log("thiswowoowow",this.tempArrOne)
           }
       },
       handleSelectionChange(){
@@ -2160,36 +2071,36 @@
       }
       ,
       show(his_is_open,is_advice_open) {
-         
-      var childMap = {}
-      for (const index in this.doctor_advices) {
-        if (this.doctor_advices[index].parent_id == 0) {
-          continue
-        }
-        if (!(this.doctor_advices[index].parent_id in childMap)) {
-          childMap[this.doctor_advices[index].parent_id] = []
-        }
-        childMap[this.doctor_advices[index].parent_id].push(this.doctor_advices[index])
-      }
+       this.handleSpanTempArrOne()
+      // var childMap = {}
+      // for (const index in this.doctor_advices) {
+      //   if (this.doctor_advices[index].parent_id == 0) {
+      //     continue
+      //   }
+      //   if (!(this.doctor_advices[index].parent_id in childMap)) {
+      //     childMap[this.doctor_advices[index].parent_id] = []
+      //   }
+      //   childMap[this.doctor_advices[index].parent_id].push(this.doctor_advices[index])
+      // }
 
-      var advices = [];
-        for (const index in this.doctor_advices) {
-          if (this.doctor_advices[index].parent_id > 0) {
-            continue;
-          }
-          var item = this.doctor_advices[index];
-          if (item.id in childMap) {
-            item.children = childMap[item.id];
-          } else {
-            item.children = [];
-          }
-          advices.push(item);
-        }
+      // var advices = [];
+      //   for (const index in this.doctor_advices) {
+      //     if (this.doctor_advices[index].parent_id > 0) {
+      //       continue;
+      //     }
+      //     var item = this.doctor_advices[index];
+      //     if (item.id in childMap) {
+      //       item.children = childMap[item.id];
+      //     } else {
+      //       item.children = [];
+      //     }
+      //     advices.push(item);
+      //   }
 
      
-      console.log("我的世纪东方",advices)
-      this.doctor_advices_one = []
-      this.doctor_advices_one = advices
+      // console.log("我的世纪东方",advices)
+      // this.doctor_advices_one = []
+      // this.doctor_advices_one = advices
 
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
@@ -2461,33 +2372,44 @@
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 
-        if (columnIndex === 0) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
+        // columnIndex 代表列
+        if (columnIndex === 0 ||  columnIndex === 1) {
+        const _row = this.tempArrOne[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        // console.log("_row--------------",_row)
+        // console.log("_col",_col)
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      
+        // if (columnIndex === 0) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
 
-        if (columnIndex === 1) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
+        // if (columnIndex === 1) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+       }
       }
       ,
       GetLastOrNextDoctorAdvice(params) {

src/xt_pages/user/doctorAdvice.vue

@@ -4432,12 +4432,13 @@ export default {
       // this.sameRowArr = sameRowArr;
     },
     mergeSpan({ row, column, rowIndex, columnIndex }) {
-     
+      console.log("row29292929",columnIndex)
+      console.log("conlumnindex",this.tempArr)
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
         const _row = this.tempArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
-        // console.log("_row--------------",_row)
-        // console.log("_col",_col)
+        console.log("_row--------------",_row)
+        console.log("_col",_col)
         return {
           rowspan: _row,
           colspan: _col