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

src/api/common/common.js

 }
 
 export function getConfigurationDetail(id, params) {
-
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',
   })
 }
 
-export function getDialysisModeType(startime, endtime,lapsetotype,sourcetype) {
+export function getDialysisModeType(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
-  console.log("parasm22222",params)
   return request({
     url: '/com/api/getdialysismodetype',
     method: 'get',
   })
 }
 
-export function getTotalLapseCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalLapseCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   console.log('转归params', params)
   return request({
   })
 }
 
-export function getTotalSexCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalSexCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   return request({
     url: '/com/api/gettotalsexcount',
   })
 }
 
-export function getTotalInfectiousCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalInfectiousCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   console.log('传染病', params)
   return request({
   })
 }
 
-export function getTotalAgeCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalAgeCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   return request({
     url: '/com/api/gettotalagecount',
   })
 }
 
-export function getTotalDialysisCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalDialysisCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   return request({
     url: '/com/api/gettotaldialysiscount',
   })
 }
 
-
-export function getTreatModeList(params){
-  console.log("params",params)
+export function getTreatModeList(params) {
+  console.log('params', params)
   return request({
-    url:"/com/api/getreatmodelist",
-    method:"get",
-    params:params,
+    url: '/com/api/getreatmodelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getCountModeId(params){
+export function getCountModeId(params) {
   return request({
-    url:'/com/api/getcountmodeid',
-    method:"Get",
-    params:params
+    url: '/com/api/getcountmodeid',
+    method: 'Get',
+    params: params
   })
 }
 
-export function getRolloutCount(params){
-
+export function getRolloutCount(params) {
   return request({
-    url:"/com/api/getrolloutcount",
-    method:"Get",
-    params:params
+    url: '/com/api/getrolloutcount',
+    method: 'Get',
+    params: params
   })
 }
 
-

src/api/stock.js

   })
 }
 
+
 export function getManufacturerList(params) {
   return request({
     url: '/api/stock/manufacturer/list',
     params: params
   })
 }
+
+export function getdealername(params) {
+  return request({
+    url: '/api/stock/dealer/getdealername',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getmanufacturername(params) {
+  return request({
+    url: '/api/stock/manufacturer/getmanufacturername',
+    method: 'get',
+    params: params
+  })
+}

src/store/getters.js

   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

 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,
     xt_permission,
     xt_role_temps,
     global_config,
-    temp_params
+    temp_params,
+    pagedata
   },
   getters
+
 })
 
 // store.dispatch("InitAdminUserInfo")

src/store/modules/pagedata.js

+
+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

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

src/xt_pages/DepositManagement/DepositRefund.vue

               新增
             </el-button>
             <el-button size="small" type="primary" @click="pass_exam">
-              审核通过
+              批量审核
             </el-button>
             <el-button size="small" type="warning" @click="reject_exam">
               审核拒绝
           </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"
         this.search()
       })
     },
+
+    examine(){
+
+    },
     updaterefundtype(){
       console.log("refundtype",this.refundtype)
     },
     // 审核通过
     pass_exam() {
       if(this.multipleSelection.length < 1){
-        alert("未选择任何信息")
+        this.$message.error("未选择任何信息")
         return
       }
       var tmp = "";
     // 审核拒绝
     reject_exam() {
       if(this.multipleSelection.length < 1){
-        alert("未选择任何信息")
+        this.$message.error("未选择任何信息")
         return
       }
       var tmp = "";

src/xt_pages/DepositManagement/RechargeDetailsSummary.vue

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

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

         </el-table-column>
         <el-table-column label="操作" align="center" width="350px">
           <template slot-scope="scope">
+            <span v-if="scope.row.trial_status != 1">
             <el-button
               size="small"
               type="primary"
             >
               审核
             </el-button>
+            </span>
+           
             <span v-if="scope.row.trial_status == 1">
             <el-button
               size="small"
   },
 };
 </script>
-<style>
+<style lang="scss" scoped>
+
 </style>

