处理

src/store/getters.js

@@ -19,7 +19,7 @@ const getters = {
   configlist: state => state.data.configlist,
 
   dictionary_configlist: state => state.data.dictionary_configlist,
-
+  pagedata:state => state.pagedata,
 
   xt_permission: state => state.xt_permission,
   xt_user: state => state.xt_user,

src/store/index.js

@@ -14,9 +14,14 @@ import getters from './getters'
 import data from './modules/data'
 import temp_params from './modules/temp_params'
 
+import pagedata from './modules/pagedata'
+
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
+
+  mutations:{
+  },
   modules: {
     app,
     errorLog,
@@ -28,9 +33,11 @@ const store = new Vuex.Store({
     xt_permission,
     xt_role_temps,
     global_config,
-    temp_params
+    temp_params,
+    pagedata
   },
   getters
+
 })
 
 // store.dispatch("InitAdminUserInfo")

src/store/modules/pagedata.js

@@ -0,0 +1,39 @@
+
+const pagedata = {
+    state: {
+        list:{
+        limit: 10,
+        page: 1,
+        keywords: '',
+        start_time: '',
+        end_time: '',
+        type: '',
+        p_type: 2,
+        sort_type: '' ,
+        patient_id:0
+        },
+        pagestate:""
+        
+        
+    },
+
+    mutations: {
+        SET_PAGEDATA: (state, pagedata) => {
+            state.list = pagedata
+            console.log(pagedata,'store里面的pagedata')
+        },
+        SET_PAGENAME: (state, pagedata) => {
+            state.pagestate = pagedata
+            console.log(state,'store里面的pagestate')
+        },
+    },
+
+    actions: {
+        UPDATE_PAGEDATA({commit},param ){
+            commit('SET_PAGEDATA',param)
+        }
+
+    }
+}
+
+export default pagedata

src/xt_pages/DepositManagement/DeductionDetailsSummary.vue

@@ -105,5 +105,8 @@ export default {
   },
 };
 </script>
-<style>
+<style lang="scss" scoped>
+/deep/ .el-tabs__header{
+margin: 0 0 -15px;
+}
 </style>

src/xt_pages/DepositManagement/DepositRefund.vue

@@ -13,7 +13,7 @@
               新增
             </el-button>
             <el-button size="small" type="primary" @click="pass_exam">
-              审核通过
+              批量审核
             </el-button>
             <el-button size="small" type="warning" @click="reject_exam">
               审核拒绝
@@ -144,6 +144,12 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="350px">
             <template slot-scope="scope">
+              <el-button
+                size="small"
+                type="primary"
+                @click="examine(scope.row, scope.row.$index)"
+              >审核
+              </el-button>
               <el-button
                 size="small"
                 type="primary"
@@ -270,6 +276,10 @@ export default {
         this.search()
       })
     },
+
+    examine(){
+
+    },
     updaterefundtype(){
       console.log("refundtype",this.refundtype)
     },

src/xt_pages/DepositManagement/RechargeDetailsSummary.vue

@@ -138,5 +138,8 @@ export default {
   },
 };
 </script>
-<style>
+<style lang="scss" scoped>
+/deep/ .el-tabs__header{
+margin: 0 0 -15px;
+}
 </style>

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

@@ -256,5 +256,6 @@ export default {
   },
 };
 </script>
-<style>
+<style lang="scss" scoped>
+
 </style>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -29,7 +29,7 @@
           <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '310'">
             类别：职工基本医疗保险
           </div>
-          <div  style="position: absolute;left:650px;top:70px;" v-else>
+          <div  style="position: absolute;left:400px;top:70px;" v-else>
             类别：
           </div>
         </div>
@@ -156,9 +156,9 @@
                 </span>
                 <span v-else>零分</span>
             </span> -->
