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

         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-        // console.log("透前评估",this.predialysis)
+         console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

                     <div>
 
                         <el-button v-loading="loadingtwo"
-                                   v-if="(this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0)"
+                                   v-if="(this.activeName == 'first' && this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0)"
+                                   size="small"
+                                   @click="open(30)"
+                                   type="primary">上传费用明细
+                        </el-button>
+
+
+
+                        <el-button v-loading="loadingtwo"
+                                   v-if="(this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0)"
                                    size="small"
                                    @click="open(8)"
                                    type="primary">上传费用明细
 
                         <!--<el-button size="small" @click="open(1)" type="primary">打印</el-button>-->
                         <el-button v-loading="loadingone" size="small"
-                                   v-if="(this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.order_status == 1)"
+                                   v-if="(this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.order_status == 1)"
 
                                    @click="open(2)"
                                    type="primary">出院
                         </el-button>
 
                         <el-button v-loading="loadingone" size="small"
-                                   v-if="(this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                                   v-if="(this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
                                    @click="open(2)"
                                    type="primary">出院
 
 
                         <el-button v-loading="loadingtwo"
-                                   v-if="(this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1)||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
+                                   v-if="(this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1)||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
                                    size="small"
                                    @click="open(3)"
                                    type="primary">收费
                         </el-button>
 
                         <el-button v-loading="loadingtwo"
-                                   v-if="(this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
+                                   v-if="(this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
                                    size="small"
                                    @click="open(3)"
                                    type="primary">收费
                         </el-button>
 
                         <el-button size="small" @click="open(4)" type="primary"
-                                   v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
+                                   v-if="this.activeName != 'first' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
                             退费
                         </el-button>
-                        <el-button v-if="this.order.order_status == 2" size="small" @click="open(5)" type="primary"
+                        <el-button v-if="this.activeName != 'first' &&this.order.order_status == 2" size="small" @click="open(5)" type="primary"
                         >结算单
                         </el-button>
 
                         <el-button
-                                v-if="(this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                                v-if="(this.activeName == 'first' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+
+                                size="small" @click="open(9)" type="primary"
+                        >撤销明细
+                        </el-button>
+
+                        <el-button
+                                v-if="(this.activeName != 'first' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
                                 size="small" @click="open(9)" type="primary"
                         >撤销明细
                         </el-button>
 
                         <el-button
-                                v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
+                                v-if="(this.activeName != 'first' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
                                 size="small" @click="open(6)" type="primary"
                         >撤销出院
                         </el-button>
 
                         <el-button
-                                v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                                v-if="(this.activeName != 'first' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                                 size="small" @click="open(7)" type="primary"
                         >撤销入院
                         </el-button>
 
             })
         } else if (index == 9) {
+          let settle_accounts_type = ""
+          if(this.activeName == 'first'){
+
+            settle_accounts_type = 1
+          }else{
+
+            settle_accounts_type = 2
+
+          }
           var that = this
           this.$confirm('是否撤销明细', '撤销明细', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
           }).then(() => {
+
             let params = {
+              'settle_accounts_type':settle_accounts_type,
+              'patient_id':this.patientInfo.id,
+              'his_patient_id':this.hisPatientInfo.id,
+              'record_time': this.record_time,
               'order_id': this.order.id,
               'admin_user_id': this.$store.getters.xt_user.user.id
             }
 
           }).catch(() => {
           })
+        } else if(index == 30){
+          var that = this
+          let params = {
+            'in_hospital_id': that.hisPatientInfo.id,
+            'id': that.patientInfo.id,
+            'admin_user_id': that.$store.getters.xt_user.user.id,
+            'record_time': that.record_date
+
+          }
+          if (this.activeName == 'first') {
+            params['settle_accounts_type'] = 1
+
+          } else {
+            params['start_time'] = that.other_start_time
+            params['end_time'] = that.other_end_time
+            params['settle_accounts_type'] = 2
+
+          }
+          axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.$message.success('上传明细成功')
+                  that.changeRadioAndPatient(1)
+                }
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+
         }
       },