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/details/dialog/computer_dialog.vue

         </el-form-item>
 
      
-        <el-form-item label="引血(ml/min)" v-if="template_id == 6">
+        <el-form-item label="引血(ml/min)" v-if="template_id == 6 && org_id != 10223">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
 
           { id: 3, name: '晚上' }
         ], // 该排班的区里的床位
         isPremission: false,
-        adminRoles:[{id:0,name:"请选择"}]
+        adminRoles:[{id:0,name:"请选择"}],
+        org_id:0
       }
     },
     props: {
     created() {
 
       this.template_id = this.$store.getters.xt_user.template_info.template_id
+      this.org_id = this.$store.getters.xt_user.template_info.org_id
       this.patient_id = this.$route.query.patient_id
       this.schedule_date = this.$route.query.date
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       </div>
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id != 10223">
                     <div class="inline_block" style="flex:1; display:inline-block;">
                       备注：
                       <div class="under_line" style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;">
                       kg
                     </div>
 
-                    <div class="inline_block" style="flex:1;">
+                    <div class="inline_block" style="flex:1;" v-if="org_id != 10223">
                       透析中入量：
                       <div class="under_line" style="width: 70px;text-align: center">
                         {{ afterdialysis.dialysis_intakes ? afterdialysis.dialysis_intakes : "/" }}
                       ml
                     </div>
                   </div>
+                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10223">
+                    <div class="inline_block" style="flex:1;">
+                      动脉管道：
+                      <div class="under_line" style="width: 100px;text-align: center">
+                        <span v-if="afterdialysis.arterial_tube == 0">/</span>
+                        <span v-if="afterdialysis.arterial_tube == 1">动脉管道0</span>
+                        <span v-if="afterdialysis.arterial_tube == 2">动脉管道+</span>
+                        <span v-if="afterdialysis.arterial_tube == 3">动脉管道++</span>
+                        <span v-if="afterdialysis.arterial_tube == 4">动脉管道+++</span>
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      静脉管道：
+                      <div class="under_line" style="width: 100px;text-align: center">
+                        <span v-if="afterdialysis.intravenous_tube == 0">/</span>
+                        <span v-if="afterdialysis.intravenous_tube == 1">静脉管道0</span>
+                        <span v-if="afterdialysis.intravenous_tube == 2">静脉管道+</span>
+                        <span v-if="afterdialysis.intravenous_tube == 3">静脉管道++</span>
+                        <span v-if="afterdialysis.intravenous_tube == 4">静脉管道+++</span>
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      并发症：
+                      <div class="under_line" style="width: 170px;text-align: center">
+                        {{ afterdialysis.complication ? afterdialysis.complication : "/" }}
+                      </div>
+                    </div>
+                  </div>
+                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10223">
+                    <div class="inline_block" style="flex:1;">
+                      穿刺处血肿：
+                      <div class="under_line" style="width: 50px;text-align: center">
+                        <span v-if="afterdialysis.puncture_point_haematoma == 0">/</span>
+                        <span v-if="afterdialysis.puncture_point_haematoma == 1">有</span>
+                        <span v-if="afterdialysis.puncture_point_haematoma == 2">无</span>
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      中心静脉封管(肝素-A端):
+                      <div class="under_line" style="width: 70px;text-align: center">
+                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      中心静脉封管(肝素-V端):
+                      <div class="under_line" style="width: 70px;text-align: center">
+                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
+                      </div>
+                    </div>
+                  </div>
 
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1; display:inline-block;">
                       </div>
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id != 10223">
                     <div class="inline_block" style="flex:1; display:inline-block;">
                       备注：
                       <div class="under_line" style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;">
         this.$message.error('透前脉搏未填')
       }else if(this.predialysis.breathing_rate == ""){
         this.$message.error('透前呼吸频率未填')
-      }else if((this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0) && this.org_id == 9987){
+      }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
         this.$message.error('透前血压未填完整')
       }else if(this.predialysis.puncture_way == ''){
         this.$message.error('穿刺方式未填')
         this.$message.error('透后脉搏未填')
       }else if(this.afterdialysis.breathing_rate == 0){
         this.$message.error('透后呼吸频率未填')
-      }else if((this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0) && this.org_id == 9987){
+      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
         this.$message.error('透后血压未填完整')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

         this.$message.error('透后脉搏未填')
       }else if(this.afterdialysis.breathing_rate == 0){
         this.$message.error('透后呼吸频率未填')
-      }else if((this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0) && this.org_id == 9987){
+      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
         this.$message.error('透后血压未填完整')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

         this.$message.error('并发症未填')
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('透析小结未填')
-      }else if(this.afterdialysis.patient_gose == ""){
+      }else if(this.afterdialysis.patient_gose == 0){
         this.$message.error('患者去向未填')
       }else if(this.dialysisOrder.start_nurse == 0){
         this.$message.error('当班责任护士未填')

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) {
+
+            })
+
         }
       },
 

