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

 
         }
       }
+    },changePatientInfo(){
+      let params = {
+        'record_date': this.record_date,
+        'sch_type': this.schedule_type
+      }
+      getHisHospitalDetailList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          if (response.data.data.list == null) {
+            response.data.data.list = []
+          }
+          if (response.data.data.list_two == null) {
+            response.data.data.list_two = []
+          }
+          this.hisPatientInfo = {}
+          this.curPrescriptions = {}
+          this.curMonthPrescriptions = {}
+          this.month_prescriptions = []
+          this.prescriptions = []
+
+          this.patientTableData = []
+          this.upload_num = response.data.data.upload_num
+          this.un_upload_num = response.data.data.un_upload_num
+          switch (this.radio) {
+            case 1:
+              this.all_table_data = response.data.data.list
+              this.patientTableData = response.data.data.list
+              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)
+
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
+                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
+              }
+              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
+
+          }
+        }
+      })
+
     },
     changeRadio(id) {
       // this.hisPatientInfo = null
               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)
+                 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)
+                   }
+                 }
               break
-
           }
         }
       })

src/xt_pages/hospitalStation/newStatementPrint.vue

     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin" :his="his" :his_hospital="his_hospital"></printOne>
+      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin" :his="his" :his_hospital="his_hospital" :patient="patient"></printOne>
     </div>
   </div>
 </template>
                 that.info = response.data.data.info;
                 that.p_admin = response.data.data.printor_admin;
                 that.charge_admin = response.data.data.charge_admin;
-
+                that.patient = response.data.data.patient
                 that.his = response.data.data.his;
                 that.his_hospital = response.data.data.his_hospital;
 

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

         <td>单位名称</td>
         <td colspan="5">{{info.emp_name}}</td>
         <td width="80">联系电话</td>
-        <td width="110"></td>
+        <td width="110">{{patient.phone}}</td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
         default: function() {
           return {}
         },
+      },patient:{
+        type: Object,
+        default: function() {
+          return {}
+        },
+
       }
     },methods:{
       getDay(dateString1,dateString2){

src/xt_pages/hospitalStation/summary.vue

                 </el-table-column>
                 <el-table-column align="center" prop="name" label="收费日期">
                     <template slot-scope="scope">
-                        <div v-if="scope.row.his_hospital_patient.balance_accounts_type == 2">
-                            {{getTimes(scope.row.settle_accounts_date)}}
-                        </div>
-                        <div v-if="scope.row.his_hospital_patient.balance_accounts_type != 2">{{scope.row.setl_time}}
-                        </div>
+                      <div>{{scope.row.setl_time}}</div>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="收费员">
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10278)) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (row.order_status == 2 && $store.getters.xt_user.org_id == 10278)) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         this.orderObj = obj
         // this.$refs.print.getInfo(this.order.id)
       } else if (index == 10) {
+
+
         if (this.hisPatientInfo.balance_accounts_type == 2) {
           this.$confirm('是否退号', '退号', {
             confirmButtonText: '确 定',
           }).catch(() => {
           })
         } else {
+          if(this.order.id > 0){
+            this.$message.error("该就诊号尚未撤销明细或者退费无法进行退号操作")
+            return
+          }
           var that = this
           this.$confirm('是否退号', '退号', {
             confirmButtonText: '确 定',

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

         <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
         <td colspan="3">{{info.cvlserv_pay}}</td>
       </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
+        <td colspan="3">{{info.oth_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
+        <td colspan="3">{{info.acct_pay}}</td>
+      </tr>
       <tr>
         <td>收款人:</td>
         <td colspan="2">{{info.charge_admin.user_name}}</td>