-            <span style="position: absolute;top:280px;left:190px;letter-spacing: 20px;">{{zhongwen}}</span>
+            <span style="position: absolute;top:280px;left:170px;letter-spacing: 15px;">{{zhongwen}}</span>
             </span>
-            <span style="position: absolute;top:280px;left:510px">合计：{{ list.order.medfee_sumamt }}</span>
+            <span style="position: absolute;top:280px;left:615px">合计：{{ list.order.medfee_sumamt }}</span>
         </div>
 
 

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -38,7 +38,7 @@
         <el-form-item class="specialFormItem" >
           <div style="display:flex;">
 <!--            这里不要改成el-input，因为使用el-input会导致一个奇怪的bug，千万不要改！！！！！！！！！！！！！！！！！！！！-->
-            <input style="" v-model="form.tmp_decimal"  onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @input="lilili"></input>元
+            <input  class="input_style" v-model="form.tmp_decimal"  onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @input="lilili"></input>元
           </div>
         </el-form-item>
         </span>
@@ -379,4 +379,12 @@
     width:50%;
   }
 }
+.input_style {
+  border-radius: 5px;
+  border: 1px solid #dddddd;
+}
+.input_style:focus {
+outline:none;
+border: 1px solid #66b1ff;
+}
 </style>

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -1,18 +1,23 @@
 <template>
   <div>
-    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+    <div
+      style="display: flex; justify-content: space-between; margin-bottom: 10px"
+    >
       <div>
-        <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-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">
+            v-for="(item, index) in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
 
@@ -29,109 +34,148 @@
           class="filter-item"
           type="primary"
           @click="searchAction"
-        >搜索
+          >搜索
         </el-button>
         <el-date-picker
-            v-model="chargeDate"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            @change="changeDate"
-            end-placeholder="结束日期">
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
-        <el-button  type="primary" size="small" @click="toPrint">打印</el-button>
-      </div>
-      <div>
+        <el-button type="primary" size="small" @click="toPrint">打印</el-button>
       </div>
+      <div></div>
     </div>
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              max-height="600"
-              show-summary
-              v-loading="detail_loading"
-              highlight-current-row>
+    <el-table
+      :data="tableData"
+      border
+      :row-style="{ color: '#303133' }"
+      ref="table"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266',
+      }"
+      max-height="600"
+      show-summary
+      v-loading="detail_loading"
+      highlight-current-row
+    >
       <el-table-column type="index" label="序号" width="60px" align="center">
         <template slot-scope="scope">
