1

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

@@ -197,6 +197,29 @@
               }}
             </template>
           </el-table-column>
+
+          <el-table-column
+            prop="displacement_flow_quantity"
+            align="center"
+            label="超滤率(ml/h)"
+            width="100"
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26) "
+          >
+            <template slot-scope="scope">
+              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="displacement_flow_quantity"
+            align="center"
+            label="超滤率(L/h)"
+            width="100"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="sodium_concentration"
             align="center"
@@ -318,28 +341,7 @@
           </el-table-column>
 
 
-          <el-table-column
-            prop="displacement_flow_quantity"
-            align="center"
-            label="超滤率(ml/h)"
-            width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26) "
-          >
-            <template slot-scope="scope">
-              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="displacement_flow_quantity"
-            align="center"
-            label="超滤率(L/h)"
-            width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
-            </template>
-          </el-table-column>
+          
 
           <el-table-column
             prop="heparin"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -16,6 +16,8 @@
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26)" width="76px" > 超滤量(ml)</th>
           <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) " width="92px" > 置换率(ml/min) </th>
@@ -26,8 +28,6 @@
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -43,6 +43,7 @@
           <td v-if="isShow('血流量')"> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('超滤量')"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }} </td>
+          <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
           <td v-if="isShow('钠浓度')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }} </td>
           <td v-if="isShow('透析液温度')"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
           <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "" }} </td>
@@ -51,7 +52,6 @@
           <td v-if="isShow('电导度')"> {{ monitor.conductivity ? monitor.conductivity : "" }} </td>
           <th v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </th>
           <th v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </th>
-          <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
           <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -167,7 +167,7 @@
               <span v-if="setAdminUserES(prescription.creater) == ''">
                 {{ getAdminUser(prescription.creater) }}
               </span>
-              <img class="es-img" :src="setAdminUserES(prescription.creater)" alt srcset v-else />
+              <img class="es-img" style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset v-else />
             </td>
           </tr>
           <tr style="text-align:left">
@@ -204,7 +204,7 @@
                 <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                   {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}
                 </span>
-                <img class="es-img" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt srcset v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt srcset v-else />
               </span>
             </td>
           </tr>
@@ -554,16 +554,12 @@
         </tr>
         <tr>
           <td style="width:60px" rowspan="2">时间</td>
-          <td colspan="6">透析参数</td>
+          <td colspan="5">透析参数</td>
           <td colspan="4">生命体征</td>
           <td colspan="2">治疗中病情变化</td>
           <td style="width:80px" rowspan="2">护士签名</td>
         </tr>
         <tr>
-          <th style="width:70px">
-            <p style="height:20px;line-height:20px">TMP</p>
-            <p style="height:20px;line-height:20px">mmHg</p>
-          </th>
           <th style="width:70px">
             <p style="height:20px;line-height:20px">静脉压</p>
             <p style="height:20px;line-height:20px">mmHg</p>
@@ -619,11 +615,6 @@
           <td style="min-width:60px;height:30px">
             {{ getTime(monitor.operate_time, "{h}:{i}") }}
           </td>
-          <td>
-            <span v-if="getTime(monitor.operate_time) != ''">
-              {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "0" }}
-            </span>
-          </td>
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
               {{ monitor.venous_pressure ? monitor.venous_pressure : "0" }}
@@ -677,7 +668,7 @@
           </td> -->
           <td>
             <span v-if="monitor.symptom || monitor.dispose || monitor.result">
-              {{ monitor.symptom + "，" + monitor.dispose + "，" + monitor.result }}
+              {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </span>
           </td>
           <td width="0" style="border:none;visibility: hidden;padding:0"></td>
@@ -685,7 +676,7 @@
             <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
               {{ getAdminUser(monitor.monitoring_nurse) }}
             </span>
-            <img class="es-img" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset v-else />
+            <img class="es-img" style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset v-else />
           </td>
         </tr>
       </table>
@@ -1090,7 +1081,7 @@
               <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
               </span>
-              <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
+              <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
             </span>
             护士签名
             <span style="display: inline-block;width:100px;text-align: left;">
@@ -1099,7 +1090,7 @@
                 <span v-if="setAdminUserES(doctor_advices[0].execution_staff) == ''">
                   {{ getAdminUser(doctor_advices[0].execution_staff) }}
                 </span>
-                <img class="es-img" :src="setAdminUserES(doctor_advices[0].execution_staff)" alt srcset v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(doctor_advices[0].execution_staff)" alt srcset v-else />
               </p>
             </span>
           </td>

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -2,13 +2,13 @@
     <div >
         <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
             <div slot="content">
-                {{scheduleDetail.patient}}
+                {{scheduleDetail.patient}}11
                 <br/>
                 <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
             </div>
             <div>
-                <span>{{scheduleDetail.patient}}</span><br/>
-                <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
+                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
+                <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
             </div>
         </el-tooltip>
     </div>
@@ -30,5 +30,25 @@ export default {
           },
       },
   },
+  methods:{
+        modeColor(name){
+            if(name == 'HD'){
+
+            }else if(name == 'HDF'){
+                return 'modeRed'
+            }else if(name == 'HD+HP'){
+                return 'modePurple'
+            }
+        }
+  }
 };
 </script>
+
+<style lang="scss" scoped>
+.modeRed{
+  color:#ed5555;
+}
+.modePurple{
+  color: #53b86e;
+}
+</style>

src/xt_pages/workforce/components/tableData.vue

@@ -99,12 +99,13 @@
       @cell-click="clickThis"
       :summary-method="getSummaries"
       show-summary
-      :row-class-name="rowClass"
+      :row-class-name="tableRowClassName"
       :cell-class-name="cellClass"
       sum-text="总数"
       :height="tableContainHeight"
       ref="table"
       style="width: 100%;cursor: pointer;"
+      
     >
       <el-table-column
         prop="area"
@@ -329,6 +330,7 @@
                 v-model="searchKey"
                 placeholder="请输入搜索的内容"
                 style="width:260px"
+                @keyup.enter.native='SubmitSearch'
               ></el-input>
               <el-button
                 type="primary"
@@ -464,8 +466,11 @@
           :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false"
           type="primary"
           @click="submitTiaoX"
-          >保 存</el-button
-        >
+          >
+          <span v-if='tiaoZhengType == 1'>保存</span>
+          <span v-if='tiaoZhengType == 2'>下一步</span>
+          <span v-if='tiaoZhengType == 3'>下一步</span>
+          </el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -626,7 +631,7 @@ export default {
     return {
       // tableContainHeight:400,
       // tableHeight:'window.innerHeight - 0',
-      rowClass: "table-row-new-class schedule-table-row",
+      // rowClass: "table-row-new-class schedule-table-row",
       searchKey: "",
       tiaoZhengType: 1,
       modeOptions: null,
@@ -1931,6 +1936,13 @@ export default {
       this.currentData.id = row.id;
       this.searchTableVisible = false;
       this.msDialogVisible = true;
+    },
+    tableRowClassName({row, rowIndex}) {
+      if(row.zone_type == 1){
+        return 'table-row-new-class schedule-table-row'
+      }else {
+        return 'table-row-new-class schedule-table-row backPurple'
+      }
     }
   },
   components: {
@@ -2062,4 +2074,7 @@ export default {
     color: #fff;
   }
 }
+.backPurple{
+  color: #08c3df !important;
+}
 </style>