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

src/xt_pages/hospitalStation/summary.vue

@@ -31,6 +31,16 @@
                         :value="item.value">
                     </el-option>
                   </el-select>
+
+                  <el-select size="small" v-model="charge_type" placeholder="请选择"
+                             style="width:150px;margin-left:10px;" @change="changeChargeType">
+                    <el-option
+                        v-for="(item,index) in charge_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="选择开始日期"
@@ -277,6 +287,7 @@
         settlementVisible: false,
         sort_type:1,
         p_type:1,
+        charge_type:0,
         sort_types: [
           { value: 1, label: '处方时间' },
           { value: 2, label: '结算时间' }
@@ -285,6 +296,10 @@
           { value: 0, label: '全部' },
           { value: 1, label: '住院' },
           { value: 2, label: '门诊' }
+        ],charge_types:[
+          { value: 0, label: '全部' },
+          { value: 1, label: '医保' },
+          { value: 2, label: '自费' }
         ],
         shouJuVisible:false,
 
@@ -322,6 +337,11 @@
           }
         }).catch(function(error) {
         })
+      },changeChargeType(){
+        this.page = 1
+        this.keywords = ''
+        this.getHisOrderList()
+
       },
       changePType(){
         this.page = 1
@@ -839,7 +859,8 @@
           end_time: this.end_time,
           type: this.admin_user_id,
           p_type: this.p_type,
-          sort_type: this.sort_type
+          sort_type: this.sort_type,
+          charge_type: this.charge_type
 
         }
         getHisOrderList(params).then(response => {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -53,7 +53,7 @@
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
             <el-table-column align="center" prop="name" label="姓名" wdith='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">{{ scope.$index + 1 }}.{{ scope.row.name }}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
@@ -83,7 +83,7 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="this.$store.getters.xt_user.org_id == 10340">
+          <div v-if="org_id == 10340">
                         <el-button size="small"
                                    @click="openZb(1)"
                                    type="primary">登记
@@ -102,7 +102,7 @@
           </div>
 
 
-          <div  v-if="this.$store.getters.xt_user.org_id != 10340">
+          <div  v-if="org_id != 10340">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
@@ -185,14 +185,14 @@
                             <div style="margin-bottom:10px;float: right">
                               <div>
                                 <el-button
-                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && this.$store.getters.xt_user.org_id != 10340)"
+                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
                                     size="small"
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
                                 >预结算
                                 </el-button>
                                 <el-button
-                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10340"
+                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
                                     size="small"
                                     @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
@@ -203,7 +203,7 @@
 
 
                                 <el-button v-loading="loadingtwo"
-                                           v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3)&&this.$store.getters.xt_user.org_id != 10340"
+                                           v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3)&& org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
                                            type="primary">收费