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

           </el-table-column>
 
           <el-table-column
-            prop="heparin"
+            prop="heparin_amount"
             align="center"
-            label="肝素量(ml)"
+            label="肝素量(mg)"
             width="140"
             v-if="isShow('肝素量')"
           >

src/xt_pages/hospitalStation/chargeDetailManagement.vue

                   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[i].id, this.patientTableData[i].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.patientTableData = response.data.data.list_two
 
 
+              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[i].id, this.patientTableData[i].patient_id)
 
-
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.getPatientInformation(this.chargePatientTableData[0].patient_id, this.patientTableData[0].id)
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
+              }
               break
 
           }
                   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)
+                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].patient_id)
 
                   }
                 }
                   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)
+                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].patient_id)
 
                   }
                 }

src/xt_pages/hospitalStation/invoiceTemplate/printOne.vue

         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
-            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money  }}</div>
             <div style="position: absolute;top:110px;left:580px;">门特</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";  
+            n += "00";
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 

src/xt_pages/hospitalStation/summary.vue

                         :value="item.value">
                     </el-option>
                   </el-select>
+
+                  <el-select size="small" v-model="p_type" placeholder="请选择"
+                             style="width:150px;margin-left:10px;" @change="changePType">
+                    <el-option
+                        v-for="(item,index) in p_types"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                  </el-select>
                     <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
                                     @change="handleStartTimeChange" :editable="false" :clearable="false"
                                     style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
 <!--                            退费-->
 <!--                        </el-button>-->
                         <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
-                                   v-if="scope.row.order_status == 2 && scope.row.result.id == 0">
+                                   v-if="scope.row.order_status == 2 && scope.row.result.id == 0 && p_type == 1">
                             上传结算清单
                         </el-button>
+                        <el-button size="mini" type="primary" @click="uploadOtherInfo(scope.row)"
+                                   v-if="scope.row.order_status == 2 && scope.row.result.id == 0 && p_type == 2">
+                          上传结算清单
+                        </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
 
 <!--                        <el-button size="mini" type="primary" @click="refundOne(scope.row)">-->
                 width="1200px"
                 title="打印"
                 :visible.sync="invoiceVisible">
-            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+            <invosuice-print ref="print" :invoiceParams='invoiceParams'></invosuice-print>
         </el-dialog>
         <!-- <el-dialog
                 class="centerDialog"
         invoiceParams: {},
         settlementVisible: false,
         sort_type:1,
+        p_type:1,
         sort_types: [
           { value: 1, label: '处方时间' },
           { value: 2, label: '结算时间' }
         ],
+        p_types:[
+          { value: 1, label: '住院' },
+          { value: 2, label: '门诊' }
+        ],
 
       }
     },
     methods: {
+      uploadOtherInfo(row) {
+        var that = this
+        axios.get('http://127.0.0.1:9532/api/settlelist/get', {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
+          }
+        }).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('上传成功')
+              row.result.id = response.data.data.result.id
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      changePType(){
+        this.page = 1
+        this.keywords = ''
+        this.getHisOrderList()
+      },
       changeSortType(){
         this.page = 1
         this.keywords = ''
         let params = {
           start_time: this.start_time,
           end_time: this.end_time,
-          p_type: 1
+          p_type: this.p_type
         }
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id,
-          p_type: 1,
+          p_type: this.p_type,
           sort_type: this.sort_type
 
         }

src/xt_pages/outpatientCharges/components/chargeDialog.vue

       </el-form-item>
 
       <el-form-item label="个账支出：" prop="age" :validate-event="is_Name" style="width:33%;">
-        <el-input type="number" v-model="form.acc_pay" :disabled="true"></el-input>
+        <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
       </el-form-item>
 
 

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" >
+          <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>
             <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" :paramsObj="invoiceParams"></printFive>
+          <printFive v-if="org_id == 10188 || org_id == 0" :paramsObj="invoiceParams"></printFive>
         </div>
     </div>
   </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

             <div :style="{position: 'absolute',top:(315 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
             <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(330 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%'}">
                 <div style="display:flex;">
-                    <div style="width:140px">医疗总费用：{{ list.medfee_sumamt }}</div>
-                    <div style="width:140px">现金支出：{{ list.psn_cash_money }}</div>
-                    <div style="width:140px">上次账户：0</div>
-                    <div style="width:140px">本次账户：0</div>
-                </div>
-                <div style="display:flex;">
-                    <div style="width:140px">账户余额：{{ list.order.balc }}</div>
-                    <div style="width:140px">统筹支出：{{ list.order.hifp_pay }}</div>
-                    <div style="width:140px">大病支出：0</div>
-                    <div style="width:140px">民政支出：0</div>
+                  <div style="width:150px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+                  <div style="width:150px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+                  <div style="width:150px">统筹支出：{{ list.order.hifp_pay }}</div>
+                  <div style="width:150px">大病支出：{{list.order.hifmi_pay}}</div>
+
                 </div>
                 <div style="display:flex;">
-                    <div style="width:140px">大病补充保险支出：0</div>
-                    <div style="width:280px">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
-                    <div style="width:140px">其他支出：{{ list.order.oth_pay }}</div>
+                  <div style="width:150px">个人账户支付：{{ list.order.acct_pay }}</div>
+                  <div style="width:150px">现金支出：{{ list.order.psn_cash_pay }}</div>
+                  <div style="width:150px">本次账户：0</div>
+                  <div style="width:150px">上次账户：0</div>
                 </div>
+              <div style="display:flex;">
+                <div style="width:150px">账户余额：{{ list.order.balc }}</div>
+                <div style="width:150px">其他支出：{{ list.order.oth_pay }}</div>
+                <div style="width:150px">大病补充保险支出：0</div>
+                <div style="width:150px">民政支出：0</div>
+              </div>
+              <div style="display:flex;">
+                <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>
+                <div style="width:280px">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
+              </div>
+
             </div>
             <div>
                 <div :style="{position: 'absolute',top:(390 + (index * 400))  + 'px',left:100+ 'px'}">{{ org_name }}</div>
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";  
+            n += "00";
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                           >
 
                             <el-button
-                                v-if="radio == 1"
+                           su     v-if="radio == 1"
                                 size="small"
                                 @click="openDialog(item)"
                                 type="primary"

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/index.vue

       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <prisntOne :printData="printData"></prisntOne>
+        <printOne :printData="printData"></printOne>
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

     <div>
         <div id='prescription-print3' class="prescription-print">
           <div v-for="(i,index) in printData">
-            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
-             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+<!--            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">-->
+<!--/*             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">*/-->
             <div class="printTitle">检验申请单</div>
 
             <div style="border:1px solid #000;">
                     <div>医生签字：{{ i.info.doctor ? i.info.doctor : '' }}</div>
                 </div>
             </div>
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
-            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+<!--            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">-->
+<!--            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">-->
         </div>
       </div>
     </div>
         })
 
         this.total = total.toFixed(2)
-        this.pre_time = prescriptions[0].pre_time
-        this.doctor = prescriptions[0].doctor
         this.projectPrint = data
         return data
      },

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

                         format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期时间" align="right"></el-date-picker>
-        <!-- <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
+       <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
         <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button> -->
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
       </div>
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>