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/template/DialysisPrintOrderFiftyFour.vue

               </div>
             </td>
           </tr>
-          <!-- <tr>
-            <td colspan="11" style="padding-left: 10px">
-              <div class="list_table">
-                <div>姓 名:&nbsp;{{ patientInfo.name }}</div>
-                <div>
-                  性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
-                </div>
-                <div>透析机号:&nbsp;{{ getNumber() }}</div>
-              </div>
-            </td>
-          </tr> -->
           <tr class="list_table_1">
             <td colspan="11" style="padding-left: 10px">
               <div style="display: flex">
                       predialysis.systolic_blood_pressure
                         ? predialysis.systolic_blood_pressure
                         : ""
+                    }}/
+                    {{
+                      predialysis.diastolic_blood_pressure
+                        ? predialysis.diastolic_blood_pressure
+                        : ""
                     }}</span
                   >mmHg
                 </div>
               >
               </label-box>
               <label-box
-                :isChecked="prescription.mode_id > 2 ? true : false"
+                :isChecked="
+                  prescription.mode_id != 2 &&
+                  prescription.mode_id != 1 &&
+                  prescription.mode_id != 5 &&
+                  prescription.mode_id != 31 &&
+                  prescription.mode_id != 32
+                    ? true
+                    : false
+                "
                 showValue="其他:"
               ></label-box>
               &nbsp;
-              <span v-if="prescription.mode_id > 2">
+              <span
+                v-if="
+                  prescription.mode_id != 2 &&
+                  prescription.mode_id != 1 &&
+                  prescription.mode_id != 5 &&
+                  prescription.mode_id != 31 &&
+                  prescription.mode_id != 32
+                "
+              >
                 {{ prescription.mode }}
               </span>
             </td>
-            <!-- <td width="20" style="border: none"></td> -->
             <td width="200" style="padding-left: 10px">
               透析时间：&nbsp;{{
                 afterdialysis.actual_treatment_hour
               ></label-box>
             </td>
           </tr>
-          <tr class="list_table_1" style="line-height: 40px">
+          <tr class="list_table_1" style="line-height:40px;">
             <td
-              width="100"
+              width="250"
               style="border-right: none; padding-left: 10px"
               colspan="2"
             >
               脱水量:
-              <p style="display: inline-block; width: 40px">
+              <span style="display: inline-block; width: 40px">
                 {{
                   prescription.target_ultrafiltration
                     ? prescription.target_ultrafiltration
                     : ""
                 }}
-              </p>
-              ml; 透析液流量：
-              <p style="display: inline-block; width: 40px">
+              </span>
+              <span>ml; </span>
+              <span style="padding-left: 185px">透析液流量：</span>
+              <span style="display: inline-block; width: 40px">
                 {{
                   prescription.dialysate_flow ? prescription.dialysate_flow : ""
                 }}
-              </p>
+              </span>
               ml/h;
             </td>
-            <!-- <td style="border: none"></td> -->
-            <td width="20" style="padding-left: 10px">
+            <td width="200" style="padding-left: 10px">
               医师签名：
               <span v-if="setAdminUserES(prescription.creater) == ''">
                 {{ getAdminUser(prescription.creater) }}
               <div class="td_div1" style="display: flex">
                 <div style="padding-left: 10px">
                   透析液处方：钾：
-                  <span style="width: 30px; display: inline-block">
+                  <span style="width: 50px; display: inline-block">
                     {{ prescription.kalium ? prescription.kalium : "" }} </span
                   >mmol/L&nbsp; 钙：
-                  <span style="width: 30px; display: inline-block">
+                  <span style="width: 50px; display: inline-block">
                     {{
                       prescription.calcium ? prescription.calcium : ""
                     }} </span
                   >mmol/L&nbsp; 碳酸氢根：
-                  <span style="width: 30px; display: inline-block">
+                  <span style="width: 50px; display: inline-block">
                     {{
                       prescription.bicarbonate ? prescription.bicarbonate : ""
                     }} </span
+                  >mmol/L&nbsp;钠：<span
+                    style="width: 50px; display: inline-block"
+                  >
+                    {{ prescription.sodium ? prescription.sodium : "" }} </span
                   >mmol/L
+                  <span> </span>
                 </div>
               </div>
             </td>
                 </div>
                 <div style="display: flex; min-width: 250px; padding: 0 10px">
                   透析机型号：{{
-                    prescription.dialyzer_perfusion_apparatus
-                      ? prescription.dialyzer_perfusion_apparatus
-                      : ""
+                    predialysis.machine_type ? predialysis.machine_type : ""
                   }}
                 </div>
                 <div style="min-width: 250px; padding-left: 10px">
                   >&nbsp; &nbsp;
                   <label-box
                     :isChecked="
-                      predialysis.blood_access_part_opera_name == '内瘘' &&
+                      predialysis.blood_access_part_opera_name &&
+                      predialysis.blood_access_part_opera_name != '内瘘' &&
                       predialysis.blood_access_part_opera_name.indexOf(
-                        '临时静脉导管'
-                      ) > -1 &&
+                        '长期静脉导管'
+                      ) == -1 &&
                       predialysis.blood_access_part_opera_name.indexOf(
                         '临时静脉导管'
-                      ) > -1
-                        ? false
-                        : true
+                      ) == -1
+                        ? true
+                        : false
                     "