src/xt_pages/DepositManagement/print/printindex.vue

                 >￥{{money}}</div>
               </div>
               <div style="display: flex; padding: 0 30px">
-                <div>收款是由：</div>
+                <div>收款事由：</div>
                 <div style="width: 86%; border-bottom: 1px solid #000"><span>预交押金</span></div>
               </div>
             </div>

src/xt_pages/data/components/addDrugs.vue

                 </div>
             </el-tab-pane>
             <el-tab-pane label="扩展数据" name="second">
-                <el-form :model="form" label-width="120px"
+                <el-form :model="form" label-width="130px"
                          style="display: flex;flex-wrap: wrap;justify-content: space-between;">
 
                     <el-form-item label="标签:" prop="label">
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否通过药房发药:" prop="">
+                        <el-select v-model="form.is_charge_use" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="item,index in options"
+                                    :key="index"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

     methods: {
       //调试
       lili(index,row){
+        // console.log("==index==",index)
+        // console.log("==row==",row)
         console.log("==doctor_advices==",this.doctor_advices)
         console.log("==this.form==",this.form)
       },
       },
       submitEditAdvice() {
         // console.log()
+        console.log("保存22222222222222")
+        console.log("==this.src_type==",this.src_type)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
               this.showAdviceForm = false
               this.showAdvicePanel = true
               var advice = response.data.data.advice
-              console.log("advic323323232323232",advice)
               this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec
               this.doctor_advices[this.currentIndex].drug_spec_unit =
                 advice.drug_spec_unit
                     }
                   }
                   this.execTimeDialogVisible = false
-                  
+
                   return false
               }
 
           return false
         }
         let mode = '1'
-       console.log("sry2332322332",this.src_type)
+       // console.log("sry2332322332",this.src_type)
        if(this.src_type == ""){
           this.form.way = 1
        }
               this.hideForm()
               console.log("子药23223332323332",this.form.parent_id)
               console.log("232322332323232",this.form.parent_id)
-           
+
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
                 for (let index = this.doctor_advices.length - 1; ; index--) {
                       this.doctor_advices.push(swapData[index])
                     }
                   }
-                 
+
                   console.log("doctore_advic4233232323232",this.doctor_advices)
                 }
               } else {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

         this.isVisibility = true
       },
       handleAdviceCommit() {
-        //
+       
           let results = []
           for (let i = 0; i < this.targetAdvices.length; i++) {
             for (let a = 0; a < this.checkedCities.length; a++) {
 
           var date = new Date()
           var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-          var minute =
-            date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-
+          var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+         
           if (results.length > 0) {
             if(!this.isLoading){
               if (this.is_pre == 1) {
                 }
 
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
+               
 
                 const ParamsQuery = arr
-                // console.log('医嘱推送2', ParamsQuery)
+                
 
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
-                 ParamsQuery['patient_id'] = this.$route.query.patient_id
+                ParamsQuery['patient_id'] = this.$route.query.patient_id
+                if(this.$route.query.patient_id ==undefined){
+                  ParamsQuery['patient_id'] = this.patient.id
+                }
                 if (this.prescription.creater <= 0) {
                   ParamsQuery['mode'] = '1'
                 } else {
                   }
                 }
                 this.isLoading = true
+                console.log("ParamsQuery233232322323322332232323",ParamsQuery)
+
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
                       duration: 2000
                     })
                     var date = new Date()
-
-                    // console.log(this.start_time)
-
+                    
                     const params = {
                       advices: results,
                       advice_date: this.start_time.split(' ')[0],
                       start_time: this.start_time,
                       remark: ''
                     }
-                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
+                    var patient_id = 0
+                    if(this.$route.query.patient_id == undefined){
+                       patient_id = this.patient.id
+                    }else{
+                      patient_id = this.$route.query.patient_id
+                    }
+                  
+                    CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
                         if (resp.state == 1) {
                   return
                 }
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
-
+                
                 const ParamsQuery = arr
-                // console.log('医嘱推送3', ParamsQuery)
-
+              
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = 1
                       start_time: this.start_time,
                       remark: ''
                     }
-                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
+                    var patient_id = 0
+                    if(this.$route.query.patient_id == undefined){
+                       patient_id = this.patient.id
+                    }else{
+                      patient_id = this.$route.query.patient_id
+                    }
+                    CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
                         if (resp.state == 1) {
         if (val > 2) {
           this.anticoagulant = this.anticoagulantsConfit[thismode - 2]
         }
-        if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41 || this.$store.getters.xt_user.template_info.template_id == 6) && val == 2) {
+        if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41 || this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 47) && val == 2) {
            if(val == 2){
              this.anticoagulant.shouji_unit = 'mg'
            }else{

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

           <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>
                 </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

         <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>
     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

 <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>
 
           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;">
-      <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 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> -->
 
 
 <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:"",
-    }
+      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(){
-     this.getHisSummaryDetailList()
+    },
+    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,
+        });
+      }
+      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.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]);
                   }
                 }
