|
@@ -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 () {
|