|
@@ -1275,7 +1275,7 @@
|
1275
|
1275
|
var preTime = ''
|
1276
|
1276
|
|
1277
|
1277
|
if (prescription.pre_time == 0) {
|
1278
|
|
- if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
|
|
1278
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0){
|
1279
|
1279
|
if (this.schedule.schedule_type == 1) {
|
1280
|
1280
|
preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
1281
|
1281
|
} else if (this.schedule.schedule_type == 2) {
|
|
@@ -1284,13 +1284,13 @@
|
1284
|
1284
|
preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
1285
|
1285
|
}
|
1286
|
1286
|
}else{
|
1287
|
|
- preTime = ""
|
|
1287
|
+ preTime = nowTime
|
1288
|
1288
|
}
|
1289
|
1289
|
} else {
|
1290
|
|
- if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
|
|
1290
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0){
|
1291
|
1291
|
preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
|
1292
|
1292
|
}else{
|
1293
|
|
- preTime = ""
|
|
1293
|
+ preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
|
1294
|
1294
|
}
|
1295
|
1295
|
}
|
1296
|
1296
|
|
|
@@ -1405,14 +1405,23 @@
|
1405
|
1405
|
tempProject.push(obj)
|
1406
|
1406
|
}
|
1407
|
1407
|
|
1408
|
|
- if (this.schedule.schedule_type == 1) {
|
1409
|
|
- var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
1410
|
|
- } else if (this.schedule.schedule_type == 2) {
|
1411
|
|
- var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
1412
|
|
- } else if (this.schedule.schedule_type == 3) {
|
1413
|
|
- var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
1408
|
+ var preTime = ""
|
|
1409
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0){
|
|
1410
|
+ if (this.schedule.schedule_type == 1) {
|
|
1411
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
1412
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
1413
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
1414
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
1415
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
1416
|
+ }
|
|
1417
|
+ }else{
|
|
1418
|
+ preTime = nowTime
|
|
1419
|
+
|
1414
|
1420
|
}
|
1415
|
1421
|
|
|
1422
|
+
|
|
1423
|
+
|
|
1424
|
+
|
1416
|
1425
|
let index = i + 1
|
1417
|
1426
|
let obj = {
|
1418
|
1427
|
id: 0,
|
|
@@ -1693,15 +1702,17 @@
|
1693
|
1702
|
// }
|
1694
|
1703
|
|
1695
|
1704
|
var preTime = ''
|
1696
|
|
-
|
1697
|
1705
|
if (prescription.pre_time == 0) {
|
1698
|
|
- // preTime = nowTime
|
1699
|
|
- if (this.schedule.schedule_type == 1) {
|
1700
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
1701
|
|
- } else if (this.schedule.schedule_type == 2) {
|
1702
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
1703
|
|
- } else if (this.schedule.schedule_type == 3) {
|
1704
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
1706
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0) {
|
|
1707
|
+ if (this.schedule.schedule_type == 1) {
|
|
1708
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
1709
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
1710
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
1711
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
1712
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
1713
|
+ }
|
|
1714
|
+ }else{
|
|
1715
|
+ preTime = nowTime
|
1705
|
1716
|
}
|
1706
|
1717
|
} else {
|
1707
|
1718
|
preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
|
|
@@ -1821,12 +1832,17 @@
|
1821
|
1832
|
|
1822
|
1833
|
// var preTime = nowTime
|
1823
|
1834
|
var preTime = ''
|
1824
|
|
- if (this.schedule.schedule_type == 1) {
|
1825
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
1826
|
|
- } else if (this.schedule.schedule_type == 2) {
|
1827
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
1828
|
|
- } else if (this.schedule.schedule_type == 3) {
|
1829
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
1835
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0) {
|
|
1836
|
+
|
|
1837
|
+ if (this.schedule.schedule_type == 1) {
|
|
1838
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
1839
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
1840
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
1841
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
1842
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
1843
|
+ }
|
|
1844
|
+ }else{
|
|
1845
|
+ preTime = nowTime
|
1830
|
1846
|
}
|
1831
|
1847
|
|
1832
|
1848
|
let index = i + 1
|
|
@@ -3195,12 +3211,18 @@
|
3195
|
3211
|
|
3196
|
3212
|
if (prescription.pre_time == 0) {
|
3197
|
3213
|
// preTime = nowTime
|
3198
|
|
- if (this.schedule.schedule_type == 1) {
|
3199
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
3200
|
|
- } else if (this.schedule.schedule_type == 2) {
|
3201
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
3202
|
|
- } else if (this.schedule.schedule_type == 3) {
|
3203
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3214
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0) {
|
|
3215
|
+
|
|
3216
|
+ if (this.schedule.schedule_type == 1) {
|
|
3217
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
3218
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
3219
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
3220
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
3221
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3222
|
+ }
|
|
3223
|
+ }else{
|
|
3224
|
+ preTime = nowTime
|
|
3225
|
+
|
3204
|
3226
|
}
|
3205
|
3227
|
} else {
|
3206
|
3228
|
preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
|
|
@@ -3314,14 +3336,15 @@
|
3314
|
3336
|
tempProject.push(obj)
|
3315
|
3337
|
}
|
3316
|
3338
|
|
3317
|
|
- // var preTime = nowTime
|
3318
|
|
- var preTime = ''
|
3319
|
|
- if (this.schedule.schedule_type == 1) {
|
3320
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
3321
|
|
- } else if (this.schedule.schedule_type == 2) {
|
3322
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
3323
|
|
- } else if (this.schedule.schedule_type == 3) {
|
3324
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3339
|
+ var preTime = nowTime
|
|
3340
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0) {
|
|
3341
|
+ if (this.schedule.schedule_type == 1) {
|
|
3342
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
3343
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
3344
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
3345
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
3346
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3347
|
+ }
|
3325
|
3348
|
}
|
3326
|
3349
|
|
3327
|
3350
|
let index = i + 1
|
|
@@ -3646,16 +3669,17 @@
|
3646
|
3669
|
// tempAddition.push(obj)
|
3647
|
3670
|
// }
|
3648
|
3671
|
|
3649
|
|
- var preTime = ''
|
|
3672
|
+ var preTime = nowTime
|
3650
|
3673
|
|
3651
|
3674
|
if (prescription.pre_time == 0) {
|
3652
|
|
- // preTime = nowTime
|
3653
|
|
- if (this.schedule.schedule_type == 1) {
|
3654
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
3655
|
|
- } else if (this.schedule.schedule_type == 2) {
|
3656
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
3657
|
|
- } else if (this.schedule.schedule_type == 3) {
|
3658
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3675
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0) {
|
|
3676
|
+ if (this.schedule.schedule_type == 1) {
|
|
3677
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
3678
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
3679
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
3680
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
3681
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3682
|
+ }
|
3659
|
3683
|
}
|
3660
|
3684
|
} else {
|
3661
|
3685
|
preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
|
|
@@ -3770,14 +3794,16 @@
|
3770
|
3794
|
tempProject.push(obj)
|
3771
|
3795
|
}
|
3772
|
3796
|
|
3773
|
|
- // var preTime = nowTime
|
3774
|
|
- var preTime = ''
|
3775
|
|
- if (this.schedule.schedule_type == 1) {
|
3776
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
3777
|
|
- } else if (this.schedule.schedule_type == 2) {
|
3778
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
3779
|
|
- } else if (this.schedule.schedule_type == 3) {
|
3780
|
|
- preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3797
|
+ var preTime = nowTime
|
|
3798
|
+ // var preTime = ''
|
|
3799
|
+ if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0) {
|
|
3800
|
+ if (this.schedule.schedule_type == 1) {
|
|
3801
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
|
|
3802
|
+ } else if (this.schedule.schedule_type == 2) {
|
|
3803
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
|
|
3804
|
+ } else if (this.schedule.schedule_type == 3) {
|
|
3805
|
+ preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
|
|
3806
|
+ }
|
3781
|
3807
|
}
|
3782
|
3808
|
|
3783
|
3809
|
let index = i + 1
|