-          {{scope.row.index}}
+          {{ scope.row.index }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="处方日期">
-        <template slot-scope="scope">{{getTime(scope.row.record_date)}}</template>
+        <template slot-scope="scope">{{
+          getTime(scope.row.record_date)
+        }}</template>
       </el-table-column>
       <el-table-column align="center" label="费用编码">
         <template slot-scope="scope">
-          {{scope.row.number}}
+          {{ scope.row.number }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="项目名称">
         <template slot-scope="scope">
-          <span v-if="scope.row.advice_id > 0">{{scope.row.advice.advice_name}}</span>
+          <span v-if="scope.row.advice_id > 0">{{
+            scope.row.advice.advice_name
+          }}</span>
           <span v-if="scope.row.project_id > 0">
-            <span v-if="scope.row.project.type == 2">{{scope.row.project.project.project_name}}</span>
-            <span v-if="scope.row.project.type == 3">{{scope.row.project.good_info.good_name}}</span>
+            <span v-if="scope.row.project.type == 2">{{
+              scope.row.project.project.project_name
+            }}</span>
+            <span v-if="scope.row.project.type == 3">{{
+              scope.row.project.good_info.good_name
+            }}</span>
           </span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="规格">
         <template slot-scope="scope">
-          <span v-if="scope.row.advice_id > 0">{{scope.row.advice.drug.dose}}{{scope.row.advice.drug.dose_unit}}*{{scope.row.advice.drug.min_number}}{{scope.row.advice.drug.min_unit}}/{{scope.row.advice.drug.max_unit}}</span>
+          <span v-if="scope.row.advice_id > 0"
+            >{{ scope.row.advice.drug.dose
+            }}{{ scope.row.advice.drug.dose_unit }}*{{
+              scope.row.advice.drug.min_number
+            }}{{ scope.row.advice.drug.min_unit }}/{{
+              scope.row.advice.drug.max_unit
+            }}</span
+          >
           <span v-if="scope.row.project_id > 0">
-            <span v-if="scope.row.project.type == 2">{{scope.row.project.project.project_name}}</span>
-            <span v-if="scope.row.project.type == 3">{{scope.row.project.good_info.specification_name}}</span>
+            <span v-if="scope.row.project.type == 2">{{
+              scope.row.project.project.project_name
+            }}</span>
+            <span v-if="scope.row.project.type == 3">{{
+              scope.row.project.good_info.specification_name
+            }}</span>
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center"  label="数量">
+      <el-table-column align="center" label="数量">
         <template slot-scope="scope">
-          {{scope.row.cnt}}
+          {{ scope.row.cnt }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="单位">
         <template slot-scope="scope">
-          <span v-if="scope.row.advice_id > 0">{{scope.row.advice.prescribing_number_unit}}</span>
+          <span v-if="scope.row.advice_id > 0">{{
+            scope.row.advice.prescribing_number_unit
+          }}</span>
           <span v-if="scope.row.project_id > 0">
-            <span v-if="scope.row.project.type == 2">{{scope.row.project.project.unit}}</span>
-            <span v-if="scope.row.project.type == 3">{{scope.row.project.good_info.packing_unit}}</span>
+            <span v-if="scope.row.project.type == 2">{{
+              scope.row.project.project.unit
+            }}</span>
+            <span v-if="scope.row.project.type == 3">{{
+              scope.row.project.good_info.packing_unit
+            }}</span>
           </span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="单价">
         <template slot-scope="scope">
-          {{scope.row.pric}}
+          {{ scope.row.pric }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="金额" prop="total_price">
         <template slot-scope="scope">
           <div>
-            {{scope.row.total_price}}
+            {{ scope.row.total_price }}
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="备注">
         <template slot-scope="scope">
           <div>
-            <span v-if="scope.row.advice_id > 0">{{scope.row.advice.remark}}</span>
+            <span v-if="scope.row.advice_id > 0">{{
+              scope.row.advice.remark
+            }}</span>
             <span v-if="scope.row.project_id > 0">
-              <span v-if="scope.row.project.type == 2">{{scope.row.project.remark}}</span>
-              <span v-if="scope.row.project.type == 3">{{scope.row.project.remark}}</span>
+              <span v-if="scope.row.project.type == 2">{{
+                scope.row.project.remark
+              }}</span>
+              <span v-if="scope.row.project.type == 3">{{
+                scope.row.project.remark
+              }}</span>
             </span>
           </div>
         </template>
       </el-table-column>
-     
     </el-table>
-    <div style="display:flex;justify-content: space-around;margin-top: 25px;">
-      <div>总费用:{{getAllPice()}}</div>
-     <div>个人支付:
-        <span v-if="his_record_patient.balance_accounts_type == 2">{{getAllPice()}}</span>
-        <span v-if="his_record_patient.balance_accounts_type != 2">{{getActPay()}}</span>
-    </div>
-     <div>基金支付记账:{{getFundPaySumamt()}}</div>
-     <div>补充医疗支付记账:{{getHifesPay()}}</div>
-    <div>救助支付金额:{{getMafPay()}}</div>
+    <div style="display: flex; justify-content: space-around; margin-top: 25px">
+      <div>总费用:{{ getAllPice() }}</div>
+      <div>
+        个人支付: <span v-if="his_patient.balance_accounts_type == 2"></span>
+        {{ getAllPice() }}
+        <span v-if="his_patient.balance_accounts_type != 2"></span>
+        {{ getActPay() }}
+      </div>
+      <div>基金支付记账:{{ getFundPaySumamt() }}</div>
+      <div>补充医疗支付记账:{{ getHifesPay() }}</div>
+      <div>救助支付金额:{{ getMafPay() }}</div>
     </div>
-    
   </div>
 
   <!-- </div> -->
@@ -139,262 +183,359 @@
 
 
 <script>
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getHisSummaryDetailList } from '@/api/his/his_tools'
-const moment = require('moment')
-import { uParseTime } from '@/utils/tools'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getHisSummaryDetailList } from "@/api/his/his_tools";
+const moment = require("moment");
+import { uParseTime } from "@/utils/tools";
 export default {
   components: {
-    BreadCrumb
-
+    BreadCrumb,
   },
   props: {
     patient_id: {
       type: Number,
-      default: 0
-    }
+      default: 0,
+    },
   },
 
   data() {
-
     return {
       detail_loading: false,
       tempArr: [],
       pos: 0,
-      search_input: '',
+      search_input: "",
 
       sameRowArr: [],
-      keywords: '',
+      keywords: "",
       tableData: [],
-      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
-      item_type: '0',
+      chargeDate: [
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      ],
+      item_type: "0",
       items: [
-        { id: 1, name: '药品' },
-        { id: 2, name: '项目' },
-        { id: 3, name: '耗材' },
-
+        { id: 1, name: "药品" },
+        { id: 2, name: "项目" },
+        { id: 3, name: "耗材" },
       ],
-      list:[],
-      his_patient:{},
-      id:0,
-      start_time:"",
-      end_time:"",
-      his_record_patient:{},
-      orderList:[],
-    }
+      list: [],
+      his_patient: {},
+      id: 0,
+      start_time: "",
+      end_time: "",
+    };
   },
   methods: {
     getTime(val) {
-      if(val <= 0){
-        return ""
+      if (val <= 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
       }
-      if(val == ""){
-      return ""
-      }else {
-      return uParseTime(val, '{y}-{m}-{d}')
+    },
+    searchAction() {
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
       }
-     },
-    searchAction(){
-     this.getHisSummaryDetailList()
+      this.getHisSummaryDetailList();
     },
     changeDate() {
-      this.start_time = this.chargeDate[0]
-      this.end_time = this.chargeDate[1]
-      this.getHisSummaryDetailList()
+      this.start_time = this.chargeDate[0];
+      this.end_time = this.chargeDate[1];
+      this.getHisSummaryDetailList();
     },
     changeItem(id) {
-      this.id = id
-      this.getHisSummaryDetailList()
- 
+      this.id = id;
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
+      this.getHisSummaryDetailList();
     },
     getHisSummaryDetailList() {
-      let start_time = this.chargeDate[0]
-      let end_time = this.chargeDate[1]
-      
+      let start_time = this.chargeDate[0];
+      let end_time = this.chargeDate[1];
       let params = {
-        patient_id:this.patient_id,
+        patient_id: this.patient_id,
         start_time: start_time,
         end_time: end_time,
         type: this.item_type,
-        keyword: this.keywords
-      }
-     getHisSummaryDetailList(params).then(response=>{
-       if(response.data.state == 1){
-          var list =  response.data.data.list
-          this.his_patient = response.data.data.his_patient
-          this.his_record_patient = response.data.data.his_record_patient
-          console.log("his_record_patient",this.his_record_patient)
-
-          this.orderList = response.data.data.orderList
-          console.log("orderlist2332322333232323232",this.orderList)
-          this.list = list
-          this.tableData = []
-          for(let i=0;i<list.length;i++){
-            for(let j=0;j<list[i].orders.length;j++){
-              for(let z=0;z<list[i].orders[j].order_info.length;z++){
-                  list[i].orders[j].order_info[z].record_date = list[i].orders[j].settle_accounts_date
-                  list[i].orders[j].order_info[z].number = list[i].orders[j].number
-                  this.tableData.push(list[i].orders[j].order_info[z])
-               }
+        keyword: this.keywords,
+      };
+      getHisSummaryDetailList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.his_patient = response.data.data.his_patient;
+          this.list = list;
+          this.tableData = [];
+          for (let i = 0; i < list.length; i++) {
+            for (let j = 0; j < list[i].orders.length; j++) {
+              for (let z = 0; z < list[i].orders[j].order_info.length; z++) {
+                list[i].orders[j].order_info[z].record_date =
+                  list[i].orders[j].settle_accounts_date;
+                list[i].orders[j].order_info[z].number =
+                  list[i].orders[j].number;
+                this.tableData.push(list[i].orders[j].order_info[z]);
+              }
             }
           }
-          var obj = {index:"合计",total_price:0,record_date:"0"}
-          for(let i=0;i<this.tableData.length;i++){
-            this.tableData[i].index = i+1
-            this.tableData[i].total_price = 0
-            this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
-            obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
+
+          var obj = { index: "合计", total_price: 0, record_date: "0" };
+          for (let i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].index = i + 1;
+            this.tableData[i].total_price = 0;
+            this.tableData[i].total_price = (
+              this.tableData[i].cnt * this.tableData[i].pric
+            ).toFixed(2);
+            obj.total_price += this.tableData[i].cnt * this.tableData[i].pric;
           }
-          obj.total_price = (obj.total_price).toFixed(2)
-          
-          var new_arr = []
-           
-        
-          if(this.keywords!=""){
-            for(let i=0;i<this.tableData.length;i++){
-              if(this.tableData[i].index!="合计"){
-                if(this.tableData[i].advice_id > 0){
-                  if(this.tableData[i].advice.advice_name.indexOf(this.keywords) > -1){
-                  new_arr.push(this.tableData[i])
-                }
+          obj.total_price = obj.total_price.toFixed(2);
+
+          var new_arr = [];
+
+          let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.keywords == undefined) {
+            this.keywords = "";
+          } else {
+            this.keywords = list_1.keywords;
+          }
+          this.id = list_1.type_id;
+          this.item_type = this.id
+
+          if (this.keywords != "") {
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.tableData[i].index != "合计") {
+                if (this.tableData[i].advice_id > 0) {
+                  if (
+                    this.tableData[i].advice.advice_name.indexOf(
+                      this.keywords
+                    ) > -1
+                  ) {
+                    new_arr.push(this.tableData[i]);
+                  }
                 }
-                if(this.tableData[i].project_id >0){
-                  if(this.tableData[i].project.type == 2){
-                    if(this.tableData[i].project.project.project_name.indexOf(this.keywords) > -1){
-                        new_arr.push(this.tableData[i])
+                if (this.tableData[i].project_id > 0) {
+                  if (this.tableData[i].project.type == 2) {
+                    if (
+                      this.tableData[i].project.project.project_name.indexOf(
+                        this.keywords
+                      ) > -1
+                    ) {
+                      new_arr.push(this.tableData[i]);
                     }
                   }
-                  if(this.tableData[i].project.type == 3){
-                    if(this.tableData[i].project.good_info.good_name.indexOf(this.keywords)> - 1){
-                      new_arr.push(this.tableData[i])   
+                  if (this.tableData[i].project.type == 3) {
+                    if (
+                      this.tableData[i].project.good_info.good_name.indexOf(
+                        this.keywords
+                      ) > -1
+                    ) {
+                      new_arr.push(this.tableData[i]);
                     }
                   }
                 }
               }
             }
-            var objs = {index:"合计",total_price:0,record_date:"0"}
-            objs.total_price = this.getPrice(new_arr)
-            this.tableData = new_arr
+            var objs = { index: "合计", total_price: 0, record_date: "0" };
+            objs.total_price = this.getPrice(new_arr);
+            this.tableData = new_arr;
           }
 
-           if(this.id == 1){
-              var obj = {index:"合计",total_price:0,record_date:"0"}
-              var new_arr = []
-              for(let i=0;i<this.tableData.length;i++){
-                if(this.tableData[i].index!="合计"){
-                  if(this.tableData[i].advice_id > 0){
-                    new_arr.push(this.tableData[i])
-                  }
-                } 
+          if (this.id == 1) {
+            var obj = { index: "合计", total_price: 0, record_date: "0" };
+            var new_arr = [];
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.tableData[i].index != "合计") {
+                if (this.tableData[i].advice_id > 0) {
+                  new_arr.push(this.tableData[i]);
+                }
               }
-              this.tableData = []
-              obj.total_price = this.getPrice(new_arr)
-              // new_arr.push(obj)
-              this.tableData = new_arr
-           }
-          if(this.id == 2){
-            var obj = {index:"合计",total_price:0,record_date:"0"}
-            var new_arr = []
-            for(let i=0;i<this.tableData.length;i++){
-              if(this.tableData[i].index!="合计"){
-                if(this.tableData[i].project_id > 0){
-                  if(this.tableData[i].project.type ==2){
-                    new_arr.push(this.tableData[i])
+            }
+            this.tableData = [];
+            obj.total_price = this.getPrice(new_arr);
+            this.tableData = new_arr;
+          }
+          if (this.id == 2) {
+            var obj = { index: "合计", total_price: 0, record_date: "0" };
+            var new_arr = [];
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.tableData[i].index != "合计") {
+                if (this.tableData[i].project_id > 0) {
+                  if (this.tableData[i].project.type == 2) {
+                    new_arr.push(this.tableData[i]);
                   }
                 }
-              } 
-            }
-           
-            this.tableData = []
-            obj.total_price = this.getPrice(new_arr)
-           
-            this.tableData = new_arr
+              }
             }
+            this.tableData = [];
+            obj.total_price = this.getPrice(new_arr);
+            this.tableData = new_arr;
+          }
 
-          if(this.id == 3){
-            var new_arr = []
-            var obj = {index:"合计",total_price:0,record_date:"0"}
-            for(let i=0;i<this.tableData.length;i++){
-              if(this.tableData[i].index!="合计"){
-                if(this.tableData[i].project_id > 0){
-                  if(this.tableData[i].project.type == 3){
-                    new_arr.push(this.tableData[i])
+          if (this.id == 3) {
+            var new_arr = [];
+            var obj = { index: "合计", total_price: 0, record_date: "0" };
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.tableData[i].index != "合计") {
+                if (this.tableData[i].project_id > 0) {
+                  if (this.tableData[i].project.type == 3) {
+                    new_arr.push(this.tableData[i]);
                   }
                 }
-              } 
+              }
             }
-            this.tableData = []
-            obj.total_price = this.getPrice(new_arr)
-            this.tableData = new_arr
-          }      
-          
-         
-       }
-     })
+            this.tableData = [];
+            obj.total_price = this.getPrice(new_arr);
+            this.tableData = new_arr;
+          }
+        }
+      });
     },
-    getAllPice(){
-      var total_price = 0
-      for(let i=0;i<this.tableData.length;i++){
-        total_price += this.tableData[i].pric * this.tableData[i].cnt
+
+    getAllPice() {
+      var total_price = 0;
+      for (let i = 0; i < this.tableData.length; i++) {
+        total_price += this.tableData[i].pric * this.tableData[i].cnt;
       }
-      return total_price.toFixed(2)
+      return total_price.toFixed(2);
     },
-    getActPay(){
-      var act_pay = 0
-      for(let i=0;i<this.orderList.length;i++){
-         act_pay += this.orderList[i].psn_part_amt
+    getActPay() {
+      var act_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          act_pay += this.list[i].orders[j].acct_pay;
+        }
       }
       return act_pay.toFixed(2)
     },
-    getFundPaySumamt(){
-      var fund_pay_sumamt = 0
-      for(let i=0;i<this.list.length;i++){
-        for(let j=0;j<this.list[i].orders.length;j++){
-           fund_pay_sumamt +=this.list[i].orders[j].fund_pay_sumamt
+    getFundPaySumamt() {
+      var fund_pay_sumamt = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          fund_pay_sumamt += this.list[i].orders[j].fund_pay_sumamt;
         }
       }
-      return fund_pay_sumamt
+      return fund_pay_sumamt;
     },
-    getHifesPay(){
-      var hifes_pay = 0
-      for(let i=0;i<this.list.length;i++){
-        for(let j=0;j<this.list[i].orders.length;j++){
-          hifes_pay +=this.list[i].orders[j].hifes_pay
+    getHifesPay() {
+      var hifes_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          hifes_pay += this.list[i].orders[j].hifes_pay;
         }
       }
-      return hifes_pay
+      return hifes_pay;
     },
-    getMafPay(){
-      var maf_pay = 0
-      for(let i=0;i<this.list.length;i++){
-        for(let j=0;j<this.list[i].orders.length;j++){
-          maf_pay +=this.list[i].orders[j].maf_pay
+    getMafPay() {
+      var maf_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          maf_pay += this.list[i].orders[j].maf_pay;
         }
       }
-      return maf_pay
+      return maf_pay;
     },
-    toPrint(){
-      this.$router.push({path:"/hisTool/detailPrint?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id+"&balance_accounts_type="+this.his_patient.balance_accounts_type})
+    toPrint() {
+      this.$router.push({
+        path:
+          "/hisTool/detailPrint?patient_id=" +
+          this.patient_id +
+          "&start_time=" +
+          this.start_time +
+          "&end_time=" +
+          this.end_time +
+          "&type=" +
+          this.item_type +
+          "&keyword=" +
+          this.keywords +
+          "&id=" +
+          this.id +
+          "&balance_accounts_type=" +
+          this.his_patient.balance_accounts_type,
+      });
+
+      // ======打印时将查询参数保存至store中======
+      // table_id: 左栏表格下标
+      // type_id: 下拉框id
+      // keywords: 输入框
+      // start_time: this.chargeDate[0],
+      // end_time: this.chargeDate[1],
+      // patient_id:this.patient_id
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
     },
-    getPrice(val){
-      var total_price = 0
-      for(let i=0;i<val.length;i++){
-         total_price += val[i].cnt * val[i].pric
+    getPrice(val) {
+      var total_price = 0;
+      for (let i = 0; i < val.length; i++) {
+        total_price += val[i].cnt * val[i].pric;
       }
-      return total_price.toFixed(2)
-    }
-
+      return total_price.toFixed(2);
+    },
   },
   created() {
-    this.start_time = this.chargeDate[0]
-    this.end_time = this.chargeDate[1]
-    this.getHisSummaryDetailList()
+    this.start_time = this.chargeDate[0];
+    this.end_time = this.chargeDate[1];
+    this.getHisSummaryDetailList();
+  },
+  watch: {
+    patient_id: function () {
+      this.patient_id = this.patient_id;
+      this.getHisSummaryDetailList();
+    },
   },
-  watch:{
-    "patient_id":function(){
-      this.patient_id = this.patient_id
-      this.getHisSummaryDetailList()
-    }
-  }
-}
+};
 </script>

src/xt_pages/outpatientTool/statistics.vue

@@ -10,7 +10,13 @@
     >
       <div class="mainLeft">
         <div>
-          <div style="margin:10px 0;display: flex;justify-content: space-between;">
+          <div
+            style="
+              margin: 10px 0;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
             <el-input
               size="small"
               style="width: 130px"
@@ -28,6 +34,8 @@
           </div>
 
           <el-table
+            :row-class-name="tableRowClassName"
+            @row-click="onRowClick"
             :data="patientTableData"
             :height="tableHeight"
             border
@@ -81,6 +89,7 @@ export default {
   },
   data() {
     return {
+      currentRowIndex: 0,
       patientTableData: [],
       tableHeight: 400,
       crumbs: [
@@ -92,25 +101,38 @@ export default {
       keywords: "",
     };
   },
+
+  // beforeRouteEnter(to, from, next){
+  //     if(from.path == '/hisTool/detailPrint'){
+  //       next((vm) => {
+  //         vm.titleType = "明细"
+  //       })
+  //     }else if(from.path == '/hisTool/gatherPrint'){
+  //       vm.titleType = "汇总"
+  //       next((vm) => {
+  //         vm.titleType = "汇总"
+  //       })
+  //     }else{
+  //       next()
+  //     }
+  // },
+
   //判断列表页是否刷新
-  beforeRouteEnter(to, from, next) {
-    console.log(from, "beforeRouteEnter");
-    if (from.path == "/hisTool/detailPrint") {
-      next((vm) => {
-        vm.patient_id = vm.$store.getters.pagedata.list.patient_id;
-        // setTimeout(() => {
-        //   vm.getHisOrderList();
-        // },300)
-        
-      });
+  beforeRouteLeave(to, from, next) {
+    console.log(to, "beforeRouteEnter");
+    if (to.path != "/hisTool/detailPrint"&&to.path != "/hisTool/gatherPrint") {
+      this.$store.getters.pagedata.list.table_id = 0
+      next()
     } else {
-      next((vm) => {
-        vm.getPatientList()
-        // setTimeout(() => {
-        //   vm.getHisOrderList();
-        // },300)
-        
-      });
+     next()
+    }
+  },
+
+  watch:{
+    'titleType':{
+      handler(val){
+        this.$store.commit('SET_PAGENAME',val)
+      }
     }
   },
 
@@ -126,32 +148,57 @@ export default {
         } else {
           this.patientTableData = response.data.data.patient;
           this.patient_id = this.patientTableData[0].id;
-
-          this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
+          if (this.$store.getters.pagedata.list.table_id == 0) {
+            this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
+          } else {
+            this.$refs.singleTable.setCurrentRow(
+              this.patientTableData[
+                this.$store.getters.pagedata.list.table_id
+              ]
+            );
+          }
         }
       });
     },
+
+    tableRowClassName({ row, rowIndex }) {
+      row.row_index = rowIndex;
+    },
+
+    onRowClick(row, event, column) {
+      this.currentRowIndex = row.row_index;
+      console.log(this.currentRowIndex, "this.currentRowIndex");
+      this.$store.commit("SET_PAGEDATA", {
+        table_id: this.currentRowIndex,
+      });
+      console.log(this.$store.getters.pagedata.list.table_id, "kk");
+    },
     searchAction() {
       this.getPatientList();
     },
-    handleCurrentChange(row,index) {
+    handleCurrentChange(row) {
       this.patient_id = row.id;
+      // console.log(this.patientTableData[this.currentRowIndex],'this.tableData[this.currentRowIndex]')
+      //  this.$refs.singleTable.setCurrentRow(this.tableData[this.currentRowIndex])
       // this.$refs.child.getHisSummaryDetailList()
       // this.$refs.childOne.getGatherDetailList()
-      // this.$store.commit("SET_PAGEDATA",{
-      //   patient_id: row.id,
-      // })
-      console.log(index,'po')
     },
   },
   created() {
+
+    let type = this.$store.getters.pagedata.pagestate
+    if(type == ""){
+      this.titleType = "明细"
+    }else{
+      this.titleType = type
+    }
     const tableHeight = document.body.clientHeight - 290;
     this.tableHeight = tableHeight;
     this.getPatientList();
+    
   },
 
-  mounted() {},
-  watch: {},
+  mounted() {}
 };
 </script>