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

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -884,7 +884,7 @@ export default {
                   } else {
                     that.$message.success('上传明细成功')
                     that.radio = 2
-                    that.getPatientList()
+                    that.changePatientInfo()
                   }
 
                 }
@@ -941,8 +941,11 @@ export default {
               break
             case 2:
               this.all_table_data = response.data.data.list_two
-
               this.patientTableData = response.data.data.list_two
+
+
+
+
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.getPatientInformation(this.chargePatientTableData[0].patient_id, this.patientTableData[0].id)
               break
@@ -996,29 +999,36 @@ export default {
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              if (this.hisPatientInfo.id > 0){
+              if (this.hisPatientInfo.id > 0) {
                 for (let i = 0; i < this.patientTableData.length; i++) {
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
                     this.current_index = i
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                    this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
+                    this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
 
                   }
                 }
               }else{
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
-                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
               break
             case 2:
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
-                 for(let i = 0; i < this.patientTableData.length; i++){
-                   if(this.patientInfo.id ==this.patientTableData[i].patient_id){
-                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                     this.getPatientInformation(this.chargePatientTableData[i].patient_id, this.patientTableData[i].id)
-                   }
-                 }
+              if (this.hisPatientInfo.id > 0) {
+                for (let i = 0; i < this.patientTableData.length; i++) {
+                  if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
+                    this.current_index = i
+                    this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                    this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
+
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
+              }
               break
           }
         }
@@ -1610,7 +1620,7 @@ export default {
                 order_id: this.order.id,
                 record_time: this.record_date,
                 admin_user_id: this.$store.getters.xt_user.user.id,
-                patient_id: this.patientInfo.id
+                patient_id: this.hisPatientInfo.patient_id
               }
             })
                 .then(function(response) {

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
         <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print" style="position: relative;">
-            <span v-if="$store.getters.xt_user.org_id == 10138"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt=""></span>
-             <span v-if="$store.getters.xt_user.org_id ==10278"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/beierlog.png" alt=""></span>
+            <span v-if="org_id ==10138"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt=""></span>
+             <span v-if="org_id ==10278"><img style="width:100%;height:80px" src="https://kuyi.shengws.com/beierlog.png" alt=""></span>
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
@@ -75,8 +75,8 @@
                 <div>操作人：<span style="width:100px;display:inline-block;">{{info.doctor_name}}</span></div>
                 <div>操作日期：<span style="width:100px;display:inline-block;">{{info.record_date}}</span></div>
             </div>
-          <span v-if="$store.getters.xt_user.org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
-          <span v-if="$store.getters.xt_user.org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
+          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
+          <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
         </div>
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
           <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
@@ -183,8 +183,8 @@
                 <div>操作人：<span style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span></div>
                 <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
             </div>
-            <span v-if="$store.getters.xt_user.org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
-            <span v-if="$store.getters.xt_user.org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
+            <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
+            <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
         </div>
     </div>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -135,7 +135,7 @@
                             <div style="margin-bottom:10px;float: right">
                               <div>
                                 <el-button
-                                    v-if="(hisPatientInfo.balance_accounts_type == 1 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
+                                    v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
                                     size="small"
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -287,7 +287,7 @@
                 </div>
             </div>
             <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
-            <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+            <img style="width:100%;" v-else src="https://kuyi.shengws.com/bailinbeier.png" alt="">
 
         </div>
     </div>

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -3,8 +3,8 @@
   <div id='prescriptionPrint1'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' v-if="item.project.length == 0" v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
-          <span v-if="org_id = 10138"> <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt=""></span> 
-          <span v-if="org_id = 10278"> <img src="https://kuyi.shengws.com/beierlog.png" style="width:100%" alt=""></span> 
+          <span v-if="org_id == 10138"> <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt=""></span>
+          <span v-if="org_id == 10278"> <img src="https://kuyi.shengws.com/beierlog.png" style="width:100%" alt=""></span>
           <div class="printTitle">
             处方笺
             <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
@@ -71,7 +71,7 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
+          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
           <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -2,8 +2,8 @@
    <div id='prescriptionPrint2'>
     <div id='prescription-print' v-if="item.advices.length == 0" class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
-        <span v-if="org_id = 10138"> <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt=""></span>
-         <span v-if="org_id = 10278"> <img src="https://kuyi.shengws.com/beierlog.png" style="width:100%" alt=""></span>
+        <span v-if="org_id == 10138"> <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt=""></span>
+         <span v-if="org_id == 10278"> <img src="https://kuyi.shengws.com/beierlog.png" style="width:100%" alt=""></span>
         <div class="printTitle">治疗单
           <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
           <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>