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

src/api/his/his_hospital.js

   });
 }
 
+
+export function refundDetail(params) {
+  return request({
+    url: "/api/hospital/refunddetail",
+    method: "get",
+    params:params
+  });
+}
+
+
+

src/views/layout/Layout.vue

           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-
        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
          <i class="iconfont icon-kccx navIcon"></i>
          <p>采购管理</p>
       </div>
-
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/hospitalStation/chargeDetailManagement.vue

             >撤销明细
             </el-button>
 
+
+
+            <el-button
+                v-if="( this.radio == 2 &&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(2)" type="primary"
+            >撤销明细
+            </el-button>
+
+
           </div>
           <div v-if="activeName == 'second'">
 
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
 import additionalCharges from './components/additionalCharges'
 import { getHisHospitalDetailInfo, getHisHospitalDetailList, getMonthHisHospitalDetailInfo } from '@/api/his/his'
-import { upLoadChargeInfo } from '@/api/his/his_hospital'
+import { upLoadChargeInfo,refundDetail } from '@/api/his/his_hospital'
 
 import { uParseTime } from '@/utils/tools'
 
             cancelButtonText: '取 消',
             type: 'warning'
           }).then(() => {
-
-            let params = {
-              'settle_accounts_type': settle_accounts_type,
-              'patient_id': that.hisPatientInfo.patient_id,
-              'his_patient_id': that.hisPatientInfo.id,
-              'record_time': that.record_date,
-              'admin_user_id': that.$store.getters.xt_user.user.id
-            }
-            axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
-              params: params
-            })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    that.loadingtwo = false
-                    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(() => {
-                      })
+            if (that.hisPatientInfo.balance_accounts_type != 2){
+              let params = {
+                'settle_accounts_type': settle_accounts_type,
+                'patient_id': that.hisPatientInfo.patient_id,
+                'his_patient_id': that.hisPatientInfo.id,
+                'record_time': that.record_date,
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
+                params: params
+              })
+                  .then(function(response) {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      that.loadingtwo = false
+                      return false
                     } else {
-                      that.$message.success('撤销明细成功')
-                      that.radio = 1
-                      that.getPatientList()
-                    }
+                      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.radio = 1
+                        that.getPatientList()
+                      }
 
-                  }
-                })
-                .catch(function(error) {
-                })
+                    }
+                  })
+                  .catch(function(error) {
+                  })
+
+
+            }else{
+              let params = {
+                'settle_accounts_type': settle_accounts_type,
+                'patient_id': that.hisPatientInfo.patient_id,
+                'his_patient_id': that.hisPatientInfo.id,
+                'record_time': that.record_date,
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              refundDetail(params).then(response => {
+                if (response.data.state == 0) {
+                  this.loading = false
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  that.$message.success('撤销明细成功')
+                  that.radio = 1
+                  that.getPatientList()
+                }
+              })
 
+            }
           }).catch(() => {
           })
         } else {
               that.changePatientInfo()
             }
           })