-              } 
-            }
-            // console.log("项目new_arr",new_arr)
-            this.tableData = []
-            obj.total_price = this.getPrice(new_arr)
-            // console.log("ar3233223232",new_arr)
-            // new_arr.push(obj)
-            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
-          }      
-          
-          // console.log("hh233223233232323232322332",this.tableData)
-       }
-     })
+            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.list.length;i++){
-        for(let j=0;j<this.list[i].orders.length;j++){
-           act_pay +=this.list[i].orders[j].acct_pay
+    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
+      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/detailPrint.vue

       <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span>
+          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
           
           <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
           <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
       ],
       order:{},
       his_record_patient:{},
+      orderList:[],
     };
   },
   methods: {
          
          this.his_record_patient = response.data.data.his_record_patient
 
-          this.hisDepatment = response.data.data.hisDepatment;
-
+         this.hisDepatment = response.data.data.hisDepatment;
+          
+         this.orderList = response.data.data.orderList
           this.order = response.data.data.order
           this.tableData = [];
           for (let i = 0; i < list.length; i++) {
           this.tableData.push(obj);
 
 
-          console.log("表哥233232323232233232322323",this.tableData)
+         
           if (this.$route.query.keyword != "") {
             var new_arr = []
             for (let i = 0; i < this.tableData.length; i++) {
             objs.total_price = this.getPrice(new_arr)
             new_arr.push(objs)
             this.tableData = new_arr;
-            console.log("表哥2333333333333333333333333333",this.tableData)
+           
           }
 
           if(this.$route.query.id == 1){
                 }
               }
             }
-            console.log("项目new_arr",new_arr)
+         
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            console.log("ar3233223232",new_arr)
+           
             for(let i=0;i<new_arr.length;i++){
               new_arr[i].is_total = 1
             }
               new_arr[i].is_total = 1
             }
             new_arr.push(obj)
-            console.log("new_arr2332323232",new_arr)
+           
             this.tableData = new_arr
           }
 
       }
       return total_price;
     },
-    getActPay() {
-      console.log("hh23h323223323", this.list);
-      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;
-        }
+    getActPay(){
+      var act_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+         act_pay += this.orderList[i].psn_part_amt
       }
-      return act_pay;
+      return act_pay.toFixed(2)
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;

src/xt_pages/outpatientTool/gatherPrint.vue

           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          console.log("listw3232323223",list)
+          
 
           var new_arr = []
 
                new_arr.push(list[i].orders[j])
             }
           }
-          console.log("new_arr2332323232",new_arr)
+          
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
               }
             }
           }
-          console.log("order_info222222222222",order_info)
+          
           
           //合并，相同的合并在一起
 
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          console.log("arr2323233232322332",arr)
+          
           var obj = {is_total:1,total:0}
           obj.total = this.getAllPiceTwo(arr)
           for(let i=0;i<arr.length;i++){
           arr.push(obj)
 
           this.tableList = arr
-          console.log("打印",this.tableList)
+         
           this.patient = response.data.data.patient
-          console.log("patinet",this.patient)
+         
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
           this.schedule = response.data.data.schedule
           this.bedNumber = response.data.data.bedNumber
           if(this.$route.query.keyword !=""){
-            console.log("金拉风3322323232323",this.$route.query.keyword)
-            console.log("Ar23233232323223",this.tableList)
+           
             var new_arr = []
             for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].is_total!=1){
           
           }
          }
