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/dialysisPrintOrder.vue

@@ -1451,8 +1451,7 @@ export default {
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51 ||
-        this.org_template_info.template_id == 54
+        this.org_template_info.template_id == 51
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -247,7 +247,7 @@
                   prescription.dialysate_flow ? prescription.dialysate_flow : ""
                 }}
               </span>
-              ml/h;
+              ml/min;
             </td>
             <td width="200" style="padding-left: 10px">
               医师签名：
@@ -1339,7 +1339,6 @@ export default {
           }
 
           var tableAdvice = this.advices;
-          // console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -335,7 +335,7 @@
         })
 
       }, deleteDrug: function(index, row) {
-        if (this.prescription.order_status == 2) {
+        if (this.prescription.order_status == 2  || this.prescription.order_status == 4) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }
@@ -406,7 +406,7 @@
         return name
       },
       deleteProject(row, i) {
-        if (this.prescription.order_status == 2) {
+        if (this.prescription.order_status == 2 || this.prescription.order_status == 4) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -15,13 +15,20 @@
       <div class="dialysisPage">
         <printOne
           v-if="
-            org_id != 10215 && org_id != 10265 && org_id != 4 && org_id != 0 && org_id != 9675
+            org_id != 10215 &&
+            org_id != 10265 &&
+            org_id != 4 &&
+            org_id != 0 &&
+            org_id != 9675
           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215 " :paramsObj="invoiceParams"></printTwo>
+        <printTwo
+          v-if="org_id == 10215 || org_id == 0"
+          :paramsObj="invoiceParams"
+        ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 ||  org_id == 0"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -197,7 +197,7 @@
         </div>
         <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->
-            应退款:{{list.refund_sum}}
+            应退款:{{parseFloat(pre_pay_money)}}
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">

src/xt_pages/hospitalStation/summary.vue

@@ -306,6 +306,7 @@
       width="1200px"
       title="打印"
       :visible.sync="invoiceVisible"
+      destroy-on-close
     >
       <invoicePrint ref="print" :invoiceParams="invoiceParams"></invoicePrint>
     </el-dialog>
@@ -1122,6 +1123,7 @@ export default {
         setl_time: obj.setl_time,
       };
       this.invoiceParams = paramsObj;
+      
       const loading = this.$loading({
           lock: true,
           text: '正在加载中...',
@@ -1129,8 +1131,8 @@ export default {
           background: 'rgba(0, 0, 0, 0.7)'
         });
         setTimeout(() => {
-          loading.close();
           this.invoiceVisible = true;
+          loading.close();
         }, 1000);
     },
     shouJuPrint(obj) {

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -241,7 +241,10 @@
         },{
           value: 2,
           label: '身份证'
-        }],
+        },{
+          value: 4,
+          label: '电子凭证'
+        },],
         settlement: [
           {value: 1, label: '医保'},
           {value: 2, label: '自费'},

src/xt_pages/outpatientCharges/costComparison.vue

@@ -476,7 +476,7 @@ c<template>
             insutype: this.insutype,
             clr_type: this.clr_type,
             clr_optins:this.query_clr_org,
-            admin_user_id:that.$store.getters.xt_user.user.id,
+            admin_user_id:this.$store.getters.xt_user.user.id,
           }
           var that = this
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -4359,13 +4359,14 @@ export default {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  if(parseInt(response.data.data.info.diagnosis.split(',')[i]) !== NaN){
+                    this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  }
                 }
               }
-              console.log("~~~~~~")
-              console.log(this.form.diagnosis)
-              console.log(this.diagnoses)
-              console.log("~~~~~~")
+
+
+
 
 
 

src/xt_pages/outpatientDoctorStation/recordTemplate/printThree.vue

@@ -35,14 +35,14 @@
         </div>
         <div>
           性别：
-          <label-box
-            :isChecked="patient.gender == 1 ? true : false"
-            showValue="男"
-          ></label-box>
-          <label-box
-            :isChecked="patient.gender == 2 ? true : false"
-            showValue="女"
-          ></label-box>
+<!--          <label-box-->
+<!--            :isChecked="patient.gender == 1 ? true : false"-->
+<!--            showValue="男"-->
+<!--          ></label-box>-->
+<!--          <label-box-->
+<!--            :isChecked="patient.gender == 2 ? true : false"-->
+<!--            showValue="女"-->
+<!--          ></label-box>-->
         </div>
         <!-- <div class="address_slot">
           家庭住址：<span>{{ patient.home_address ? patient.home_address : "" }}</span>
@@ -295,8 +295,8 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
 import { getAccessList } from "@/api/patient";
-import LabelBox from "../zujian/labelbox.vue";
-import CheckBox from "../zujian/checkbox.vue";
+// import LabelBox from "../zujian/labelbox.vue";
+// import CheckBox from "../zujian/checkbox.vue";
 export default {
   props: {
     patient: Object,
@@ -305,8 +305,8 @@ export default {
     //   history:Object,
   },
   components: {
-    LabelBox,
-    CheckBox,
+    // LabelBox,
+    // CheckBox,
   },
   data() {
     return {