|
@@ -619,7 +619,7 @@
|
619
|
619
|
<script>
|
620
|
620
|
import { uParseTime } from "@/utils/tools";
|
621
|
621
|
import print from 'print-js'
|
622
|
|
-
|
|
622
|
+const moment = require('moment')
|
623
|
623
|
import {
|
624
|
624
|
CancelSchedule,
|
625
|
625
|
ChangeSchedule,
|
|
@@ -695,6 +695,7 @@ export default {
|
695
|
695
|
partitions: [],
|
696
|
696
|
jihaos: [],
|
697
|
697
|
weekTitle: ["", "", "", "", "", "", ""],
|
|
698
|
+ weekList: ["", "", "", "", "", "", ""],
|
698
|
699
|
weekDays: ["", "", "", "", "", "", ""],
|
699
|
700
|
currentData: {
|
700
|
701
|
id: 0,
|
|
@@ -1165,6 +1166,7 @@ export default {
|
1165
|
1166
|
getSchedulesOne(params).then(response => {
|
1166
|
1167
|
if (response.data.state == 1) {
|
1167
|
1168
|
this.weekTitle = response.data.data.weekTitle;
|
|
1169
|
+
|
1168
|
1170
|
this.weekDays = response.data.data.days;
|
1169
|
1171
|
this.toDay = response.data.data.today;
|
1170
|
1172
|
var theSchedules = response.data.data.schdules;
|
|
@@ -2110,6 +2112,9 @@ export default {
|
2110
|
2112
|
},
|
2111
|
2113
|
search: function() {
|
2112
|
2114
|
let week_type = 0
|
|
2115
|
+ var weeklist = moment().format('E');//计算今天是这周第几天
|
|
2116
|
+ var first_monday = moment().subtract(weeklist-1, 'days').format('YYYY-MM-DD');//周一日期
|
|
2117
|
+ var end_monday = moment().add(7-weeklist, 'days').format('YYYY-MM-DD')
|
2113
|
2118
|
if (this.weekTime == 'thisWeek'){
|
2114
|
2119
|
week_type = 1
|
2115
|
2120
|
}else if(this.weekTime == 'nextWeek'){
|
|
@@ -2117,12 +2122,14 @@ export default {
|
2117
|
2122
|
}else if(this.weekTime == 'nextTwoWeek'){
|
2118
|
2123
|
week_type = 3
|
2119
|
2124
|
}
|
2120
|
|
-
|
2121
|
|
-
|
|
2125
|
+
|
2122
|
2126
|
const params = {
|
2123
|
2127
|
keywords: this.keywords,
|
2124
|
2128
|
week_type: week_type,
|
|
2129
|
+ start_sch:first_monday,
|
|
2130
|
+ end_sch:end_monday,
|
2125
|
2131
|
};
|
|
2132
|
+ console.log("params",params)
|
2126
|
2133
|
getSearchResult(params).then(response => {
|
2127
|
2134
|
if (response.data.state == 1) {
|
2128
|
2135
|
this.schedulePatients = response.data.data.schdules;
|
|
@@ -2300,6 +2307,7 @@ export default {
|
2300
|
2307
|
// this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
|
2301
|
2308
|
// },
|
2302
|
2309
|
created() {
|
|
2310
|
+
|
2303
|
2311
|
this.getAllZones()
|
2304
|
2312
|
|
2305
|
2313
|
this.changeScheduleType(1)
|