-         console.log("list232332322323332233223232323",list)
+       
         return list
       }, 
     
       return total_price.toFixed(2)
     },
     getDrugType(id){
-      console.log("id2332323232233232232323",id)
+    
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){

src/xt_pages/outpatientTool/statistics.vue

 <template>
   <div class="main-contain new-main-contain">
     <div class="position">
-<!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+    <div
+      class="app-container"
+      style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+    >
       <div class="mainLeft">
         <div>
-         <el-input
-          size="small"
-          style="width: 130px"
-          v-model="keywords"
-          class="filter-item"
-          placeholder="请输入患者名称"
-        />
-        <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          @click="searchAction"
-        >搜索
-        </el-button>
-          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
-                     :row-style="{ color: '#303133' }"
-                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                     highlight-current-row
-                     ref="singleTable"
-                     @current-change="handleCurrentChange"
-                   >
-            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
+          <div
+            style="
+              margin: 10px 0;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
+            <el-input
+              size="small"
+              style="width: 130px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入患者名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :row-class-name="tableRowClassName"
+            @row-click="onRowClick"
+            :data="patientTableData"
+            :height="tableHeight"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            highlight-current-row
+            ref="singleTable"
+            @current-change="handleCurrentChange"
+          >
+            <el-table-column align="center" prop="name" label="姓名" wdith="89">
               <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
           </el-table>
           <el-tab-pane label="明细" name="明细"></el-tab-pane>
           <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
         </el-tabs>
-        <detail-statistics v-if="titleType == '明细'" :patient_id="patient_id" ref="child"></detail-statistics>
-        <gather-statistics v-if="titleType == '汇总'" :patient_id="patient_id" ref="childOne"></gather-statistics>
+        <detail-statistics
+          v-if="titleType == '明细'"
+          :patient_id="patient_id"
+          ref="child"
+        ></detail-statistics>
+        <gather-statistics
+          v-if="titleType == '汇总'"
+          :patient_id="patient_id"
+          ref="childOne"
+        ></gather-statistics>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import {
-  GetDetailPatients,
-} from '@/api/his/his_tools'
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetDetailPatients } from "@/api/his/his_tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import DetailStatistics from './components/detailStatistics'
-import GatherStatistics from './components/gatherStatistics'
+import DetailStatistics from "./components/detailStatistics";
+import GatherStatistics from "./components/gatherStatistics";
 export default {
   components: {
     GatherStatistics,
     BreadCrumb,
   },
   data() {
-
     return {
-      patientTableData:[],
+      currentRowIndex: 0,
+      patientTableData: [],
       tableHeight: 400,
       crumbs: [
-        { path: false, name: 'His工具' },
-        { path: false, name: '明细汇总统计' }
+        { path: false, name: "His工具" },
+        { path: false, name: "明细汇总统计" },
       ],
-      titleType: '明细',
-      patient_id:0,
-      keywords:"",
+      titleType: "明细",
+      patient_id: 0,
+      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()
+  //     }
+  // },
+
+  //判断列表页是否刷新
+  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()
     }
   },
+
+  watch:{
+    'titleType':{
+      handler(val){
+        this.$store.commit('SET_PAGENAME',val)
+      }
+    }
+  },
+
   methods: {
-    getPatientList(){
-       var params = {
-         keyword:this.keywords,
-       }
-      GetDetailPatients(params).then(response => {
+    getPatientList() {
+      var params = {
+        keyword: this.keywords,
+      };
+      GetDetailPatients(params).then((response) => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.patientTableData = response.data.data.patient
-          this.patient_id =  this.patientTableData[0].id
-          this.$refs.singleTable.setCurrentRow(this.patientTableData[0])
+          this.patientTableData = response.data.data.patient;
+          this.patient_id = this.patientTableData[0].id;
+          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
+              ]
+            );
+          }
         }
-      })
+      });
     },
