huangyw 2 years ago
parent
commit
3b6ec04d8a

File diff suppressed because it is too large
+ 1060 - 493
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue


+ 3 - 3
src/xt_pages/hospitalStation/template/printFive.vue View File

@@ -18,15 +18,15 @@
18 18
           <div style="display:flex;">
19 19
             <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
20 20
             <div class="underLine" style="width:60px;">
21
-              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(0, 4) : '' }}
21
+              {{ getTime(item.record_date) ? getTime(item.record_date).split(' ')[0].slice(0, 4) : '' }}
22 22
             </div>
23 23
             <div style="display: flex;flex-direction: column-reverse;">年</div>
24 24
             <div class="underLine" style="width:60px;">
25
-              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(5, 7) : '' }}
25
+              {{ getTime(item.record_date) ? getTime(item.record_date).split(' ')[0].slice(5, 7) : '' }}
26 26
             </div>
27 27
             <div style="display: flex;flex-direction: column-reverse;">月</div>
28 28
             <div class="underLine" style="width:60px;">
29
-              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(8, 11) : '' }}
29
+              {{ getTime(item.record_date) ? getTime(item.record_date).split(' ')[0].slice(8, 11) : '' }}
30 30
             </div>
31 31
             <div style="display: flex;flex-direction: column-reverse;">日</div>
32 32
           </div>

+ 71 - 71
src/xt_pages/outpatientTool/components/detailStatistics.vue View File

@@ -238,26 +238,26 @@ export default {
238 238
       }
239 239
     },
240 240
     searchAction() {
241
-      let table_id = this.$store.getters.pagedata.list.table_id;
242
-      if (table_id == undefined) {
243
-        this.$store.commit("SET_PAGEDATA", {
244
-          table_id: 0,
245
-          type_id: this.id,
246
-          keywords: this.keywords,
247
-          start_time: this.chargeDate[0],
248
-          end_time: this.chargeDate[1],
249
-          patient_id: this.patient_id,
250
-        });
251
-      } else {
252
-        this.$store.commit("SET_PAGEDATA", {
253
-          table_id: table_id,
254
-          type_id: this.id,
255
-          keywords: this.keywords,
256
-          start_time: this.chargeDate[0],
257
-          end_time: this.chargeDate[1],
258
-          patient_id: this.patient_id,
259
-        });
260
-      }
241
+      // let table_id = this.$store.getters.pagedata.list.table_id;
242
+      // if (table_id == undefined) {
243
+      //   this.$store.commit("SET_PAGEDATA", {
244
+      //     table_id: 0,
245
+      //     type_id: this.id,
246
+      //     keywords: this.keywords,
247
+      //     start_time: this.chargeDate[0],
248
+      //     end_time: this.chargeDate[1],
249
+      //     patient_id: this.patient_id,
250
+      //   });
251
+      // } else {
252
+      //   this.$store.commit("SET_PAGEDATA", {
253
+      //     table_id: table_id,
254
+      //     type_id: this.id,
255
+      //     keywords: this.keywords,
256
+      //     start_time: this.chargeDate[0],
257
+      //     end_time: this.chargeDate[1],
258
+      //     patient_id: this.patient_id,
259
+      //   });
260
+      // }
261 261
       this.getHisSummaryDetailList();
262 262
     },