-
-
         }
       }
     }, changePatientInfo() {

src/xt_pages/hospitalStation/components/deskPrescription.vue

       for (let i = 0; i < this.month_prescriptions.length; i++) {
         if (this.month_prescriptions[i].advices != null) {
           for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
-            total = total.toFixed(2) + (this.month_prescriptions[i].advices[a].retail_price * this.month_prescriptions[i].advices[a].prescribing_number).toFixed(2)
+            total = total + (this.month_prescriptions[i].advices[a].retail_price.toFixed(2) * this.month_prescriptions[i].advices[a].prescribing_number)
           }
         }
         if (this.month_prescriptions[i].project != null) {
           for (let b = 0; b < this.month_prescriptions[i].project.length; b++) {
-            total = total.toFixed(2) + (this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total).toFixed(2)
+            total = total+ (this.month_prescriptions[i].project[b].price.toFixed(2) * this.month_prescriptions[i].project[b].total)
           }
         }
 

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column align="center" prop="name" label="名称">
+      <el-table-column align="center" prop="name" width="100" label="名称">
         <template slot-scope="scope"
           ><span :title="scope.row.drug_name">{{
             scope.row.drug_name
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column align="center" prop="project_name" label="名称">
+      <el-table-column align="center" prop="project_name" width="100" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

       if (this.curPrescriptions.type == 1) {
         if (this.curPrescriptions.advices != null) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)
+            total = parseFloat(total) + parseFloat(this.curPrescriptions.advices[a].retail_price  * this.curPrescriptions.advices[a].prescribing_number)
 
           }
         }
       if (this.curMonthPrescriptions.type == 1) {
         if (this.curMonthPrescriptions.advices != null) {
           for (let a = 0; a < this.curMonthPrescriptions.advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.advices[a].retail_price * this.curMonthPrescriptions.advices[a].prescribing_number)
+            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.advices[a].retail_price* this.curMonthPrescriptions.advices[a].prescribing_number)
 
           }
         }
       } else {
         if (this.curMonthPrescriptions.project != null) {
           for (let b = 0; b < this.curMonthPrescriptions.project.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.project[b].price * this.curMonthPrescriptions.project[b].total)
+            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.project[b].price  * this.curMonthPrescriptions.project[b].total)
 
           }
         }
       } else {
         if (this.curSettlePrescriptions.project != null) {
           for (let b = 0; b < this.curSettlePrescriptions.project.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.project[b].price * this.curSettlePrescriptions.project[b].total)
+            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.project[b].price  * this.curSettlePrescriptions.project[b].total)
 
           }
         }
 
     },
     getSettleTotal() {
-      var total = 0
+      var total = 0.0
       for (let i = 0; i < this.settle_prescriptions.length; i++) {
         if (this.settle_prescriptions[i].advices != null) {
           for (let a = 0; a < this.settle_prescriptions[i].advices.length; a++) {
+            // console.log(parseFloat(this.settle_prescriptions[i].advices[a].retail_price.toFixed(2)))
+            // console.log(this.settle_prescriptions[i].advices[a].prescribing_number)
             total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].advices[a].retail_price * this.settle_prescriptions[i].advices[a].prescribing_number)
+
+            // console.log(parseFloat(this.settle_prescriptions[i].advices[a].retail_price.toFixed(2) * this.settle_prescriptions[i].advices[a].prescribing_number))
+            // total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].advices[a].retail_price).toFixed(2) * this.settle_prescriptions[i].advices[a].prescribing_number
           }
         }
         if (this.settle_prescriptions[i].project != null) {
           for (let b = 0; b < this.settle_prescriptions[i].project.length; b++) {
+            total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].project[b].price  * this.settle_prescriptions[i].project[b].total)
 
-            total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].project[b].price * this.settle_prescriptions[i].project[b].total)
+            // total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].project[b].price.toFixed(2))* this.settle_prescriptions[i].project[b].total
           }
         }
 
       }
-      return total.toFixed(2)
+      return total
 
     },
     getTotal() {
         if (this.prescriptions[i].project != null) {
           for (let b = 0; b < this.prescriptions[i].project.length; b++) {
 
-            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total)
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].price  * this.prescriptions[i].project[b].total)
           }
         }
 
         if (this.month_prescriptions[i].project != null) {
           for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
 
-            total = parseFloat(total) + parseFloat(this.month_prescriptions[i].project[a].price * this.month_prescriptions[i].project[a].total)
+            total = parseFloat(total) + parseFloat(this.month_prescriptions[i].project[a].price  * this.month_prescriptions[i].project[a].total)
           }
         }
 
 
       this.curMonthPrescriptions = this.month_prescriptions[0]
 