-    searchAction(){
-      this.getPatientList()
+
+    tableRowClassName({ row, rowIndex }) {
+      row.row_index = rowIndex;
     },
-    handleCurrentChange(row){
-      this.patient_id = 0
-      this.patient_id = row.id
+
+    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) {
+      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()
     },
-
   },
   created() {
-    const tableHeight = document.body.clientHeight - 290
-    this.tableHeight = tableHeight
-    this.getPatientList()
 
+    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>
 
 <style lang="scss" scoped>
   display: flex;
   flex-direction: column;
 
-.el-radio {
-  margin-right: 5px;
-}
-
+  .el-radio {
+    margin-right: 5px;
+  }
 }
 .mainRight {
   margin-left: 10px;
   flex-direction: column;
   overflow-y: auto;
 
-.cellSpan {
-  min-width: 80px;
-  display: inline-block;
-  margin-right: 10px;
-}
-
+  .cellSpan {
+    min-width: 80px;
+    display: inline-block;
+    margin-right: 10px;
+  }
 }
 .mainCenter {
   display: flex;
   flex-direction: column;
   position: relative;
 
-.el-form-item {
-  width: 32%;
-  margin-right: 1%;
-  float: left;
-}
-
-.el-form-item__label {
-  text-align: left;
-}
+  .el-form-item {
+    width: 32%;
+    margin-right: 1%;
+    float: left;
+  }
 
+  .el-form-item__label {
+    text-align: left;
+  }
 }
 .backColor {
   background: #f6f8f9;
   overflow-y: auto;
   margin-bottom: 60px;
 
-.el-tabs__item {
-  padding: 0 10px;
-}
-
+  .el-tabs__item {
+    padding: 0 10px;
+  }
 }
 .preTabs {
   height: 100%;
   display: flex;
   flex-direction: column;
 
-.el-tabs__content {
-  flex: 1;
-  overflow-y: auto;
-}
-
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+  }
 }
 
 .costBox {
   border: 1px solid #d2d2d2;
   box-sizing: border-box;
 
-p {
-  width: 50%;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  background: #eee;
-  float: left;
-}
-
-> p:last-child {
-  border-left: 1px solid #d2d2d2;
-  float: right;
-}
-
-.activeP {
-  background: #409EFF;
-  color: #fff;
-}
-
+  p {
+    width: 50%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #eee;
+    float: left;
+  }
+
+  > p:last-child {
+    border-left: 1px solid #d2d2d2;
+    float: right;
+  }
+
+  .activeP {
+    background: #409eff;
+    color: #fff;
+  }
 }
 .comfirmBox {
   width: 100%;
 
 <style lang="scss">
 .centerLeft {
-
-.el-form-item__label {
-  text-align: left;
-}
-
+  .el-form-item__label {
+    text-align: left;
+  }
 }
 .tabsBox {
-
-.el-tabs__item {
-  padding: 0 10px;
-}
-
-.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
-  padding: 0 10px;
-}
-
-.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
-  padding: 0 10px;
-}
-
-.el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
-  padding: 0 10px;
-}
-
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom
+    .el-tabs--left
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom
+    .el-tabs--right
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--bottom.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:last-child,
+  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:last-child,
+  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+    padding: 0 10px;
+  }
+
+  .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+    padding: 0 10px;
+  }
 }
 .centerRight {
+  .el-tabs__nav-scroll {
+    display: flex;
+  }
 
-.el-tabs__nav-scroll {
-  display: flex;
-}
-
-.el-tabs__nav {
-  margin: 0 auto;
-}
-
-.el-table th .cell, .el-table td .cell {
-  padding: 0 2px;
-}
+  .el-tabs__nav {
+    margin: 0 auto;
+  }
 
+  .el-table th .cell,
+  .el-table td .cell {
+    padding: 0 2px;
+  }
 }
 .preTabs {
-
-.el-tabs__content {
-
-}
-
+  .el-tabs__content {
+  }
 }
 .rightTabs {
   height: 100%;
 
-
-.el-tabs__content {
-
-}
-
+  .el-tabs__content {
+  }
 }
 .centerDialog {
-
-.el-dialog__body {
-  max-height: calc(100vh - 100px) !important;
-  padding: 0 20px;
-}
-
+  .el-dialog__body {
+    max-height: calc(100vh - 100px) !important;
+    padding: 0 20px;
+  }
 }
 </style>

