|
@@ -392,7 +392,9 @@ export default {
|
392
|
392
|
mode:[{id:1,name:'HD'},{id:2,name:'HDF'},{id:3,name:'HD+HP'},{id:4,name:'HP'},{id:5,name:'HF'},{id:6,name:'SCUF'},{id:7,name:'IUF'}
|
393
|
393
|
,{id:8,name:'HFHD'},{id:9,name:'HFHD+HP'},{id:10,name:'PHF'},{id:11,name:'HFR'},{id:12,name:'HDF+HP'},{id:13,name:'CRRT'},{id:14,name:'腹水回输'},{id:19,name:'IUF+HD'},{id:20,name:'UF'},{id:21,name:'HD+'}
|
394
|
394
|
,{id:22,name:'血浆胆红素吸附+HDF'},{id:23,name:'血浆胆红素吸附'},{id:24,name:'I-HDF'},{id:25,name:'HD高通'},{id:26,name:'CVVH'},{id:27,name:'CVVHD'},{id:28,name:'CVVHDF'}
|
395
|
|
- ,{id:29,name:'PE'},{id:30,name:"血浆胆红素吸附+HP"},{id:31,name:"HPD"},{id:32,name:"HDP"},{id:33,name:"HFD"},{id:34,name:'HDF100'},{id:35,name:'HDF600'},{id:36,name:'HDF800'},{id:37,name:'HDF1000'}]
|
|
395
|
+ ,{id:29,name:'PE'},{id:30,name:"血浆胆红素吸附+HP"},{id:31,name:"HPD"},{id:32,name:"HDP"},{id:33,name:"HFD"},{id:34,name:'HDF100'},{id:35,name:'HDF600'},{id:36,name:'HDF800'},{id:37,name:'HDF1000'}],
|
|
396
|
+ statr_date:'',
|
|
397
|
+ end_date:'',
|
396
|
398
|
}
|
397
|
399
|
},
|
398
|
400
|
components: {
|
|
@@ -2807,7 +2809,7 @@ export default {
|
2807
|
2809
|
partition_id: this.partition_id,
|
2808
|
2810
|
schedule_type: this.schedule_type
|
2809
|
2811
|
}
|
2810
|
|
- // console.log("params32323232323223", params)
|
|
2812
|
+ console.log("params32323232323223", params)
|
2811
|
2813
|
getThreeWeekList(params).then(response => {
|
2812
|
2814
|
if (response.data.state == 1) {
|
2813
|
2815
|
var partitions = response.data.data.partitions
|
|
@@ -3924,8 +3926,10 @@ export default {
|
3924
|
3926
|
//筛选导出排班数据源
|
3925
|
3927
|
getThreeWeekList2() {
|
3926
|
3928
|
var params = {
|
3927
|
|
- start_time: this.start_time,
|
3928
|
|
- end_time: this.end_time,
|
|
3929
|
+ // start_time: this.start_time,
|
|
3930
|
+ // end_time: this.end_time,
|
|
3931
|
+ start_time: this.statr_date,
|
|
3932
|
+ end_time: this.end_date,
|
3929
|
3933
|
partition_id: this.partition_id,
|
3930
|
3934
|
schedule_type: this.schedule_type
|
3931
|
3935
|
}
|
|
@@ -3933,7 +3937,7 @@ export default {
|
3933
|
3937
|
getThreeWeekList(params).then(response => {
|
3934
|
3938
|
if (response.data.state == 1) {
|
3935
|
3939
|
var partitions = response.data.data.partitions
|
3936
|
|
- console.log('yyyyyyy',response.data.data);
|
|
3940
|
+ console.log('yyyyyyy222',response.data.data);
|
3937
|
3941
|
// const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
|
3938
|
3942
|
const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1']
|
3939
|
3943
|
var list = []
|
|
@@ -4234,17 +4238,16 @@ export default {
|
4234
|
4238
|
var laststart = this.getTimestamp(last_start) - 28800
|
4235
|
4239
|
|
4236
|
4240
|
var lastend = this.getTimestamp(last_end) - 28800
|
4237
|
|
-
|
|
4241
|
+ console.log("week",this.export_type)
|
4238
|
4242
|
if (this.export_type == 0) {
|
4239
|
4243
|
for (let i = 0; i < scheduleList.length; i++) {
|
4240
|
4244
|
if(this.activeName=='thisWeek'){
|
4241
|
|
- // console.log("week1")
|
4242
|
4245
|
if (scheduleList[i].schedule_date >= start && scheduleList[i].schedule_date <= end) {
|
4243
|
4246
|
var weekday= this.changeWeekType(scheduleList[i].schedule_week)
|
4244
|
4247
|
if(this.schedule_type!=0 || this.partition_id != 0 || this.week_date !=''){
|
4245
|
4248
|
if(this.schedule_type==scheduleList[i].schedule_type &&
|
4246
|
4249
|
this.partition_id==scheduleList[i].partition_id &&weekday==this.week_date){
|
4247
|
|
-
|
|
4250
|
+
|
4248
|
4251
|
week.push(scheduleList[i])
|
4249
|
4252
|
}
|
4250
|
4253
|
|
|
@@ -4842,15 +4845,24 @@ export default {
|
4842
|
4845
|
},
|
4843
|
4846
|
|
4844
|
4847
|
changeWeekDay(val){
|
4845
|
|
- console.log("Val2332322323wo",val)
|
|
4848
|
+ console.log("Val2332322323wo",this.days,this.end_time)
|
4846
|
4849
|
var str = val.join(",")
|
4847
|
|
- console.log("stor233233223",str)
|
|
4850
|
+
|
4848
|
4851
|
this.week_date = str
|
|
4852
|
+ const week_arr=this.days.slice(0,7)
|
|
4853
|
+ console.log("stor233233223",week_arr)
|
|
4854
|
+ for(let i in this.weekType){
|
|
4855
|
+ if(str==this.weekType[i].name){
|
|
4856
|
+ this.statr_date= week_arr[i]
|
|
4857
|
+ this.end_date= week_arr[i]
|
|
4858
|
+ }
|
|
4859
|
+ }
|
|
4860
|
+ // this.statr_date=
|
|
4861
|
+ // this.end_date=
|
4849
|
4862
|
if(str==''){
|
4850
|
4863
|
// console.log('llllll');
|
4851
|
4864
|
this.getThreeWeekList()
|
4852
|
4865
|
}else{
|
4853
|
|
- // console.log('oooooo');
|
4854
|
4866
|
this.getThreeWeekList2()
|
4855
|
4867
|
}
|
4856
|
4868
|
// this.getThreeWeekList()
|