-                    showValue="其他"
+                    showValue="其他:"
                   ></label-box
                   >&nbsp; &nbsp;
+                  <span
+                    v-if="
+                      predialysis.blood_access_part_opera_name != '内瘘' &&
+                      predialysis.blood_access_part_opera_name.indexOf(
+                        '长期静脉导管'
+                      ) == -1 &&
+                      predialysis.blood_access_part_opera_name.indexOf(
+                        '临时静脉导管'
+                      ) == -1
+                    "
+                    >{{ predialysis.blood_access_part_opera_name }}</span
+                  >
                 </div>
-                <div style="width: 25%">
+                <div style="width: 17%">
                   执行者：
                   <span
                     v-if="
                   />
                 </div>
 
-                <div style="width: 25%">
+                <div style="width: 19%">
                   核对者：
                   <span
                     v-if="
           <td style="width: 60px" rowspan="2">时间</td>
           <td colspan="6">透析参数</td>
           <td colspan="5">生命体征</td>
-          <td colspan="1">治疗中病情变化</td>
+          <!-- <td colspan="1">治疗中病情变化</td> -->
           <td rowspan="2">血容量L</td>
-          <td rowspan="2">血温</td>
+          <td rowspan="2">血温℃</td>
           <td rowspan="2">Kt/V</td>
           <td rowspan="2">护士签名</td>
         </tr>
             <p style="height: 20px; line-height: 20px">电导度</p>
             <p style="height: 20px; line-height: 20px">ms/cm</p>
           </th>
-          <th style="width: 70px">
+          <th style="width: 70px; font-weight: normal">
             <p style="height: 20px; line-height: 20px">脱水量</p>
             <p style="height: 20px; line-height: 20px">ml</p>
           </th>
             <p style="height: 20px; line-height: 20px">SpO₂</p>
             <p style="height: 20px; line-height: 20px">%</p>
           </th>
-          <th style="width: 333px; font-weight: normal">
+          <!-- <th style="width: 333px; font-weight: normal">
             <p style="height: 20px; line-height: 20px">
               记&nbsp;&nbsp;&nbsp;&nbsp;录
             </p>
-          </th>
+          </th> -->
         </tr>
 
         <tr v-for="(monitor, monindex) in monitors" :key="monindex">
           </td>
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{
-                monitor.monitor_conductivity ? monitor.monitor_conductivity : ""
-              }}
+              {{ monitor.conductivity ? monitor.conductivity : "" }}
             </span>
           </td>
-          <td style="min-width: 45px;">
+          <td style="min-width: 45px">
             <span v-if="getTime(monitor.operate_time) != ''">
               {{
                 monitor.ultrafiltration_volume
           </td>
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{
-                 monitor.temperature ? monitor.temperature : "" 
-              }}
+              {{ monitor.temperature ? monitor.temperature : "" }}
             </span>
           </td>
           <td>
               }}
             </span>
           </td>
-          <td>
+          <!-- <td>
             <span v-if="monitor.symptom || monitor.dispose || monitor.result">
               {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
                 monitor.result
               }}
             </span>
-          </td>
+          </td> -->
           <td style="min-width: 60px; height: 30px">
