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

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -90,7 +90,7 @@
           >
         </div>
       </template>
-      <template v-if="this.template_id == 6 || this.template_id == 48">
+      <template v-if="this.template_id == 6 || this.template_id == 48 || this.template_id == 0">
         <el-button
           size="small"
           icon="el-icon-printer"

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

@@ -377,7 +377,7 @@
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-            </el-select>
+            </el-select> 
           </el-form-item>
         </el-col>
 

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

@@ -308,9 +308,6 @@
 
 
 
-
-
-
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -324,15 +321,15 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection"  width="55"></el-table-column>
+        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
         <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="date" label="调试" align="center" min-width="26px">-->
 <!--          <template slot-scope="scope">-->

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

@@ -413,7 +413,9 @@
                     <el-col
                             :span="8"
                             v-if="isShows('钙剂量')"
-                    >
+                    ></el-col>
+                    
+                    <el-col :span="8" v-if="isShows('钙剂量')" >
                         <el-form-item label="钙剂量(ml) : ">
                             <el-input
                                     type="number"

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -878,19 +878,17 @@
                   setAdminUserES(
                     prescription == null
                       ? 0
-                      : prescription.prescription_doctor
-                      ? prescription.prescription_doctor
+                      : prescription.creater
+                      ? prescription.creater
                       : ''
                   ) == ''
                 "
               >
                 {{
                   getAdminUser(
-                    prescription == null
-                      ? 0
-                      : prescription.prescription_doctor
-                      ? prescription.prescription_doctor
-                      : ""
+                    prescription == null? 0: prescription.creater ? prescription.prescription_doctor: ""
+                     
+                     
                   )
                 }}
               </span>
@@ -900,11 +898,11 @@
                   setAdminUserES(
                     prescription == null
                       ? 0
-                      : prescription.prescription_doctor
-                      ? prescription.prescription_doctor
+                      : prescription.creater
+                      ? prescription.creater
                       : ''
-                  )
-                "
+                  ) "
+               
                 alt=""
                 srcset=""
                 v-else

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -156,7 +156,18 @@
                 ></label-box>
 
                 <div style="display: flex; padding-left: 20px">
-                  其他
+                  <label-box
+                  :isChecked="
+                    predialysis.is_hemorrhage == 1 &&
+                    predialysis.hemorrhage.indexOf('女性经期') == -1&&
+                    predialysis.hemorrhage.indexOf('消化道出血') == -1&&
+                    predialysis.hemorrhage.indexOf('牙龈出血') == -1&&
+                    predialysis.hemorrhage.indexOf('穿刺点渗血') == -1
+                      ? true
+                      : false
+                      "
+                  showValue="其他"
+                ></label-box>
                   <div
                     style="
                       min-width: 200px;
@@ -498,7 +509,7 @@
                           ) == -1
                         "
                       >
-                        {{ predialysis.blood_access_part_opera_name }}
+                        {{ predialysis.blood_access_part_opera_name }} 
                       </span>
                     </span>
                   </span>
@@ -921,26 +932,29 @@
               <span v-if="advice.parent_id == 0">{{
                 advice.execution_frequency
               }}</span>
+              <span>{{
+                advice.remark
+              }}</span>
             </td>
 
-            <td>
+            <td style="line-height: 30px;">
               <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                 getAdminUser(advice.execution_staff)
               }}</span>
               <img
-                style="height: 40px"
+                style="height: 30px"
                 :src="setAdminUserES(advice.execution_staff)"
                 alt=""
                 srcset=""
                 v-else
               />
             </td>
-            <td>
+            <td style="line-height: 30px;">
               <span v-if="setAdminUserES(advice.checker) == ''">{{
                 getAdminUser(advice.checker)
               }}</span>
               <img
-                style="height: 40px"
+                style="height: 30px"
                 :src="setAdminUserES(advice.checker)"
                 alt=""
                 srcset=""
@@ -1121,9 +1135,9 @@
     <!-- <div style="position: absolute; top: 1380px; left: 50%"></div> -->
     <div
       style="margin-top: 300px; padding-top: 50px"
-      v-if="this.totollength > 20"
+      v-if="this.totollength > 17"
     >
-      <template v-if="this.totollength > 20">
+      <template v-if="this.totollength > 17">
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{ orgname }}</div>
           <div class="order-title">血液透析（滤过）记录表单</div>
@@ -1556,7 +1570,7 @@
         <table
           class="print-table"
           border="1"
-          v-if="doctor_advices_2.length > 0 || this.totollength > 20"
+          v-if="doctor_advices_2.length > 0 || this.totollength > 17"
         >
           <tr style="height: 50px; text-align: left; border: none">
             <td style="padding-left: 5px; border: none">
@@ -2058,8 +2072,8 @@ export default {
           this.monitors = response.data.data.monitors;
           this.summary = response.data.data.summary;
           this.org_template_info = response.data.data.org_template_info;
-          if (this.monitors.length < 8) {
-            var nl = 8 - this.monitors.length;
+          if (this.monitors.length < 10) {
+            var nl = 10 - this.monitors.length;
             for (let index = 0; index < nl; index++) {
               this.monitors.push([]);
             }
@@ -2422,6 +2436,7 @@ export default {
 .dialysis-print-order {
   width: 960px;
   margin: 0 auto;
+  
 }
 
 .dialysis-print-order .order-yy-name {

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -813,13 +813,13 @@
         </table>-->
         <table class="print-table" border="1">
           <tr style="text-align: center">
-            <td colspan="14" style="margin-left: 15px; font-size: 20px">
+            <td colspan="15" style="margin-left: 15px; font-size: 20px">
               治 疗 过 程 记 录
             </td>
           </tr>
           <tr>
             <td style="width: 60px" rowspan="2">时间</td>
-            <td colspan="4">透析参数</td>
+            <td colspan="5">透析参数</td>
             <td colspan="5">生命体征</td>
             <td colspan="2">治疗中病情变化</td>
             <td style="width: 80px" rowspan="2">护士签名</td>
@@ -841,7 +841,11 @@
               <p style="height: 20px; line-height: 20px">脱水量</p>
               <p style="height: 20px; line-height: 20px">ml</p>
             </th>
-            <th style="width: 30px">
+            <th style="width: 70px">
+              <p style="height: 20px; line-height: 20px">Kt/V</p>
+              <p style="height: 20px; line-height: 20px">ml</p>
+            </th>
+            <th style="width: 40px">
               <p style="height: 20px; line-height: 20px">T</p>
               <p style="height: 20px; line-height: 20px">℃</p>
             </th>
@@ -853,7 +857,7 @@
               <p style="height: 20px; line-height: 20px">R</p>
               <p style="height: 20px; line-height: 20px">bpm</p>
             </th>
-            <th style="width: 100px">
+            <th style="width: 90px">
               <p style="height: 20px; line-height: 20px">BP</p>
               <p style="height: 20px; line-height: 20px">mmHg</p>
             </th>
@@ -906,6 +910,15 @@
                 }}
               </span>
             </td>
+            <td>
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{
+                  monitor.ktv
+                    ? monitor.ktv
+                    : ""
+                }}
+              </span>
+            </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.temperature ? monitor.temperature : "0" }}