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

config/dev.env.js

@@ -7,8 +7,7 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://localhost:9531"',
-  BASE_API:'"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     //  host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/styles/index.scss

@@ -547,3 +547,15 @@ code {
   background-color: #409eff !important;
   color: #fff !important;
 }
+.el-table__body td > div:hover{
+  background-color: #409eff !important;
+  color: #fff !important;
+}
+.el-table__body div > span:hover{
+  background-color: #409eff !important;
+  color: #fff !important;
+}
+.el-table__body div > a:hover{
+  background-color: #409eff !important;
+  color: #fff !important;
+}

src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue

@@ -891,7 +891,7 @@
                               <div class="under-line">
                                 &nbsp;
                                 <span
-                                  v-if="record.prescription.anticoagulant == 3"
+                                  v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
                                   >{{
                                     record.prescription.anticoagulant_zongliang
                                   }}</span
@@ -940,7 +940,7 @@
                             <td width="40">
                               <div class="under-line">
                                 &nbsp;
-                                <span>{{
+                                <span v-if="record.prescription.anticoagulant == 2">{{
                                   record.prescription.anticoagulant_shouji
                                 }}</span>
                               </div>
@@ -976,11 +976,12 @@
                             <td width="40">
                               <div class="under-line">
                                 &nbsp;
+                                <span v-if="record.prescription.anticoagulant == 2">
                                 {{
                                   record.prescription.anticoagulant_weichi
                                     ? record.prescription.anticoagulant_weichi
                                     : "/"
-                                }}
+                                }}</span>
                               </div>
                             </td>
                             <td width="40">
@@ -1017,12 +1018,12 @@
                             <td width="35">总量:</td>
                             <td width="40">
                               <div class="under-line">
-                                &nbsp;{{
+                                &nbsp;<span v-if="record.prescription.anticoagulant == 2">{{
                                   record.prescription.anticoagulant_zongliang
                                     ? record.prescription
                                         .anticoagulant_zongliang
                                     : "/"
-                                }}
+                                }}</span>
                               </div>
                             </td>
                             <td width="20">
@@ -1352,7 +1353,7 @@
                         alt=""
                         srcset=""
                         v-else
-                        style="height: 20px;"
+                        style="height: 30px;"
                       />
                     </td>
                     <!-- <td height="35px">
@@ -1372,7 +1373,7 @@
                         alt=""
                         srcset=""
                         v-else
-                        style="height: 20px;"
+                        style="height: 30px;"
                       />
                     </td>
                     <td height="32px">
@@ -1981,7 +1982,7 @@
                         }}</span>
                         <span v-if="record.advices[0][0] !== ''">
                           <img
-                            style="height:20px"
+                            style="height:30px"
                             :src="
                               setAdminUserES(
                                 record.advices[0][0],
@@ -2021,7 +2022,7 @@
                           alt=""
                           srcset=""
                           v-else
-                          style="height: 20px;"
+                          style="height: 30px;"
                         />
                       </div>
                     </td>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -272,7 +272,7 @@
         ></el-table-column>
         <el-table-column prop="name" label="姓名" align="center">
           <template slot-scope="scope">
-            <span style="color: #579ef8">{{ scope.row.name }}</span>
+            <span style="color: #579ef8;width:100%;display:block;">{{ scope.row.name }}</span>
           </template>
         </el-table-column>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -15,7 +15,9 @@
           <span class="content">{{
             replacement_total != "0" ? replacement_total : ""
           }}</span>
-          <span class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
+          
         </li>
 
         <li v-if="isShow('透析液配方')">
@@ -77,8 +79,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9" >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20" >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -393,7 +393,10 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item label="实际置换量(L): ">
+          <el-form-item v-if="this.template_id == 20" label="实际置换量(ml): ">
+            <el-input v-model="form.actual_displacement"></el-input>
+          </el-form-item>
+          <el-form-item v-else label="实际置换量(L): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
         </el-col>

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

@@ -64,7 +64,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9)">
+          <el-col :span="8" v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20)">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -73,7 +73,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9">
+          <el-col :span="8" v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
@@ -136,7 +136,15 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
+          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20)" v-show="zhiShow">
+            <el-form-item label="置换量(ml)：">
+              <el-input
+                type="number"
+                v-model="dialysisPrescription.replacement_total"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20" v-show="zhiShow">
             <el-form-item label="置换量(L)：">
               <el-input
                 type="number"

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

@@ -149,7 +149,8 @@
                   template_id == 13 ||
                   template_id == 17 ||
                   template_id == 18 || 
-                  template_id == 19)
+                  template_id == 19 ||
+                  template_id == 20)
             "
           >
             <template slot-scope="scope">
@@ -174,7 +175,8 @@
                 template_id != 13 &&
                 template_id != 17 &&
                 template_id != 18 &&
