处理

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

@@ -99,6 +99,7 @@
         </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"
@@ -106,6 +107,8 @@
             >
               审核
             </el-button>
+            </span>
+           
             <span v-if="scope.row.trial_status == 1">
             <el-button
               size="small"

src/xt_pages/DepositManagement/print/printindex.vue

@@ -36,7 +36,7 @@
                 >￥{{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

@@ -404,7 +404,7 @@
                 </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">
@@ -470,6 +470,16 @@
                             </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/outpatientTool/components/detailStatistics.vue

@@ -121,7 +121,7 @@
       </el-table-column>
      
     </el-table>
-    <div style="display:flex;justify-content: space-around;">
+    <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()}}

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -125,7 +125,7 @@
       </el-table-column>
 
     </el-table>
-     <div>
+     <div style="margin-top: 25px;">
       <div class="listInfo">
             <div>西药：{{getWesternMedicineCostTotal()}}</div>
             <div>中成药：{{getChineseTraditionalMedicineCostTotal()}}</div>

src/xt_pages/outpatientTool/statistics.vue

@@ -1,34 +1,47 @@
 <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
+            :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>
@@ -39,21 +52,27 @@
           <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,
@@ -61,58 +80,79 @@ export default {
     BreadCrumb,
   },
   data() {
-
     return {
-      patientTableData:[],
+      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) {
+    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)
+        
+      });
+    } else {
+      next((vm) => {
+        vm.getPatientList()
+        // setTimeout(() => {
+        //   vm.getHisOrderList();
+        // },300)
+        
+      });
     }
   },
+
   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;
+
+          this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
         }
-      })
+      });
     },
-    searchAction(){
-      this.getPatientList()
+    searchAction() {
+      this.getPatientList();
     },
-    handleCurrentChange(row){
-      this.patient_id = 0
-      this.patient_id = row.id
+    handleCurrentChange(row,index) {
+      this.patient_id = row.id;
       // this.$refs.child.getHisSummaryDetailList()
       // this.$refs.childOne.getGatherDetailList()
+      // this.$store.commit("SET_PAGEDATA",{
+      //   patient_id: row.id,
+      // })
+      console.log(index,'po')
     },
-
   },
   created() {
-    const tableHeight = document.body.clientHeight - 290
-    this.tableHeight = tableHeight
-    this.getPatientList()
-
+    const tableHeight = document.body.clientHeight - 290;
+    this.tableHeight = tableHeight;
+    this.getPatientList();
   },
 
-  mounted() {
-
-  },
-  watch: {}
-}
+  mounted() {},
+  watch: {},
+};
 </script>
 
 <style lang="scss" scoped>
@@ -138,10 +178,9 @@ export default {
   display: flex;
   flex-direction: column;
 
-.el-radio {
-  margin-right: 5px;
-}
-
+  .el-radio {
+    margin-right: 5px;
+  }
 }
 .mainRight {
   margin-left: 10px;
@@ -151,12 +190,11 @@ export default {
   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;
@@ -169,16 +207,15 @@ export default {
   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;
@@ -192,21 +229,19 @@ export default {
   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 {
@@ -240,25 +275,24 @@ export default {
   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%;
@@ -298,68 +332,83 @@ p {
 
 <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>