Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2342,7 +2342,7 @@
                         kg
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id != 10677">
                         体重减少：
                         <div
                           class="under_line"
@@ -2367,7 +2367,7 @@
                       <div
                         class="inline_block"
                         style="flex: 1"
-                        v-if="org_id != 10223 || org_id!=10375"
+                        v-if="org_id != 10223 || org_id!=10375 || org_id !=10677"
                       >
 
                         <span v-if="org_id!=10460 && org_id!=10551">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2148,7 +2148,7 @@
                       kg
                     </div>
 
-                    <div class="inline_block" style="flex: 0.9">
+                    <div class="inline_block" style="flex: 0.9" v-if="org_id != 10677">
                       体重减少：
                       <div
                         class="under_line"
@@ -2164,10 +2164,8 @@
                       kg
                     </div>
 
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                      v-if="org_id != 10223 || org_id!=10375"
+                    <div class="inline_block" style="flex: 1"
+                      v-if="org_id != 10223 || org_id!=10375 || org_id != 10677"
                     >
                         <span v-if="org_id!=10460 && org_id!=10551">
                           透析中入量：

src/xt_pages/workforce/components/editTableData.vue

@@ -4199,17 +4199,17 @@ export default {
             }
             return "schedule-table-cell-disable";
           } else {
-            if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
-              return 'thefilter'
-            }
+            
             if (
                 row[column.property].patient_id > 0 &&
                 row[column.property].patient_id == this.patient_id_hover
             ) {
               return "hover-td";
-            } else {
-              return "";
+            } 
+            if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
+              return 'thefilter'
             }
+            return 
           }
         }else{
           // if(column.label == '晚' ){

src/xt_pages/workforce/components/tableData.vue

@@ -1395,8 +1395,10 @@ export default {
      },
     //  单元格样式的回调
     cellClass({ row, column, rowIndex, columnIndex }) {
-      
-      
+      // if(row[column.property].patient_id>0){
+      //   console.log('qqqqq',row[column.property])
+      // }
+
       // console.log('wwwww',column)
       // console.log('eeeee',rowIndex)
       // console.log('rrrrr',columnIndex)
@@ -1433,7 +1435,7 @@ export default {
             // console.log('这是row',row);
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover ){
               return 'hover-td schedule-table-cell-disable'
-            }
+            } else
             if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
               return 'backPurple schedule-table-cell-disable'
             }
@@ -1442,17 +1444,16 @@ export default {
             }
             return "schedule-table-cell-disable";
           }else{
+            if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
+              return 'hover-td '
+            }
             if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
-              return 'backPurple'
+              return 'backPurple '
             }
             if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
               return 'thefilter'
             }
-            if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
-              return 'hover-td schedule-table-cell-disable'
-            }else {
-              return ''
-            }
+            return 
           }
         } else {
           // if(column.label == '晚' ){