-                template_id != 19
+                template_id != 19 &&
+                template_id != 20
             "
           >
             <template slot-scope="scope">
@@ -220,7 +222,7 @@
             align="center"
             label="置换率(ml/min)"
             width="120"
-            v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11)" >
+            v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20)" >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             </template>
@@ -231,7 +233,7 @@
             align="center"
             label="置换率(L/h)"
             width="120"
-            v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11">
+            v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20">
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             </template>
@@ -241,7 +243,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11) " >
+            v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -252,7 +254,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 " >
+            v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -311,7 +313,7 @@
             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) "
+            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 slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -322,7 +324,7 @@
             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"
+            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 slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -463,12 +465,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" 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) ">
+          <el-col :span="8" 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) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" 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">
+          <el-col :span="8" 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">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -476,7 +478,7 @@
 
           <el-col
             :span="8"
-            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) " >
+            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) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -484,7 +486,7 @@
 
           <el-col
             :span="8"
-            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" >
+            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" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -503,16 +505,26 @@
               <el-input v-model="form.dialysate_temperature"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('置换率')">
+          <el-col :span="8" v-if="isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20">
             <el-form-item label="置换率(L/h)：">
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('置换量')">
+          <el-col :span="8" v-if="isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20)">
+            <el-form-item label="置换率(ml/min)：">
+              <el-input v-model="form.replacement_rate"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20">
             <el-form-item label="置换量(L)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20)">
+            <el-form-item label="置换量(ml)：">
+              <el-input v-model="form.displacement_quantity"></el-input>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="8" v-if="isShow('电导度')">
             <el-form-item label="电导度(mS/m)：">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,20 +14,20 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <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)" 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"  width="76px"> 超滤量(L) </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)" 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"  width="76px"> 超滤量(L) </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) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 " width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11) " width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 10 " width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <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)" 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" width="50px"> 超滤率 <br />(L/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)" 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" 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>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -243,6 +243,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 20">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -423,6 +433,10 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 19"
           ></DialysisPrintOrderNineteen>
+          <DialysisPrintOrderTwenty
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 20"
+          ></DialysisPrintOrderTwenty>
         </div>
       </el-container>
     </div>
@@ -461,10 +475,12 @@ import DialysisPrintOrderSixteen from "./template/DialysisPrintOrderSixteen";
 import DialysisPrintOrderSeventeen from "./template/DialysisPrintOrderSeventeen";
 import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
 import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
+import DialysisPrintOrderTwenty from "./template/DialysisPrintOrderTwenty";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwenty,
     DialysisPrintOrderNineteen,
     DialysisPrintOrderEighteen,
     DialysisPrintOrderSeventeen,
@@ -783,7 +799,14 @@ export default {
           style: style2,
           scanStyles: false
         });
-      }
+      } else if (this.org_template_info.template_id == 1) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      } 
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -1199,7 +1222,7 @@ export default {
       );
     },
     //日期
