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

@@ -322,13 +322,15 @@
                   <div class="inline_block" style="flex:1;">
                     透析(滤)器：
                     <div class="under_line" style="width: 100px;text-align: center">
-                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
+                      <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
+
+                      {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
                     灌流器：
                     <div class="under_line" style="width: 70px;text-align: center">
-                      /
+                      {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -191,7 +191,15 @@
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1 ? true : false" showValue="临时颈内静脉导管"></label-box>&nbsp;
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="临时股静脉导管"></label-box>&nbsp;
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('移植血管') > -1 ? true : false" showValue="其他"></label-box>&nbsp;
-              <span style="width:50px;display: inline-block;"></span>
+              
+              穿刺方式：
+              <span style="width:60px;display: inline-block;">
+                {{ predialysis.puncture_way ? predialysis.puncture_way : "" }}
+              </span>
+              位点：
+              <span style="width:60px;display: inline-block;">
+                {{ predialysis.pinholing ? predialysis.pinholing : "" }}
+              </span>
               穿刺者：
               <span style="width:50px;display: inline-block;">
                 <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -13,7 +13,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
+      <printOne v-if="org_id != 9990" :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
+      <printTwo v-if="org_id == 9990" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
     </div>
   </div>
 </template>
@@ -30,12 +31,14 @@
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
   import print from "print-js";
   import printOne from "./statementTemplate/printOne"
+  import printTwo from "./statementTemplate/printTwo"
   import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
   export default {
     name: "newStatementPrint",
     components: {
       BreadCrumb,
-      printOne
+      printOne,
+      printTwo
     },
     props:{
       paramsObj:Object
@@ -59,6 +62,8 @@
         info:null,
         p_admin:{},
         charge_admin:{},
+        org_id:'',
+        order_infos:null
       };
     },
     methods:{
@@ -173,6 +178,7 @@
                 that.info = response.data.data.info
                 that.p_admin = response.data.data.printor_admin
                 that.charge_admin = response.data.data.charge_admin
+                that.order_infos = response.data.data
 
 
                 console.log(that.info)
@@ -226,7 +232,9 @@
     },
 
     created() {
+      this.org_id = this.$store.getters.xt_user.org_id
       this.getInfo(this.paramsObj.order_id)
+      
     },
     watch:{
       paramsObj:{//深度监听，可监听到对象、数组的变化

src/xt_pages/outpatientCharges/settlementPrint.vue

@@ -13,7 +13,7 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
+            <printOne v-bind:childResponse="childResponse" :info="info" :p_admin="p_admin" :charge_admin="charge_admin" :paramsObj="paramsObj"></printOne>
         </div>
     </div>
   </div>
@@ -41,8 +41,10 @@ export default {
         { path: false, name: "打印单" }
       ],
       childResponse: {},
-      paramsObj:{}
-      
+      paramsObj:{},
+      info:null,
+      p_admin:{},
+      charge_admin:{},
 
     };
   },
@@ -180,6 +182,8 @@ export default {
 
               console.log(response.data.data.info)
               that.info = response.data.data.info
+              that.p_admin = response.data.data.printor_admin
+              that.charge_admin = response.data.data.charge_admin
               console.log(that.info)
 
               that.info['bed_cost_total'] = response.data.data.bedCostTotal

src/xt_pages/outpatientCharges/statementTemplate/printTwo.vue

@@ -67,7 +67,7 @@
       <div style="width:10%;text-align:center;">门诊目录</div>
       <div style="width:10%;text-align:center;">医保目录</div>
     </div>
-    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;" v-for="(item,index) in info.order_infos"
+    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;" v-for="(item,index) in order_infos.order_infos"
          :key="index">
       <div style="width:50%;text-align:center;" v-if="item.advice_id > 0">{{item.advice.drug.drug_name}}</div>
       <div style="width:50%;text-align:center;" v-if="item.project_id > 0">{{item.project.project.project_name}}</div>
@@ -108,7 +108,14 @@
         default: function () {
           return {}
         }
-      }, p_admin: {
+      }, 
+      order_infos: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      }, 
+      p_admin: {
         type: Object,
         default: function () {
           return {}

src/xt_pages/outpatientCharges/summary.vue

@@ -104,7 +104,7 @@
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
                             退费
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -378,16 +378,16 @@
 
       },
       getSingleDose(scope){
-        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
       getDay(scope){
-        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
       getProjectSingleDose(scope){
-        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
       },
       getProjectDay(scope){
-        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
       }
     },mounted(){
       this.getInitData()

src/xt_pages/outpatientRegistration/index.vue

@@ -923,7 +923,7 @@
             var params = {
               id: this.form.id,
               settlement_value: this.form.settlementValue,
-              medical_insurance_card: this.for???m.medicalInsuranceCard,
+              medical_insurance_card: this.form.medicalInsuranceCard,
               name: this.form.name,
               sex: this.form.sex,
               id_card_type: this.form.id_card_type,

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -710,7 +710,7 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-       console.log("本月最后一天",timeEnd)
+        // console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量