263 263
     changeDate() {
@@ -267,26 +267,26 @@ export default {
267 267
     },
268 268
     changeItem(id) {
269 269
       this.id = id;
270
-      let table_id = this.$store.getters.pagedata.list.table_id;
271
-      if (table_id == undefined) {
272
-        this.$store.commit("SET_PAGEDATA", {
273
-          table_id: 0,
274
-          type_id: this.id,
275
-          keywords: this.keywords,
276
-          start_time: this.chargeDate[0],
277
-          end_time: this.chargeDate[1],
278
-          patient_id: this.patient_id,
279
-        });
280
-      } else {
281
-        this.$store.commit("SET_PAGEDATA", {
282
-          table_id: table_id,
283
-          type_id: this.id,
284
-          keywords: this.keywords,
285
-          start_time: this.chargeDate[0],
286
-          end_time: this.chargeDate[1],
287
-          patient_id: this.patient_id,
288
-        });
289
-      }
270
+      // let table_id = this.$store.getters.pagedata.list.table_id;
271
+      // if (table_id == undefined) {
272
+      //   this.$store.commit("SET_PAGEDATA", {
273
+      //     table_id: 0,
274
+      //     type_id: this.id,
275
+      //     keywords: this.keywords,
276
+      //     start_time: this.chargeDate[0],
277
+      //     end_time: this.chargeDate[1],
278
+      //     patient_id: this.patient_id,
279
+      //   });
280
+      // } else {
281
+      //   this.$store.commit("SET_PAGEDATA", {
282
+      //     table_id: table_id,
283
+      //     type_id: this.id,
284
+      //     keywords: this.keywords,
285
+      //     start_time: this.chargeDate[0],
286
+      //     end_time: this.chargeDate[1],
287
+      //     patient_id: this.patient_id,
288
+      //   });
289
+      // }
290 290
       this.getHisSummaryDetailList();
291 291
     },
292 292
     getHisSummaryDetailList() {
@@ -491,26 +491,26 @@ export default {
491 491
       // start_time: this.chargeDate[0],
492 492
       // end_time: this.chargeDate[1],
493 493
       // patient_id:this.patient_id
494
-      let table_id = this.$store.getters.pagedata.list.table_id;
495
-      if (table_id == undefined) {
496
-        this.$store.commit("SET_PAGEDATA", {
497
-          table_id: 0,
498
-          type_id: this.id,
499
-          keywords: this.keywords,
500
-          start_time: this.chargeDate[0],
501
-          end_time: this.chargeDate[1],
502
-          patient_id: this.patient_id,
503
-        });
504
-      } else {
505
-        this.$store.commit("SET_PAGEDATA", {
506
-          table_id: table_id,
507
-          type_id: this.id,
508
-          keywords: this.keywords,
509
-          start_time: this.chargeDate[0],
510
-          end_time: this.chargeDate[1],
511
-          patient_id: this.patient_id,
512
-        });
513
-      }
494
+      // let table_id = this.$store.getters.pagedata.list.table_id;
495
+      // if (table_id == undefined) {
496
+      //   this.$store.commit("SET_PAGEDATA", {
497
+      //     table_id: 0,
498
+      //     type_id: this.id,
499
+      //     keywords: this.keywords,
500
+      //     start_time: this.chargeDate[0],
501
+      //     end_time: this.chargeDate[1],
502
+      //     patient_id: this.patient_id,
503
+      //   });
504
+      // } else {
505
+      //   this.$store.commit("SET_PAGEDATA", {
506
+      //     table_id: table_id,
507
+      //     type_id: this.id,
508
+      //     keywords: this.keywords,
509
+      //     start_time: this.chargeDate[0],
510
+      //     end_time: this.chargeDate[1],
511
+      //     patient_id: this.patient_id,
512
+      //   });
513
+      // }
514 514
     },
515 515
     getPrice(val) {
516 516
       var total_price = 0;
@@ -521,17 +521,17 @@ export default {
521 521
     },
522 522
   },
523 523
   created() {
524
-    let list_1 = this.$store.getters.pagedata.list;
525
-          if (list_1.start_time == "") {
526
-            this.chargeDate[0] = "";
527
-          } else {
528
-            this.chargeDate[0] = list_1.start_time;
529
-          }
530
-           if (list_1.end_time == "") {
531
-            this.chargeDate[1] = "";
532
-          } else {
533
-            this.chargeDate[1] = list_1.end_time;
534
-          }
524
+    // let list_1 = this.$store.getters.pagedata.list;
525
+    //       if (list_1.start_time == "") {
526
+    //         this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
527
+    //       } else {
528
+    //         this.chargeDate[0] = list_1.start_time;
529
+    //       }
530
+    //        if (list_1.end_time == "") {
531
+    //         this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
532
+    //       } else {
533
+    //         this.chargeDate[1] = list_1.end_time;
534
+    //       }
535 535
     this.start_time = this.chargeDate[0];
536 536
     this.end_time = this.chargeDate[1];
537 537
     this.getHisSummaryDetailList();

+ 85 - 80
src/xt_pages/outpatientTool/components/gatherStatistics.vue View File

@@ -234,26 +234,26 @@ export default {
234 234
   },
235 235
   methods: {
236 236
     searchAction() {
237
-     let table_id = this.$store.getters.pagedata.list.table_id;
238
-      if (table_id == undefined) {
239
-        this.$store.commit("SET_PAGEDATA", {
240
-          table_id: 0,
241
-          type_id: this.id,
242
-          keywords: this.keywords,
243
-          start_time: this.chargeDate[0],
244
-          end_time: this.chargeDate[1],
245
-          patient_id: this.patient_id,
246
-        });
247
-      } else {
248
-        this.$store.commit("SET_PAGEDATA", {
249
-          table_id: table_id,
250
-          type_id: this.id,
251
-          keywords: this.keywords,
252
-          start_time: this.chargeDate[0],
253
-          end_time: this.chargeDate[1],
254
-          patient_id: this.patient_id,
255
-        });
256
-      }
237
+    //  let table_id = this.$store.getters.pagedata.list.table_id;
238
+    //   if (table_id == undefined) {
239
+    //     this.$store.commit("SET_PAGEDATA", {
240
+    //       table_id: 0,
241
+    //       type_id: this.id,
242
+    //       keywords: this.keywords,
243
+    //       start_time: this.chargeDate[0],
244
+    //       end_time: this.chargeDate[1],
245
+    //       patient_id: this.patient_id,
246
+    //     });
247
+    //   } else {
248
+    //     this.$store.commit("SET_PAGEDATA", {
249
+    //       table_id: table_id,
250
+    //       type_id: this.id,
251
+    //       keywords: this.keywords,
252
+    //       start_time: this.chargeDate[0],
253
+    //       end_time: this.chargeDate[1],
254
+    //       patient_id: this.patient_id,
255
+    //     });
256
+    //   }
257 257
       this.tableList = [];
258 258
       this.getGatherDetailList();
259 259
       console.log(this.tableList, "查看条约");
@@ -272,26 +272,26 @@ export default {
272 272
     },
273 273
     changeItem(id) {
274 274
       this.id = id;
275
-      let table_id = this.$store.getters.pagedata.list.table_id;
276
-      if (table_id == undefined) {
277
-        this.$store.commit("SET_PAGEDATA", {
278
-          table_id: 0,
279
-          type_id: this.id,
280
-          keywords: this.keywords,
281
-          start_time: this.chargeDate[0],
282
-          end_time: this.chargeDate[1],
283
-          patient_id: this.patient_id,
284
-        });
285
-      } else {
286
-        this.$store.commit("SET_PAGEDATA", {
287
-          table_id: table_id,
288
-          type_id: this.id,
289
-          keywords: this.keywords,
290
-          start_time: this.chargeDate[0],
291
-          end_time: this.chargeDate[1],
292
-          patient_id: this.patient_id,
293
-        });
294
-      }
275
+      // let table_id = this.$store.getters.pagedata.list.table_id;
276
+      // if (table_id == undefined) {
277
+      //   this.$store.commit("SET_PAGEDATA", {
278
+      //     table_id: 0,
279
+      //     type_id: this.id,
280
+      //     keywords: this.keywords,
281
+      //     start_time: this.chargeDate[0],
282
+      //     end_time: this.chargeDate[1],
283
+      //     patient_id: this.patient_id,
284
+      //   });
285
+      // } else {
286
+      //   this.$store.commit("SET_PAGEDATA", {
287
+      //     table_id: table_id,
288
+      //     type_id: this.id,
289
+      //     keywords: this.keywords,
290
+      //     start_time: this.chargeDate[0],
291
+      //     end_time: this.chargeDate[1],
292
+      //     patient_id: this.patient_id,
293
+      //   });
294
+      // }
295 295
       this.tableList = [];
296 296
       this.getGatherDetailList();
297 297
     },
@@ -440,14 +440,14 @@ export default {
440 440
           this.medicalInsuranceLevelList =
441 441
             response.data.data.medicalInsuranceLevelList;
442 442
 
443
-          let list_1 = this.$store.getters.pagedata.list;
444
-          if (list_1.keywords == undefined) {
445
-            this.keywords = "";
446
-          } else {
447
-            this.keywords = list_1.keywords;
448
-          }
449
-          this.id = list_1.type_id;
450
-          this.item_type = this.id
443
+          // let list_1 = this.$store.getters.pagedata.list;
444
+          // if (list_1.keywords == undefined) {
445
+          //   this.keywords = "";
446
+          // } else {
447
+          //   this.keywords = list_1.keywords;
448
+          // }
449
+          // this.id = list_1.type_id;
450
+          // this.item_type = this.id
451 451
 
452 452
           if(this.keywords!=""){
453 453
           for(let i=0;i<this.tableList.length;i++){
@@ -820,26 +820,26 @@ export default {
820 820
           "&id=" +
821 821
           this.id,
822 822
       });
823
-        let table_id = this.$store.getters.pagedata.list.table_id;
824
-      if (table_id == undefined) {
825
-        this.$store.commit("SET_PAGEDATA", {
826
-          table_id: 0,
827
-          type_id: this.id,
828
-          keywords: this.keywords,
829
-          start_time: this.chargeDate[0],
830
-          end_time: this.chargeDate[1],
831
-          patient_id: this.patient_id,
832
-        });
833
-      } else {
834
-        this.$store.commit("SET_PAGEDATA", {
835
-          table_id: table_id,
836
-          type_id: this.id,
837
-          keywords: this.keywords,
838
-          start_time: this.chargeDate[0],
839
-          end_time: this.chargeDate[1],
840
-          patient_id: this.patient_id,
841
-        });
842
-      }
823
+      //   let table_id = this.$store.getters.pagedata.list.table_id;
824
+      // if (table_id == undefined) {
825
+      //   this.$store.commit("SET_PAGEDATA", {
826
+      //     table_id: 0,
827
+      //     type_id: this.id,
828
+      //     keywords: this.keywords,
829
+      //     start_time: this.chargeDate[0],
830
+      //     end_time: this.chargeDate[1],
831
+      //     patient_id: this.patient_id,
832
+      //   });
833
+      // } else {
834
+      //   this.$store.commit("SET_PAGEDATA", {
835
+      //     table_id: table_id,
836
+      //     type_id: this.id,
837
+      //     keywords: this.keywords,
838
+      //     start_time: this.chargeDate[0],
839
+      //     end_time: this.chargeDate[1],
840
+      //     patient_id: this.patient_id,
841
+      //   });
842
+      // }
843 843
     },
844 844
     toPrintInvoice() {
845 845
       this.$router.push({
@@ -1245,22 +1245,27 @@ export default {
1245 1245
       return name;
1246 1246
     },
1247 1247
   },
1248
-  created() {
1249
-    let list_1 = this.$store.getters.pagedata.list;
1250
-          if (list_1.start_time == "") {
1251
-            this.chargeDate[0] = "";
1252
-          } else {
1253
-            this.chargeDate[0] = list_1.start_time;
1254
-          }
1255
-           if (list_1.end_time == "") {
1256
-            this.chargeDate[1] = "";
1257
-          } else {
1258
-            this.chargeDate[1] = list_1.end_time;
1259
-    }
1248
+  created() {  
1249
+    // let list_1 = this.$store.getters.pagedata.list;
1250
+    //       if (list_1.start_time == "") {
1251
+    //         this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
1252
+    //       } else {
1253
+    //         this.chargeDate[0] = list_1.start_time;
1254
+    //       }
1255
+    //        if (list_1.end_time == "") {
1256
+    //         this.chargeDate[1] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
1257
+    //       } else {
1258
+    //         this.chargeDate[1] = list_1.end_time;
1259
+    // }
1260
+
1261
+    console.log(this.chargeDate[0],'测试测试')  
1262
+    
1260 1263
     this.start_time = this.chargeDate[0];
1261 1264
     this.end_time = this.chargeDate[1];
1262 1265
     this.tableList = [];
1263 1266
     this.getGatherDetailList();
1267
+    // console.log(this.start_time,this.end_time,'ooooooo')
1268
+    
1264 1269
   },
1265 1270
   watch: {
1266 1271
     patient_id: function () {