+
+    },
+    setSettlePrescriptionTwo(month_prescriptions) {
+      this.settle_prescriptions = []
+
+      for (let i = 0; i < month_prescriptions.length; i++) {
+        var prescription = month_prescriptions[i]
+        let tempAdvice = []
+        let tempProject = []
+        let tempAddition = []
+        for (let b = 0; b < prescription.advices.length; b++) {
+          let spec = prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number + prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
+          let obj = {
+            advice_id: prescription.advices[b].id,
+            drug_name: prescription.advices[b].advice_name,
+            single_dose: prescription.advices[b].single_dose,
+            delivery_way: prescription.advices[b].delivery_way,
+            execution_frequency: prescription.advices[b].execution_frequency,
+            retail_price: prescription.advices[b].price.toString(),
+            remark: prescription.advices[b].remark,
+            day: prescription.advices[b].day,
+            prescribing_number: prescription.advices[b].prescribing_number.toString(),
+            single_dose_unit: prescription.advices[b].single_dose_unit,
+            prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+            medical_insurance_number: prescription.advices[b].med_list_codg,
+
+            code: prescription.advices[b].drug.medical_insurance_number,
+            spec: spec,
+            det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+            name_id: prescription.advices[b].drug.manufacturer,
+            fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+            overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+            preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+            inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+
+
+
+          }
+          tempAdvice.push(obj)
+        }
+
+        for (let b = 0; b < prescription.project.length; b++) {
+          let obj = {
+            id: prescription.project[b].id,
+            project_id: prescription.project[b].project.id,
+            // project_name: prescription.project[b].project.project_name,
+            // statistical_classification: prescription.project[b].project.statistical_classification,
+            single_dose: prescription.project[b].single_dose,
+            delivery_way: prescription.project[b].delivery_way,
+            execution_frequency: prescription.project[b].execution_frequency,
+            number_days: prescription.project[b].day,
+            total: prescription.project[b].count.toString(),
+            price: prescription.project[b].price,
+            remark: prescription.project[b].remark,
+            // medical_code: prescription.project[b].project.medical_code,
+            unit: prescription.project[b].project.unit,
+            type: prescription.project[b].type,
+            det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+            fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+            overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+            preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+            inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+
+          }
+
+          if (prescription.project[b].type == 2) {
+            obj['statistical_classification'] = prescription.project[b].team.project_team
+            obj['medical_code'] = prescription.project[b].project.medical_code
+            obj['project_name'] = prescription.project[b].project.project_name
+            obj['spec'] = ''
+            obj['name_id'] = 0
+
+          } else if (prescription.project[b].type == 3) {
+            obj['statistical_classification'] = prescription.project[b].team.project_team
+            obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+            obj['project_name'] = prescription.project[b].good_info.good_name
+            obj['spec'] = prescription.project[b].good_info.specification_name
+            obj['name_id'] = prescription.project[b].good_info.manufacturer
+
+          }
+
+          tempProject.push(obj)
+        }
+
+        let index = i + 1
+        let obj = {
+          id: prescription.id,
+          name: '处方' + index,
+          advices: tempAdvice,
+          project: tempProject,
+          addition: tempAddition,
+          order_status: prescription.order_status,
+          type: prescription.type
+        }
+        this.settle_prescriptions.push(obj)
+        this.curSettlePrescriptions = this.settle_prescriptions[0]
+        for (let i = 0; i < this.settle_prescriptions.length; i++) {
+          if (this.settle_prescriptions[i].order_status != 4) {
+            this.isShowUpload = 2
+          }
+
+        }
+
+      }
     },
+
     setSettlePrescription(month_prescriptions) {
       this.settle_prescriptions = []
 

src/xt_pages/hospitalStation/summary.vue

                 width="1200px"
                 title="打印"
                 :visible.sync="statementVisible">
-            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+            <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
+<!--            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>-->
+<!--          <state-->
         </el-dialog>
         <el-dialog
                 class="centerDialog"
                 width="1200px"
                 title="打印"
                 :visible.sync="statementVisible9504">
+
             <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
             <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
             <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
   import invoicePrint from './invoicePrint'
+  import statementPrint from './statementPrint'
+
   // import settlementPrint from './settlementPrint'
 
   export default {
       BreadCrumb,
       listPrint,
       allListPrint,
+      statementPrint,
       invoicePrint
       // settlementPrint
     },

src/xt_pages/outpatientCharges/invoicePrint.vue

     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 0" >
-            <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217  && org_id != 0" >
+            <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
-          <printFive v-if="org_id == 10188 || org_id == 0" :paramsObj="invoiceParams"></printFive>
+          <printFive v-if="org_id == 10188 || org_id == 0 ||org_id == 10217" :paramsObj="invoiceParams"></printFive>
         </div>
     </div>
   </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

                 this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
                                     this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                if(this.totalPrice == 0){
+
+                  this.totalPrice = this.list.medfee_sumamt
+                }
                 this.smalltoBIG(this.totalPrice)
                 var data = new Date(res.data.data.date * 1000);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>
         <td>收款人:</td>
         <td colspan="2">{{info.charge_admin.user_name}}</td>
         <td>审核人:</td>
-        <td colspan="2">{{info.p_admin.user_name}}</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td>
+
         <td>制单人:</td>
         <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>打印日期</td>