|
@@ -62,8 +62,6 @@
|
62
|
62
|
<el-tab-pane label="候诊区" name="first">
|
63
|
63
|
<div class="cell clearfix" style="margin-bottom:10px;">
|
64
|
64
|
<el-date-picker v-model="selected_date"
|
65
|
|
- format="yyyy-MM-dd"
|
66
|
|
- value-format="yyyy-MM-dd"
|
67
|
65
|
prefix-icon="el-icon-date" @change="handleScheduleDateChange"
|
68
|
66
|
:editable="false" :clearable="false"
|
69
|
67
|
style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
|
|
@@ -160,10 +158,7 @@
|
160
|
158
|
<!-- 透析区 -->
|
161
|
159
|
<el-tab-pane label="透析区" name="second">
|
162
|
160
|
<div class="cell clearfix" style="margin-bottom:10px;">
|
163
|
|
- <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" format="yyyy-MM-dd"
|
164
|
|
- value-format="yyyy-MM-dd"
|
165
|
|
- @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
|
166
|
|
- </el-date-picker>
|
|
161
|
+ <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
|
167
|
162
|
<el-input size="small" style="width:25%;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
|
168
|
163
|
<el-button size="small" class="filter-item" style="margin-right:20px;" type="primary" @click="searchAction">搜索</el-button>
|
169
|
164
|
</div>
|
|
@@ -1484,7 +1479,7 @@ export default {
|
1484
|
1479
|
lastDialysisPrescribe: { id: 0 },
|
1485
|
1480
|
//
|
1486
|
1481
|
activeName: 'first',
|
1487
|
|
- selected_date:moment().format('YYYY-MM-DD'),
|
|
1482
|
+ selected_date: new Date(),
|
1488
|
1483
|
// search_input 和 search_keyword,使输入关键字时不会经常刷新 filtedSchedules
|
1489
|
1484
|
search_keyword: '', // 确定用于搜索的关键字
|
1490
|
1485
|
search_input: '', // 输入中的关键字
|
|
@@ -1553,7 +1548,6 @@ export default {
|
1553
|
1548
|
// end_time2:'',
|
1554
|
1549
|
first_monitor:{},
|
1555
|
1550
|
last_monitor:{},
|
1556
|
|
- new_date:0,
|
1557
|
1551
|
}
|
1558
|
1552
|
},
|
1559
|
1553
|
created() {
|
|
@@ -1568,26 +1562,19 @@ export default {
|
1568
|
1562
|
this.activeName = sessionStorage.getItem("nameActive")
|
1569
|
1563
|
}
|
1570
|
1564
|
var patient_id = this.$route.query.patient_id
|
1571
|
|
- var date = moment().format('YYYY-MM-DD')
|
1572
|
|
- this.new_date = (new Date(date).getTime()/1000)-28800
|
1573
|
|
- this.dialysis_date = ""
|
1574
|
|
- this.dialysis_date = (new Date(date).getTime()/1000)-28800
|
1575
|
|
- // var date = this.$route.query.date
|
|
1565
|
+ var date = this.$route.query.date
|
1576
|
1566
|
this.patient_id = patient_id
|
1577
|
|
- // this.date = date
|
1578
|
|
- // this.new_date = date
|
1579
|
|
- // this.dialysis_date= date
|
|
1567
|
+ this.date = date
|
|
1568
|
+ this.dialysis_date=date
|
1580
|
1569
|
this.getScheduleDetail()
|
1581
|
1570
|
this.getLongAdvice()
|
1582
|
1571
|
|
1583
|
|
- // this.selected_date = this.$route.query.date * 1000
|
1584
|
|
- // this.new_date = this.$route.query.date * 1000
|
|
1572
|
+ this.selected_date = this.$route.query.date * 1000
|
1585
|
1573
|
var schedule_type_selected = this.$store.getters.schedule_type_selected
|
1586
|
1574
|
var zone_selected = this.$store.getters.zone_selected
|
1587
|
1575
|
var patient_state_selected = this.$store.getters.patient_state_selected
|
1588
|
1576
|
var treat_state_selected = this.$store.getters.treat_state_selected
|
1589
|
|
- // var selected_date = this.$store.getters.selected_date
|
1590
|
|
- // console.log("日志时间2222222222222222",selected_date)
|
|
1577
|
+ var selected_date = this.$store.getters.selected_date
|
1591
|
1578
|
if (schedule_type_selected) {
|
1592
|
1579
|
this.scheduleStateVal = schedule_type_selected.schedule_type_selected
|
1593
|
1580
|
}
|
|
@@ -1600,9 +1587,9 @@ export default {
|
1600
|
1587
|
if (treat_state_selected) {
|
1601
|
1588
|
this.treatStateVal = treat_state_selected.treat_state_selected
|
1602
|
1589
|
}
|
1603
|
|
- // if (selected_date.selected_date) {
|
1604
|
|
- // this.selected_date = selected_date.selected_date.format('YYYY-MM-DD')
|
1605
|
|
- // }
|
|
1590
|
+ if (selected_date.selected_date) {
|
|
1591
|
+ this.selected_date = selected_date.selected_date
|
|
1592
|
+ }
|
1606
|
1593
|
|
1607
|
1594
|
this.initData = {
|
1608
|
1595
|
cmd: "queue/join",
|
|
@@ -1892,7 +1879,7 @@ export default {
|
1892
|
1879
|
getLongAdvice() {
|
1893
|
1880
|
const params = {
|
1894
|
1881
|
patient_id: this.patient_id,
|
1895
|
|
- schedule_date:this.new_date,
|
|
1882
|
+ schedule_date:this.$route.query.date,
|
1896
|
1883
|
|
1897
|
1884
|
}
|
1898
|
1885
|
getLongAdviceTwo(params).then(rs => {
|
|
@@ -1961,14 +1948,14 @@ export default {
|
1961
|
1948
|
},
|
1962
|
1949
|
getScheduleDetail: function() {
|
1963
|
1950
|
this.loading = true
|
1964
|
|
- // var dateStr = parseTime(this.date, '{y}-{m}-{d}')
|
|
1951
|
+ var dateStr = parseTime(this.date, '{y}-{m}-{d}')
|
1965
|
1952
|
if(this.$route.query.showView == true){
|
1966
|
1953
|
this.loading = false
|
1967
|
1954
|
return
|
1968
|
1955
|
}
|
1969
|
|
- console.log('kkkkkkk2222222222222222222',this.selected_date);
|
|
1956
|
+ // console.log('kkkkkkk',dateStr);
|
1970
|
1957
|
this.doctor_advices = []
|
1971
|
|
- getDialysisScheduleDetail(this.patient_id, this.selected_date).then(rs => {
|
|
1958
|
+ getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
|
1972
|
1959
|
|
1973
|
1960
|
var resp = rs.data
|
1974
|
1961
|
if (resp.state == 1) {
|
|
@@ -2246,9 +2233,6 @@ export default {
|
2246
|
2233
|
// schedule_type: this.schedule_type_selected,
|
2247
|
2234
|
// schedule_date: this.selected_date,
|
2248
|
2235
|
// })
|
2249
|
|
- console.log("index-------------",index)
|
2250
|
|
- this.new_date = (new Date(index).getTime()/1000)-28800
|
2251
|
|
- this.dialysis_date = (new Date(index).getTime()/1000)-28800
|
2252
|
2236
|
this.selected_date = index
|
2253
|
2237
|
this.$store.dispatch('SetSelectedDate', { selected_date: index })
|
2254
|
2238
|
this.requestDialysisSchedules()
|
|
@@ -2347,9 +2331,8 @@ export default {
|
2347
|
2331
|
},
|
2348
|
2332
|
requestDialysisSchedules: function() {
|
2349
|
2333
|
|
2350
|
|
- // var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
|
2351
|
|
- console.log("热切吴2222222222",this.selected_date)
|
2352
|
|
- getDialysisSchedules(this.selected_date).then(rs => {
|
|
2334
|
+ var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
|
|
2335
|
+ getDialysisSchedules(ymd).then(rs => {
|
2353
|
2336
|
var resp = rs.data
|
2354
|
2337
|
if (resp.state == 1) {
|
2355
|
2338
|
var schedules = resp.data.schedules
|
|
@@ -2400,27 +2383,21 @@ export default {
|
2400
|
2383
|
changePatient(schedual) {
|
2401
|
2384
|
this.patient_id = schedual.patient_id
|
2402
|
2385
|
this.date = schedual.schedule_date
|
2403
|
|
-
|
2404
|
|
- this.new_date = schedual.schedule_date
|
2405
|
|
- this.dialysis_date = ""
|
2406
|
|
- this.dialysis_date = schedual.schedule_date
|
2407
|
|
-
|
2408
|
|
- console.log("到哪去啊大大阿道夫阿道夫",this.dialysis_date)
|
2409
|
2386
|
this.getScheduleDetail();
|
2410
|
2387
|
console.log('schedual',schedual);
|
2411
|
2388
|
//this.getLongAdvice();
|
2412
|
2389
|
|
2413
|
2390
|
var patient_id = schedual.patient_id
|
2414
|
|
- // var date = schedual.schedule_date
|
2415
|
|
- // this.$router.push({
|
2416
|
|
- // path: '/dialysis/details',
|
2417
|
|
- // query: {
|
2418
|
|
- // patient_id: patient_id,
|
2419
|
|
- // date: date,
|
2420
|
|
- // patient_name: schedual.patient.name,
|
2421
|
|
- // mode_id:schedual.mode_id
|
2422
|
|
- // }
|
2423
|
|
- // })
|
|
2391
|
+ var date = schedual.schedule_date
|
|
2392
|
+ this.$router.push({
|
|
2393
|
+ path: '/dialysis/details',
|
|
2394
|
+ query: {
|
|
2395
|
+ patient_id: patient_id,
|
|
2396
|
+ date: date,
|
|
2397
|
+ patient_name: schedual.patient.name,
|
|
2398
|
+ mode_id:schedual.mode_id
|
|
2399
|
+ }
|
|
2400
|
+ })
|
2424
|
2401
|
},
|
2425
|
2402
|
handleClick(type) {
|
2426
|
2403
|
sessionStorage.setItem('nameActive', type.name);
|
|
@@ -2931,7 +2908,7 @@ export default {
|
2931
|
2908
|
path: '/dialysis/details',
|
2932
|
2909
|
query: {
|
2933
|
2910
|
patient_id: parseInt(res.data.data.patientInfo.patient_id),
|
2934
|
|
- date: this.new_date,
|
|
2911
|
+ date: this.$route.query.date,
|
2935
|
2912
|
patient_name: res.data.data.patientInfo.patient_name,
|
2936
|
2913
|
mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
|
2937
|
2914
|
curPatientTime:res.data.data.patientInfo.create_time,
|
|
@@ -2946,7 +2923,7 @@ export default {
|
2946
|
2923
|
path: '/dialysis/details',
|
2947
|
2924
|
query: {
|
2948
|
2925
|
patient_id: parseInt(res.data.data.patientInfo.patient_id),
|
2949
|
|
- date: this.new_date,
|
|
2926
|
+ date: this.$route.query.date,
|
2950
|
2927
|
patient_name: res.data.data.patientInfo.patient_name,
|
2951
|
2928
|
mode_id:this.$route.query.mode_id,
|
2952
|
2929
|
curPatientTime:res.data.data.patientInfo.create_time,
|
|
@@ -2992,7 +2969,7 @@ export default {
|
2992
|
2969
|
path: '/dialysis/details',
|
2993
|
2970
|
query: {
|
2994
|
2971
|
patient_id: parseInt(res.data.data.patientInfo.patient_id),
|
2995
|
|
- date:this.new_date,
|
|
2972
|
+ date: this.$route.query.date,
|
2996
|
2973
|
patient_name: res.data.data.patientInfo.patient_name,
|
2997
|
2974
|
mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
|
2998
|
2975
|
curPatientTime:res.data.data.patientInfo.create_time,
|
|
@@ -3005,7 +2982,7 @@ export default {
|
3005
|
2982
|
path: '/dialysis/details',
|
3006
|
2983
|
query: {
|
3007
|
2984
|
patient_id: parseInt(res.data.data.patientInfo.patient_id),
|
3008
|
|
- date:this.new_date,
|
|
2985
|
+ date: this.$route.query.date,
|
3009
|
2986
|
patient_name: res.data.data.patientInfo.patient_name,
|
3010
|
2987
|
mode_id:this.$route.query.mode_id,
|
3011
|
2988
|
curPatientTime:res.data.data.patientInfo.create_time,
|
|
@@ -3041,7 +3018,7 @@ export default {
|
3041
|
3018
|
|
3042
|
3019
|
var params = {
|
3043
|
3020
|
patient_id:this.$route.query.patient_id,
|
3044
|
|
- record_date:this.new_date,
|
|
3021
|
+ record_date:this.$route.query.date,
|
3045
|
3022
|
}
|
3046
|
3023
|
getInitPrintData(params).then(response=>{
|
3047
|
3024
|
if(response.data.state == 1){
|