-            {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            {{
+              monitor.accumulated_blood_volume
+                ? monitor.accumulated_blood_volume
+                : ""
+            }}
           </td>
           <td style="min-width: 60px; height: 30px">
-            {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            {{ monitor.blood_temperature ? monitor.blood_temperature : "" }}
           </td>
           <td style="min-width: 60px; height: 30px">
-            {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            {{ monitor.ktv ? monitor.ktv : "" }}
           </td>
           <td style="min-width: 60px; height: 30px">
-            {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+              {{ getAdminUser(monitor.monitoring_nurse) }}
+            </span>
+            <span
+              v-else
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: space-around;
+                height: 36px;
+              "
+            >
+              <img
+                style="height: 30px"
+                :src="setAdminUserES(monitor.monitoring_nurse)"
+                alt
+                srcset
+              />
+            </span>
           </td>
         </tr>
       </table>
                 class="list_table"
                 style="height: 100%; flex-direction: column"
               >
-                <div>治疗中病情变化:&nbsp;</div>
-                <div style="width: 80%; text-align: right">
+                <div>
+                  治疗中病情变化:&nbsp;
+                  <span v-for="(monitor, monindex) in monitors" :key="monindex">
+                    <span
+                      v-if="
+                        monitor.symptom || monitor.dispose || monitor.result
+                      "
+                    >
+                      {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
+                        monitor.result
+                      }}
+                    </span>
+                  </span>
+                </div>
+                <div style="width: 93%; text-align: right">
                   护士签名:
                   <span
                     style="
               />
             </td> -->
             <td>
-              <span v-if="setAdminUserES(advice.checker) == ''">{{
-                getAdminUser(advice.checker)
-              }}</span>
+              <span v-if="setAdminUserES(advice.execution_staff) == ''">
+                {{ getAdminUser(advice.execution_staff) }}
+              </span>
               <img
-                style="height: 40px"
-                :src="setAdminUserES(advice.checker)"
-                alt=""
-                srcset=""
+                style="height: 30px"
+                :src="setAdminUserES(advice.execution_staff)"
+                alt
+                srcset
                 v-else
               />
             </td>
         </tr>
       </table>
 
-      <table class="table-box" style="margin-top: 10px">
+      <!-- <table class="table-box" style="margin-top: 10px">
         <tbody>
           <tr>
             <td width="" style="font-size: 13px">
             </td>
           </tr>
         </tbody>
-      </table>
+      </table> -->
     </div>
     <div style="position: absolute; top: 1380px; left: 50%"></div>
   </div>
       return name;
     },
     setAdminUserES(id) {
-      console.log(id);
+      // console.log(id);
       if (id == 0) {
         return "";
       }
           }
           this.check = response.data.data.check;
           this.predialysis = response.data.data.PredialysisEvaluation;
+          // console.log(this.predialysis.blood_access_part_opera_id,'血管id')
           this.predialysis.blood_access_part_opera_name =
             this.bloodAccessParOperaName(
               this.predialysis.blood_access_part_opera_id
             );
 
-          console.log(
-            this.predialysis.blood_access_part_opera_name,
-            "this.predialysis.blood_access_part_opera_name"
-          );
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;
           this.operators = response.data.data.operators;
           this.dialysisOrder =
           }
 
           var tableAdvice = this.advices;
-          console.log("医生", tableAdvice);
+          // console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             this.advices = tableAdvice;
           }
 
-          console.log(this.advices, "this.advices");
+          // console.log(this.advices, "this.advices");
 
           this.loading = false;
 
               this.advice_groups.push(group);
             }
           }
-          console.log(this.advice_groups);
+          // console.log(this.advice_groups);
         } else {
           this.loading = false;
           this.$message.error("请求数据失败");
       });
     },
     bloodAccessParOperaName(id) {
-      console.log(this.bloodAccessParOpera);
+      // console.log(id, "====", this.bloodAccessParOpera, "ooooooooo血管通路");
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;
       }
     this.orgname = xtuser.org.org_name;
     // this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;
-    console.log(this.modeOptions, "this.modeOptions");
+    // console.log(this.modeOptions, "this.modeOptions");
     this.replacementWays = this.$store.getters.replacement_ways;
     this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;

src/xt_pages/hospitalStation/summary.vue

   },
   data() {
     return {
+      loading1: true,
       orderObj: {},
       statementVisible: false,
       statementVisible9504: false,
     };
   },
 
-    //判断列表页是否刷新
+  //判断列表页是否刷新
   beforeRouteEnter(to, from, next) {
     console.log(from, "beforeRouteEnter");
     if (from.path == "/outpatientCharges/summaryDetail") {
         vm.sort_type = vm.$store.getters.pagedata.list.sort_type;
         setTimeout(() => {
           vm.getHisOrderList();
-        },300)
-        
+        }, 300);
       });
     } else {
       next();
         sort_type: this.sort_type,
         charge_type: this.charge_type,
       };
-      console.log(params,'参数')
+      console.log(params, "参数");
       getHisOrderList(params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
         setl_time: obj.setl_time,
       };
       this.invoiceParams = paramsObj;
-      console.log(this.invoiceParams, "999");
-      this.invoiceVisible = true;
+      const loading = this.$loading({
+          lock: true,
+          text: '正在加载中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        setTimeout(() => {
+          loading.close();
+          this.invoiceVisible = true;
+        }, 1000);
     },
     shouJuPrint(obj) {
       let paramsObj = {

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

                 <TR>
                   <TD>报销类别费用合计</TD>
                   <TD>甲类：{{ getJaiTotal() ? getJaiTotal() : "0.00" }}</TD>
-                  <TD>乙类药品：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
+                  <TD>乙类：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
                   <TD>丙类：{{ getBingTotal() ? getBingTotal() : "0.00" }}</TD>
-                  <TD>非药品：0.00</TD>
                   <TD></TD>
                   <TD>其他：0.00</TD>
                 </TR>