src/xt_pages/outpatientCharges/summary.vue

             <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
                 <div>
                     <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-                               <!--@click="Action">-->
-                        <!--导出-->
+                    <!--@click="Action">-->
+                    <!--导出-->
                     <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
           settle_type: row.settle_type,
           start_time: row.settle_start_time,
           end_time: row.settle_end_time,
-          balance_accounts_type:row.his_patient.balance_accounts_type
+          balance_accounts_type: row.his_patient.balance_accounts_type
         }
         this.orderObj = obj
 
               }
 
               if (order.his_patient != null) {
-                if (order.his_patient.balance_accounts_type == 1) {
+                if (order.his_patient.balance_accounts_type == 2) {
                   balance_accounts = '自费'
                 }
 
-                if (order.his_patient.balance_accounts_type == 2) {
+                if (order.his_patient.balance_accounts_type == 1) {
                   balance_accounts = '医保'
                 }
               }
 
               var hifmi_pay = 0.00
 
-              if (order.setl_detail.length > 0) {
+              console.log(order.setl_detail)
+              if (order.setl_detail && order.setl_detail.length > 0) {
                 var jsonObj = JSON.parse(order.setl_detail)
-                for (let i = 0; i < jsonObj.length; i++) {
-                  if (order.insutype == '310') {
-                    if (jsonObj[i].fund_pay_type == '310300') {
-                      hifmi_pay = jsonObj[i].fund_payamt
-                    }
-
-                  } else if (order.insutype == '390') {
-                    if (order.fund_pay_type == '390200') {
-                      hifmi_pay = jsonObj[i].fund_payamt
+                console.log(jsonObj)
+                if (jsonObj != null) {
+
+                  for (let i = 0; i < jsonObj.length; i++) {
+                    if (order.insutype == '310') {
+                      if (jsonObj[i].fund_pay_type == '310300') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
+                    } else if (order.insutype == '390') {
+                      if (order.fund_pay_type == '390200') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
                     }
                   }
                 }
               }
               var hifmi_pay = 0.00
 
-              if (order.setl_detail.length > 0) {
+              console.log(order.setl_detail)
+              if (order.setl_detail && order.setl_detail.length > 0) {
                 var jsonObj = JSON.parse(order.setl_detail)
-                for (let i = 0; i < jsonObj.length; i++) {
-                  if (order.insutype == '310') {
-                    if (jsonObj[i].fund_pay_type == '310300') {
-                      hifmi_pay = jsonObj[i].fund_payamt
+                if (jsonObj != null) {
+                  for (let i = 0; i < jsonObj.length; i++) {
+                    if (order.insutype == '310') {
+                      if (jsonObj[i].fund_pay_type == '310300') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
                     }
-                  }
-                  if (order.insutype == '390') {
-                    if (jsonObj[i].fund_pay_type == '390200') {
-                      hifmi_pay = jsonObj[i].fund_payamt
+                    if (order.insutype == '390') {
+                      if (jsonObj[i].fund_pay_type == '390200') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
                     }
                   }
                 }
         this.page = 1
         this.keywords = ''
         this.getHisOrderList()
-      },Action(){
+      }, Action() {
         getAllOrders().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             let list = []
             for (let i = 0; i < response.data.data.order.length; i++) {
 
-
               var hifmi_pay = 0.00
               for (let b = 0; b < order.order_info.length; b++) {
-                let item_name = ""
-                let item_code = ""
-                let price = ""
-                let unit = ""
-                let spec = ""
-                let time = ""
-                let name = ""
-                let selfpay_prop = ""
-                if(order.order_info[b].advice.id == 0 && order.order_info[b].project.id > 0){
+                let item_name = ''
+                let item_code = ''
+                let price = ''
+                let unit = ''
+                let spec = ''
+                let time = ''
+                let name = ''
+                let selfpay_prop = ''
+                if (order.order_info[b].advice.id == 0 && order.order_info[b].project.id > 0) {
                   item_name = order.order_info[b].project.project.project_name
-                  item_code =  order.order_info[b].project.project.medical_code
+                  item_code = order.order_info[b].project.project.medical_code
                   price = order.order_info[b].pric
                   unit = order.order_info[b].project.project.unit
-                }else if(order.order_info[b].advice.id > 0 && order.order_info[b].project.id == 0){
+                } else if (order.order_info[b].advice.id > 0 && order.order_info[b].project.id == 0) {
                   item_name = order.order_info[b].advice.advice_name
-                  item_code =  order.order_info[b].advice.drug.medical_insurance_number
+                  item_code = order.order_info[b].advice.drug.medical_insurance_number
                   price = order.order_info[b].pric
                   unit = order.order_info[b].advice.prescribing_number_unit
 
-
                 }
                 selfpay_prop = order.order_info[b].selfpay_prop
 
                 let obj = {
                   '项目名称': item_name,
-                  '项目编码': "",
+                  '项目编码': '',
                   '医保编码': item_code,
                   '零售价': price,
                   '单位': unit,
-                  '规格': "",
+                  '规格': '',
                   '收费时间': time,
                   '报销比例': selfpay_prop,
-                  '患者名称': name,
+                  '患者名称': name
                 }
 
                 list.push(obj)
           }
         })
 
-
       },
       searchAction() {
         this.page = 1

src/xt_pages/outpatientTool/components/detail.vue

         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div> -->
-        <div>
-            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-                <div>
-                    <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-                    <!--@click="Action">-->
-                    <!--导出-->
-                    <!--</el-button>-->
-                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                              @keyup.enter.native='searchAction'
-                              placeholder="请输入患者姓名"
-                              class="filter-item"/>
-                    <el-select size="small" v-model="item_type" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeItem">
-                        <el-option
-                                label="全部"
-                                value="0">
-                        </el-option>
-                        <el-option
-                                v-for="item,index in items"
-                                :key="index"
-                                :label="item.name"
-                                :value="item.id">
-                        </el-option>
-                    </el-select>
-                    <el-date-picker
-                            v-model="chargeDate"
-                            type="daterange"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            @change="changeDate"
-                            end-placeholder="结束日期">
-                    </el-date-picker>
-                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
-                </div>
-                <div>
-                    <!-- <el-popover
-                      placement="bottom"
-                      width="210"
-                      trigger="click">
-                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-                    </el-popover> -->
-                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
-                </div>
+    <div>
+        <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+                <!--@click="Action">-->
+                <!--导出-->
+                <!--</el-button>-->
+                <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                          @keyup.enter.native='searchAction'
+                          placeholder="请输入患者姓名"
+                          class="filter-item"/>
+                <el-select size="small" v-model="item_type" placeholder="请选择"
+                           style="width:150px;margin-left:10px;" @change="changeItem">
+                    <el-option
+                            label="全部"
+                            value="0">
+                    </el-option>
+                    <el-option
+                            v-for="item,index in items"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+                <el-date-picker
+                        v-model="chargeDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        @change="changeDate"
+                        end-placeholder="结束日期">
+                </el-date-picker>
+                <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+                <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+            </div>
+            <div>
+                <!-- <el-popover
+                  placement="bottom"
+                  width="210"
+                  trigger="click">
+                  <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                  <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                  <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+                </el-popover> -->
+                <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
             </div>
-            <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
-                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                      :span-method="merge"
-                      show-summary
-                      :summary-method="getTotal"
-                      max-height="600"
-
-                      v-loading="detail_loading"
-                      highlight-current-row>
-
-                <el-table-column align="center" prop="name" label="患者名字">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
-                </el-table-column>
-                <!--<el-table-column align="center" prop="name" label="患者类型">-->
-                <!--<template slot-scope="scope"></template>-->
-                <!--</el-table-column>-->
-
-                <el-table-column align="center" prop="name" label="项目名称">
-                    <template slot-scope="scope">{{scope.row.item_name}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="数量">
-                    <template slot-scope="scope">{{scope.row.count}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="单价">
-                    <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="费用">
-                    <template slot-scope="scope">
-                        <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
-                    </template>
-                </el-table-column>
-
-                <el-table-column align="center" prop="total" label="费用总额">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.total.toFixed(2)}}</div>
-                    </template>
-                </el-table-column>
-
-            </el-table>
         </div>
+        <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  :span-method="merge"
+                  show-summary
+                  :summary-method="getTotal"
+                  max-height="600"
+
+                  v-loading="detail_loading"
+                  highlight-current-row>
+
+            <el-table-column align="center" prop="name" label="患者名字">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+            <!--<el-table-column align="center" prop="name" label="患者类型">-->
+            <!--<template slot-scope="scope"></template>-->
+            <!--</el-table-column>-->
+
+            <el-table-column align="center" prop="name" label="项目名称">
+                <template slot-scope="scope">{{scope.row.item_name}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="数量">
+                <template slot-scope="scope">{{scope.row.count}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="单价">
+                <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="费用">
+                <template slot-scope="scope">
+                    <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="total" label="费用总额">
+                <template slot-scope="scope">
+                    <div>{{scope.row.total.toFixed(2)}}</div>
+                </template>
+            </el-table-column>
+
+        </el-table>
+    </div>
 
     <!-- </div> -->
 </template>
     },
     data() {
       return {
-        detail_loading:false,
+        detail_loading: false,
         tempArr: [],
-        pos:0,
+        pos: 0,
 
         sameRowArr: [],
         keywords: '',
         items: [
           { id: 1, name: '药品' },
           { id: 2, name: '项目' },
-          { id: 3, name: '耗材' },
+          { id: 3, name: '耗材' }
 
         ]
 
                     // newObj['item_name'] = orders[b].order_info[c].advice.advice_name
                     newObj['item_id'] = orders[b].order_info[c].advice.drug_id
 
-                    if(orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
-                      newObj['item_name'] = orders[b].order_info[c].advice.advice_name + "（ " + orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + "*" + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + "/" + orders[b].order_info[c].advice.drug.max_unit + " ）"
-                    }else{
+                    if (orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
+                      newObj['item_name'] = orders[b].order_info[c].advice.advice_name + '（ ' + orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit + ' ）'
+                    } else {
 
-                      newObj['item_name'] = ""
+                      newObj['item_name'] = ''
                     }
 
-
                   }
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
                     newObj['type'] = 2
                     if (orders[b].order_info[c].project.type == 2) {
                       newObj['item_name'] = orders[b].order_info[c].project.project.project_name
 
-
                     } else if (orders[b].order_info[c].project.type == 3) {
-                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + "（ "+ orders[b].order_info[c].project.good_info.specification_name+" ）"
-
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + '（ ' + orders[b].order_info[c].project.good_info.specification_name + ' ）'
 
                     }
                   }
               tempPatientsTwo.push(obj)
             }
 
-
             for (let d = 0; d < tempPatientsTwo.length; d++) {
               tempPatientsTwo[d]['new_order_info'] = []
               let project = []
                     count = count + tempPatientsTwo[d].order_info[a].count
                   }
                 }
+
+
+
                 obj['price'] = project[i].price
                 obj['type'] = project[i].type
                 obj['item_name'] = project[i].item_name
                     count = count + tempPatientsTwo[d].order_info[a].count
                   }
                 }
+
                 obj['price'] = advice[i].price
                 obj['type'] = advice[i].type
                 obj['item_name'] = advice[i].item_name
               let total = 0
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                new_name=new_name.replace("（ ","");
-                new_name=new_name.replace(" ）","");
+                new_name = new_name.replace('（ ', '')
+                new_name = new_name.replace(' ）', '')
                 if (new_name.length != 0) {
                   total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
                 }
               }
               tempPatientsTwo[i]['total'] = total
             }
-            console.log('tempPatientsTwo',tempPatientsTwo)
+            console.log('tempPatientsTwo', tempPatientsTwo)
             for (let i = 0; i < tempPatientsTwo.length; i++) {
               // console.log(111,tempPatientsTwo[i].total)
-              if(tempPatientsTwo[i].new_order_info.length > 0){
+              if (tempPatientsTwo[i].new_order_info.length > 0) {
 
+                for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                  let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                  console.log('2 ' + new_name)
 
-              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                new_name=new_name.replace("（ ","");
-                new_name=new_name.replace(" ）","");
+                  new_name = new_name.replace('（ ', '')
+                  new_name = new_name.replace(' ）', '')
 
-                if (new_name.length != 0) {
-                  let obj = {
-                    name: tempPatientsTwo[i].name,
-                    patient_id: tempPatientsTwo[i].patient_id,
-                    price: tempPatientsTwo[i].new_order_info[b].price,
-                    type: tempPatientsTwo[i].new_order_info[b].type,
-                    item_name: tempPatientsTwo[i].new_order_info[b].item_name,
-                    item_id: tempPatientsTwo[i].new_order_info[b].item_id,
-                    count: tempPatientsTwo[i].new_order_info[b].count,
+                  if (new_name.length != 0) {
+                    let obj = {
+                      name: tempPatientsTwo[i].name,
+                      patient_id: tempPatientsTwo[i].patient_id,
+                      price: tempPatientsTwo[i].new_order_info[b].price,
+                      type: tempPatientsTwo[i].new_order_info[b].type,
+                      item_name: tempPatientsTwo[i].new_order_info[b].item_name,
+                      item_id: tempPatientsTwo[i].new_order_info[b].item_id,
+                      count: tempPatientsTwo[i].new_order_info[b].count
 
+                    }
+
+                    // if(b == 0){
+                    obj['total'] = tempPatientsTwo[i].total
+                    // }else{
+                    //   obj['total'] = 0
+                    // }
+                    this.tableData.push(obj)
                   }
 
-                  // if(b == 0){
-                    obj['total'] =  tempPatientsTwo[i].total
-                  // }else{
-                  //   obj['total'] = 0
-                  // }
-                  this.tableData.push(obj)
                 }
-
-              }
               }
             }
             this.handleSpanTempArr()
           let item_name = order.item_name
           let count = order.count
           let price = order.price.toFixed(2)
-          let pay_sumamt = (order.price.toFixed(2)*order.count).toFixed(2)
+          let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
           let total = order.total.toFixed(2)
 
-
           let obj = {
             '患者姓名': name,
             '项目名称': item_name,
             '数量': count,
             '单价': price,
             '费用': pay_sumamt,
-            '费用总额':total,
+            '费用总额': total
           }
           list.push(obj)
         }
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = [ '患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
-          const filterVal = [ '患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+          const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+          const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel1({
             header: tHeader,
             data,
             filename: '明细',
-            ref:this.$refs['table'].$el
+            ref: this.$refs['table'].$el
           })
         })
 
             // sums[index] = sums[index].toFixed(2)
             let num = 0
             data.map(item => {
-              num += item.price.toFixed(2)*item.count
+              num += item.price.toFixed(2) * item.count
             })
             sums[index] = num.toFixed(2)
           } else {
         })
 
         return sums
-      },
+      }
     },
     created() {
       this.getSummaryDetailList()