日期

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -238,26 +238,26 @@ export default {
       }
     },
     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,
-      //   });
-      // }
+      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() {
@@ -267,26 +267,26 @@ export default {
     },
     changeItem(id) {
       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,
-      //   });
-      // }
+      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() {
@@ -330,8 +330,21 @@ export default {
 
           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.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
 
+          
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i].index != "合计") {
@@ -491,26 +504,26 @@ export default {
       // 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,
-      //   });
-      // }
+      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;
@@ -521,17 +534,17 @@ export default {
     },
   },
   created() {
-    // let list_1 = this.$store.getters.pagedata.list;
-    //       if (list_1.start_time == "") {
-    //         this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
-    //       } else {
-    //         this.chargeDate[0] = list_1.start_time;
-    //       }
-    //        if (list_1.end_time == "") {
-    //         this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
-    //       } else {
-    //         this.chargeDate[1] = list_1.end_time;
-    //       }
+    let list_1 = this.$store.getters.pagedata.list;
+          if (!list_1.start_time ||list_1.start_time == "") {
+            this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
+          } else {
+            this.chargeDate[0] = list_1.start_time;
+          }
+           if (!list_1.end_time ||list_1.end_time == "") {
+            this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
+          } else {
+            this.chargeDate[1] = list_1.end_time;
+          }
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.getHisSummaryDetailList();

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -234,29 +234,29 @@ export default {
   },
   methods: {
     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,
-    //     });
-    //   }
+      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.tableList = [];
       this.getGatherDetailList();
-      console.log(this.tableList, "查看条约");
+      // console.log(this.tableList, "查看条约");
     },
     getPrice(val) {
       var total_price = 0;
@@ -272,26 +272,26 @@ export default {
     },
     changeItem(id) {
       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,
-      //   });
-      // }
+      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.tableList = [];
       this.getGatherDetailList();
     },
@@ -440,26 +440,33 @@ export default {
           this.medicalInsuranceLevelList =
             response.data.data.medicalInsuranceLevelList;
 
-          // 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
+          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.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
+          console.log(this.item_type,'this.item_type')
+          
 
-          if(this.keywords!=""){
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].name.indexOf(this.keywords) >-1){
-              new_arr.push(this.tableList[i])
+          if (this.keywords != "") {
+            for (let i = 0; i < this.tableList.length; i++) {
+              if (this.tableList[i].name.indexOf(this.keywords) > -1) {
+                new_arr.push(this.tableList[i]);
+              }
+            }
+            var obj = { index: "合计", is_total: 1, total: 0 };
+            obj.total = this.getPrice(new_arr);
+            this.tableList = [];
+            this.tableList = new_arr;
           }
-        }
-        var obj ={index:"合计",is_total:1,total:0}
-        obj.total = this.getPrice(new_arr)
-        this.tableList = []
-        this.tableList = new_arr
-      }
           if (this.id == 1) {
             var new_arr = [];
             for (let i = 0; i < this.tableList.length; i++) {
@@ -820,26 +827,26 @@ export default {
           "&id=" +
           this.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,
-      //   });
-      // }
+      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,
+        });
+      }
     },
     toPrintInvoice() {
       this.$router.push({
@@ -1245,27 +1252,27 @@ export default {
       return name;
     },
   },
-  created() {  
-    // let list_1 = this.$store.getters.pagedata.list;
-    //       if (list_1.start_time == "") {
-    //         this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
-    //       } else {
-    //         this.chargeDate[0] = list_1.start_time;
-    //       }
-    //        if (list_1.end_time == "") {
-    //         this.chargeDate[1] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
-    //       } else {
-    //         this.chargeDate[1] = list_1.end_time;
-    // }
+  created() {
+    let list_1 = this.$store.getters.pagedata.list;
+    if (!list_1.start_time || list_1.start_time == "") {
+      this.chargeDate[0] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[0] = list_1.start_time;
+    }
+    if (!list_1.end_time || list_1.end_time == "") {
+      this.chargeDate[1] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[1] = list_1.end_time;
+    }
 
-    console.log(this.chargeDate[0],'测试测试')  
-    
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.tableList = [];
     this.getGatherDetailList();
-    // console.log(this.start_time,this.end_time,'ooooooo')
-    
   },
   watch: {
     patient_id: function () {

src/xt_pages/outpatientTool/detailPrint.vue

@@ -4,48 +4,94 @@
       <el-button type="primary" @click="printtpage">打印</el-button>
     </div>
     <div id="list-print" class="list-print">
-      <div class="listTitle">
+      <table class="listTable"
+        border="0"
+        cellspacing="0"
+        style="font-size: 14px"
+        align="center">
+        <thead style="display: table-header-group; font-weight: bold;border-bottom: 1px solid;">
+          <tr
+            ><td colspan="4" align="center" style="font-size: 20px"
+              >{{ $store.getters.xt_user.org.org_name }}费用清单</td
+            ></tr
+          >
+          <tr>
+            <td>患者姓名：{{ patient.name }}</td>
+            <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
+            <td>结算类别：
+          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          {{getType(his_record_patient.balance_accounts_type)}}</td>
+            <td>发票号码：{{order.fa_piao_number}}</td>
+          </tr>
+          <tr>
+            <td>住院/门诊号：
+          <!-- {{his_patient.number}} -->
+          {{his_record_patient.ipt_otp_no}}</td>
+            <td>科室：
+          <!-- {{ getDepartment(his_patient.departments) }} -->
+          {{ getDepartment(his_record_patient.departments) }}</td>
+            <td>就诊流水号：
+          <!-- {{ his_patient.number }} -->
+          {{his_record_patient.number}}</td>
+          </tr>
+          <tr>
+            <td>总费用：{{ getAllPice() }}</td>
+            <td>个人支付：
+          <!-- <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>
+            </td>
+            <td>基金支付记账：{{ getFundPaySumamt() }}</td>
+            <td>补充医疗支付记账：{{ getHifesPay() }}</td>
+          </tr>
+          <tr>
+            <td>
+              救助支付金额：{{ getMafPay() }}
+            </td>
+          </tr>
+        </thead>
+      </table>
+
+      <!-- <div class="listTitle">
         {{ $store.getters.xt_user.org.org_name }}费用清单
-      </div>
-      <div class="listInfo">
+      </div> -->
+
+      <!-- <div class="listInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>住院/门诊号：
-          <!-- {{his_patient.number}} -->
           {{his_record_patient.ipt_otp_no}}
         </div>
         <div>科室：
-          <!-- {{ getDepartment(his_patient.departments) }} -->
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-          <!-- {{ his_patient.number }} -->
+       
           {{his_record_patient.number}}
         </div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <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="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 style="min-width:300px;">补充医疗支付记账：{{ getHifesPay() }}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>救助支付金额：{{ getMafPay() }}</div>
-      </div>
+      </div> -->
       <table class="listTable" border="1">
         <tr style="height:45px">
           <td width="100" style="text-align: center">序号</td>

src/xt_pages/outpatientTool/statistics.vue

@@ -167,11 +167,10 @@ export default {
 
     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");
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
     },
     searchAction() {
       this.getPatientList();