src/xt_pages/stock/Dialog/manufacturerOrDealerDialog.vue

           ],
           dealer_name: [
             {required: true, message: '请输入经销商名称', trigger: 'blur'},
-          ], 
+          ],
 
         }
       }
             value = this.getValue()
             this.$emit('dialog-comfirm', value);
             this.form = Object.assign({}, this.resetForm)
-
           }
         });
       },

src/xt_pages/stock/config/dealer.vue

 <template>
+<!--  专用字典中的经销商-->
   <div class=" sign-and-weigh-box" style="background: white">
     <manufacturer-or-dealer-dialog
       ref="dialog"
         <!--<el-button type="primary" style="float:right;"  @click="showDialog">新增经销商</el-button>-->
 
         <div>
+
+          <el-select v-model="key" clearable filterable placeholder="请输入经销商名称" @change="handleSelect" @click.native="init" ><!--@change="updateconfig1(h1)"-->
+            <el-option
+              v-for="item in namelist"
+              :key="item.id"
+              :label="item.dealer_name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >查询</el-button>
+
           <el-button
             size="small"
             icon="el-icon-circle-plus-outline"
   modifyDealer,
   getDealersList,
   deleteDealer,
-  GetDealer
+  GetDealer,
+  getdealername
 } from "@/api/stock";
 
 export default {
   name: "dealer",
   data() {
     return {
+      key:"",
+      namelist:[],
       thedefaultActive: "1-2",
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       dealerData: [],
     };
   },
   methods: {
+    //初始化供应商列表
+    init(){
+      // alert("!!!")
+      this.key = ""
+      var params = {}
+      getdealername(params).then(res => {
+        if (res.data.state == 1){
+          this.namelist = res.data.data.list
+        }
+      })
+    },
+    handleSelect(){
+      // this.key = val.id
+      console.log("this.key",this.key)
+    },
+    search(){
+      let params = {
+        page: this.page,
+        limit: this.limit,
+        key: this.key
+      };
+      this.loading = true;
+      getDealersList(params).then(response => {
+        if (response.data.state == 0) {
+          this.loading = false;
+
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.loading = false;
+          this.total = response.data.data.total;
+          this.dealerData = [];
+          for (let i = 0; i < response.data.data.dealer.length; i++) {
+            this.dealerData.push(response.data.data.dealer[i]);
+          }
+        }
+      });
+    },
     handleEdit: function(index, row) {
       this.editId = row.id;
       this.editIndex = index;
   },
   created() {
     this.getList();
+    this.init();
   }
 };
 </script>

src/xt_pages/stock/config/manufacturer.vue

 <template>
+<!--  专用字典的生产厂家-->
   <div class="main-contain">
     <div class=" sign-and-weigh-box" style="background: white">
       <manufacturer-or-dealer-dialog
       <el-row :gutter="15">
         <el-col>
           <div>
+            <el-select v-model="key" clearable filterable placeholder="请输入生产厂商名称" @click.native="init"  ><!--@change="updateconfig1(h1)"-->
+              <el-option
+                v-for="item in namelist"
+                :key="item.id"
+                :label="item.manufacturer_name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+            >查询</el-button>
+
             <el-button
               size="small"
               icon="el-icon-circle-plus-outline"
   deleteManufacturer,
   GetManufacturer,
   getManufacturerList,
-  modifyManufacturer
+  modifyManufacturer,
+  getmanufacturername
 } from "@/api/stock";
 
 export default {
   name: "manufacturer",
   data() {
     return {
+      key:"",
+      namelist:[],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       manufacturerData: [],
       total: 0,
     };
   },
   methods: {
+    lili(){
+      alert("dadad")
+    },
+
+    //初始化供应商列表
+    init(){
+      // alert("!!!")
+      this.key = ""
+      var params = {}
+      getmanufacturername(params).then(res => {
+        if (res.data.state == 1){
+          this.namelist = res.data.data.list
+        }
+      })
+    },
+    search(){
+      let params = {
+        page: this.page,
+        limit: this.limit,
+        key: this.key
+      };
+      this.loading = true;
+      getManufacturerList(params).then(response => {
+        if (response.data.state == 0) {
+          this.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.loading = false;
+          this.total = response.data.data.total;
+          this.manufacturerData = [];
+          for (let i = 0; i < response.data.data.manufacturer.length; i++) {
+            this.manufacturerData.push(response.data.data.manufacturer[i]);
+          }
+        }
+      });
+    },
     handleEdit: function(index, row) {
       this.editId = row.id;
       this.editIndex = index;
   },
   created() {
     this.getList();
+    this.init();
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

             const params = {
               'stockIn': this.recordInfo.recordData
             }
-           
+            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

             stockOut: this.recordInfo.recordData
           };
        
-         
+          console.log("parasm2233223233232233232",params)
+        
           const loading = this.$loading({
             lock: true,
             text: 'Loading',

src/xt_pages/user/doctorAdvice.vue

                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="开药数量!"
+                  label="开药数量"
                   min-width="80"
                   property="prescribing_number"
                   align="center"
                   align="center"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.single_dose != 0"
-                      >{{ scope.row.single_dose
-                      }}{{ scope.row.single_dose_unit }}</span
-                    >
+<!--                    <span v-if="scope.row.single_dose != 0">{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>-->
+                    <span v-if="scope.row.single_dose != 0">
+<!--                    {{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}-->
+                    <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
+                    <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
+                    <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
+                    <span v-else-if="scope.row.single_dose_unit == 4" >{{ scope.row.single_dose}}ml</span>
+                    <span v-else-if="scope.row.single_dose_unit == 5" >{{ scope.row.single_dose}}万U</span>
+                    <span v-else-if="scope.row.single_dose_unit == 6" >{{ scope.row.single_dose}}枚</span>
+                    <span v-else-if="scope.row.single_dose_unit == 7" >{{ scope.row.single_dose}}粒</span>
+                    <span v-else-if="scope.row.single_dose_unit == 8" >{{ scope.row.single_dose}}片</span>
+                    <span v-else-if="scope.row.single_dose_unit == 9" >{{ scope.row.single_dose}}支</span>
+                    <span v-else-if="scope.row.single_dose_unit == 10" >{{ scope.row.single_dose}}ug</span>
+                    <span v-else-if="scope.row.single_dose_unit == 11" >{{ scope.row.single_dose}}iu</span>
+                    <span v-else-if="scope.row.single_dose_unit == 12" >{{ scope.row.single_dose}}包</span>
+                    <span v-else-if="scope.row.single_dose_unit == 13" >{{ scope.row.single_dose}}袋</span>
+                    <span v-else-if="scope.row.single_dose_unit == 14" >{{ scope.row.single_dose}}万</span>
+                    <span v-else-if="scope.row.single_dose_unit == 15" >{{ scope.row.single_dose}}万iu</span>
+                    <span v-else-if="scope.row.single_dose_unit == 16" >{{ scope.row.single_dose}}丸</span>
+                    <span v-else-if="scope.row.single_dose_unit == 17" >{{ scope.row.single_dose}}盒</span>
+                    <span v-else-if="scope.row.single_dose_unit == 18" >{{ scope.row.single_dose}}瓶</span>
+                    <span v-else-if="scope.row.single_dose_unit == 19" >{{ scope.row.single_dose}}瓶(袋)</span>
+                    <span v-else-if="scope.row.single_dose_unit == 20" >{{ scope.row.single_dose}}次</span>
+                    <span v-else >{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
+                  </span>
+
                   </template>
                 </el-table-column>
                 <el-table-column