-        handleScheduleDateChange: function() {
+        handleScheduleDateChange: function(index) {
             this.treatStateVal = 0
             this.patientStateVal = 0
             this.zoneVal = 0
@@ -1210,6 +1233,8 @@ export default {
             //   schedule_type: this.schedule_type_selected,
             //   schedule_date: this.selected_date,
             // })
+            this.selected_date = index
+            this.$store.dispatch('SetSelectedDate', { selected_date: index })
             this.requestDialysisSchedules()
         },
         //初始化数据
@@ -1225,9 +1250,10 @@ export default {
                     zone_options.push({ id: zone.id, text: zone.name })
                 }
                 this.zone_options = zone_options
-                this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+                // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
                 this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
-                this.getData()
+                this.requestDialysisSchedules()
+                // this.getData()
                 } else {
                 this.$message.error(resp.msg)
                 }
@@ -1236,27 +1262,27 @@ export default {
         // 班次
         handletimeType: function(index) {
             this.scheduleStateVal = index
-            // this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
+            this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
             this.search_keyword = this.search_input = ''
             this.getData()
         },
         //分区
         handleZoneChange: function(index) {
             this.zoneVal = index
-            // this.$store.dispatch('SetZoneSelected', { zone_selected: index })
+            this.$store.dispatch('SetZoneSelected', { zone_selected: index })
             this.search_keyword = this.search_input = ''
             this.getData()
         },
         //患者状态
         handleStateChange: function(index) {
             this.patientStateVal = index
-            // this.$store.dispatch('SetPatientStateSelected', { patient_state_selected: index })
+            this.$store.dispatch('SetPatientStateSelected', { patient_state_selected: index })
             this.search_keyword = this.search_input = ''
             this.getData()
         },
         handleTreatChange: function(index) {
             this.treatStateVal = index
-            // this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
+            this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
             this.search_keyword = this.search_input = ''
             this.getData()
         },
@@ -1309,11 +1335,13 @@ export default {
                 if (resp.state == 1) {
                 var schedules = resp.data.schedules
                 this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+                
                 let newArr = []
                 this.zone_schedules.map(item => {
                     newArr.push(...item.schedules)
                 })
                 this.tableData = newArr
+                this.getData()
                 } else {
                 this.$message.error(resp.msg)
                 }
@@ -1502,6 +1530,26 @@ export default {
     }
   },
   created() {
+    var schedule_type_selected = this.$store.getters.schedule_type_selected
+    var zone_selected = this.$store.getters.zone_selected
+    var patient_state_selected = this.$store.getters.patient_state_selected
+    var treat_state_selected = this.$store.getters.treat_state_selected
+    var selected_date = this.$store.getters.selected_date
+    if (schedule_type_selected) {
+      this.scheduleStateVal = schedule_type_selected.schedule_type_selected
+    }
+    if (zone_selected) {
+      this.zoneVal = zone_selected.zone_selected
+    }
+    if (patient_state_selected) {
+      this.patientStateVal = patient_state_selected.patient_state_selected
+    }
+    if (treat_state_selected) {
+      this.treatStateVal = treat_state_selected.treat_state_selected
+    }
+    if (selected_date.selected_date) {
+      this.selected_date = selected_date.selected_date
+    }
     this.getInitData();
 
     var xtuser = this.$store.getters.xt_user;

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -466,20 +466,23 @@
               <tr>
                 <td width="40">肝素:</td>
                 <td width="75">
-                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子:"></label-box>
+                  <label-box :isChecked="(prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7)  ? true : false" showValue="低分子:"></label-box>
                 </td>
 
                 <td width="60">
                   <div class="under-line">
                     &nbsp;
-                    <span v-if="prescription.anticoagulant == 3">{{ prescription.anticoagulant_zongliang }}</span>
+                    <span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
                   </div>
                 </td>
                 <td width="20">
+                  <span v-if="prescription.anticoagulant == 5">mg</span>
                   <span v-if="prescription.anticoagulant == 4">mg</span>
                   <span v-if="prescription.anticoagulant == 3">iu</span>
-                  <span v-if="prescription.anticoagulant == 2">iu</span>
+                  <span v-if="prescription.anticoagulant == 2">mg</span>
                   <span v-if="prescription.anticoagulant == 1">mg</span>
+                  <span v-if="prescription.anticoagulant == 6">iu</span>
+                  <span v-if="prescription.anticoagulant == 7">iu</span>
                 </td>
                 <td width="70">
                   <label-box :isChecked="prescription.anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
@@ -503,9 +506,10 @@
                 <td width="10"></td>
                 <td width="35">追加</td>
                 <td width="40">
-                  <div class="under-line">
+                  <div class="under-line" >
                     &nbsp;
-                    {{ prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "/" }}
+                    <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "/" }}</span>
+                    
                   </div>
                 </td>
                 <td width="40">
@@ -519,7 +523,8 @@
                 <td width="35">总量:</td>
                 <td width="40">
                   <div class="under-line">
-                    &nbsp;{{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}
+                    &nbsp;
+                    <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}</span>
                   </div>
                 </td>
                 <td width="20">

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -956,7 +956,7 @@
           </td>
         </tr>
         <tr>
-          <td style="text-align:left;" colspan="10">
+          <td style="text-align:left;" colspan="9">
             <span style="display:inline-block;margin-left:15px;">
               透析中进食:
               <label-box
@@ -975,7 +975,7 @@
               <label-box showValue="住院" :isChecked="afterdialysis.patient_gose == 3 ? true : false"></label-box>
             </span>
           </td>
-          <td style="text-align:left;" colspan="2">
+          <td style="text-align:left;" colspan="3">
             <span>
               <span
                 v-if="finshForm.url === ''"

src/xt_pages/user/patient.vue

@@ -99,7 +99,7 @@
         <el-table-column  label="住院号" min-width="80"  property="admission_number" align="center"> </el-table-column>
         <el-table-column property="name" label="姓名" min-width="80" align="center">
           <template slot-scope="scope" >
-            <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff" >{{scope.row.name}}</router-link>
+            <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff;width:100%;display:block;" >{{scope.row.name}}</router-link>
           </template>
         </el-table-column>
         <el-table-column label="性别" min-width="80" align="center">

src/xt_pages/user/patients.vue

@@ -365,7 +365,7 @@
           <template slot-scope="scope">
             <router-link
               :to="'/patients/patient/' + scope.row.id"
-              style="color:#409eff"
+              style="color:#409eff;width:100%;display:block;"
             >{{ scope.row.name }}
             </router-link
             >