|
@@ -73,7 +73,7 @@
|
73
|
73
|
</el-switch>
|
74
|
74
|
</div>
|
75
|
75
|
</div>
|
76
|
|
-
|
|
76
|
+
|
77
|
77
|
<el-dialog :visible.sync="searchTableVisible" width="80%">
|
78
|
78
|
<el-table
|
79
|
79
|
:data="schedulePatients"
|
|
@@ -166,7 +166,7 @@
|
166
|
166
|
ref="table"
|
167
|
167
|
style="table-layout: fixed;"
|
168
|
168
|
>
|
169
|
|
-
|
|
169
|
+
|
170
|
170
|
<el-table-column
|
171
|
171
|
prop="area"
|
172
|
172
|
label="分区"
|
|
@@ -525,7 +525,7 @@
|
525
|
525
|
</el-form-item>
|
526
|
526
|
<el-form-item label="透析机: " prop="bed_id">
|
527
|
527
|
<el-select
|
528
|
|
- v-model="device_id"
|
|
528
|
+ v-model="changeSchedule.bed_id"
|
529
|
529
|
placeholder="请选择"
|
530
|
530
|
style="width: 100%"
|
531
|
531
|
>
|
|
@@ -877,14 +877,14 @@ export default {
|
877
|
877
|
|
878
|
878
|
},
|
879
|
879
|
weekTime: function() {
|
880
|
|
- //
|
|
880
|
+ //
|
881
|
881
|
if(this.weekTime != 'historyWeek'){
|
882
|
882
|
console.log('12343455',this.weekTime);
|
883
|
883
|
var theType = this.weekType(this.weekTime);
|
884
|
884
|
this.theType = theType
|
885
|
885
|
this.getSchedules();
|
886
|
886
|
}
|
887
|
|
-
|
|
887
|
+
|
888
|
888
|
},
|
889
|
889
|
scheduleZoneRow: function() {
|
890
|
890
|
var theType = this.weekType(this.weekTime);
|
|
@@ -961,7 +961,7 @@ export default {
|
961
|
961
|
switchMode(flag){
|
962
|
962
|
console.log(flag);
|
963
|
963
|
},
|
964
|
|
-
|
|
964
|
+
|
965
|
965
|
getData(){
|
966
|
966
|
return this.scheduleZone
|
967
|
967
|
},
|
|
@@ -1240,7 +1240,7 @@ export default {
|
1240
|
1240
|
|
1241
|
1241
|
this.scheduleZone.sort(this.compare('sort'))
|
1242
|
1242
|
this.source_scheduleZone = this.scheduleZone
|
1243
|
|
-
|
|
1243
|
+
|
1244
|
1244
|
console.log("34455555566666",this.scheduleZone)
|
1245
|
1245
|
})
|
1246
|
1246
|
},
|
|
@@ -1943,7 +1943,7 @@ export default {
|
1943
|
1943
|
sums[22]="总人数:"+ sums[22] +"\n"+result
|
1944
|
1944
|
|
1945
|
1945
|
return sums;
|
1946
|
|
-
|
|
1946
|
+
|
1947
|
1947
|
},
|
1948
|
1948
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
1949
|
1949
|
|
|
@@ -2019,7 +2019,7 @@ export default {
|
2019
|
2019
|
this.schedulesGroup = schedulesGroup
|
2020
|
2020
|
|
2021
|
2021
|
var that = this;
|
2022
|
|
-
|
|
2022
|
+
|
2023
|
2023
|
this.scheduleZone.forEach(function (zone, index) {
|
2024
|
2024
|
|
2025
|
2025
|
that.scheduleZone[index].Mon_M = {
|
|
@@ -2215,7 +2215,7 @@ export default {
|
2215
|
2215
|
|
2216
|
2216
|
|
2217
|
2217
|
that.scheduleZone[index].total = 0;
|
2218
|
|
-
|
|
2218
|
+
|
2219
|
2219
|
if (response.data.data.schdules.length > 0) {
|
2220
|
2220
|
theSchedules.forEach(function (schedule, sindex) {
|
2221
|
2221
|
|
|
@@ -2250,7 +2250,7 @@ export default {
|
2250
|
2250
|
});
|
2251
|
2251
|
|
2252
|
2252
|
this.source_scheduleZone = this.scheduleZone
|
2253
|
|
-
|
|
2253
|
+
|
2254
|
2254
|
} else {
|
2255
|
2255
|
this.$message.error("网络错误");
|
2256
|
2256
|
return false;
|
|
@@ -2325,62 +2325,63 @@ export default {
|
2325
|
2325
|
type: "success",
|
2326
|
2326
|
message: "修改成功!"
|
2327
|
2327
|
});
|
2328
|
|
- var that = this;
|
2329
|
|
- var schedule = response.data.data.schedule;
|
2330
|
|
- this.scheduleZone.forEach(function (zone, index) {
|
2331
|
|
- if (
|
2332
|
|
- zone.zone_id == schedule.partition_id &&
|
2333
|
|
- zone.jihao_id == schedule.bed_id
|
2334
|
|
- ) {
|
2335
|
|
- var weekPath = that.weekPath(
|
2336
|
|
- schedule.schedule_week,
|
2337
|
|
- schedule.schedule_type
|
2338
|
|
- );
|
2339
|
|
- if (weekPath.length == 2) {
|
2340
|
|
- var weekPathKey = weekPath[0] + "_" + weekPath[1];
|
2341
|
|
- that.scheduleZone[index][weekPathKey] = {
|
2342
|
|
- schedule_id: schedule.id,
|
2343
|
|
- mode_id: schedule.mode_id,
|
2344
|
|
- patient_id: schedule.patient_id,
|
2345
|
|
- patient: that.currentData.patient,
|
2346
|
|
-
|
2347
|
|
-
|
2348
|
|
- dialysis_machine_name: schedule.dialysis_machine_name,
|
2349
|
|
-
|
2350
|
|
- patient_contagions: that.currentData.contagions,
|
2351
|
|
- mode_name:
|
2352
|
|
- typeof that.modeOptions[schedule.mode_id] === "undefined"
|
2353
|
|
- ? ""
|
2354
|
|
- : that.modeOptions[schedule.mode_id].name
|
2355
|
|
- };
|
2356
|
|
-
|
2357
|
|
- that.scheduleZone[index].total += 1;
|
2358
|
|
- }
|
2359
|
|
- }
|
2360
|
|
- if (
|
2361
|
|
- zone.zone_id == that.currentData.partition_id &&
|
2362
|
|
- zone.jihao_id == that.currentData.bed_id
|
2363
|
|
- ) {
|
2364
|
|
- var weekPath = that.weekPath(
|
2365
|
|
- that.currentData.schedule_week,
|
2366
|
|
- that.currentData.schedule_type
|
2367
|
|
- );
|
2368
|
|
- if (weekPath.length == 2) {
|
2369
|
|
- var weekPathKey = weekPath[0] + "_" + weekPath[1];
|
2370
|
|
- that.scheduleZone[index][weekPathKey] = {
|
2371
|
|
- schedule_id: 0,
|
2372
|
|
- mode_id: 0,
|
2373
|
|
- patient_id: 0,
|
2374
|
|
- patient: "",
|
2375
|
|
- mode_name: "",
|
2376
|
|
- dialysis_machine_name: "",
|
2377
|
|
- patient_contagions: []
|
2378
|
|
- };
|
2379
|
|
-
|
2380
|
|
- that.scheduleZone[index].total -= 1;
|
2381
|
|
- }
|
2382
|
|
- }
|
2383
|
|
- });
|
|
2328
|
+ // var that = this;
|
|
2329
|
+ this.getSchedules()
|
|
2330
|
+ // var schedule = response.data.data.schedule;
|
|
2331
|
+ // this.scheduleZone.forEach(function (zone, index) {
|
|
2332
|
+ // if (
|
|
2333
|
+ // zone.zone_id == schedule.partition_id &&
|
|
2334
|
+ // zone.jihao_id == schedule.bed_id
|
|
2335
|
+ // ) {
|
|
2336
|
+ // var weekPath = that.weekPath(
|
|
2337
|
+ // schedule.schedule_week,
|
|
2338
|
+ // schedule.schedule_type
|
|
2339
|
+ // );
|
|
2340
|
+ // if (weekPath.length == 2) {
|
|
2341
|
+ // var weekPathKey = weekPath[0] + "_" + weekPath[1];
|
|
2342
|
+ // that.scheduleZone[index][weekPathKey] = {
|
|
2343
|
+ // schedule_id: schedule.id,
|
|
2344
|
+ // mode_id: schedule.mode_id,
|
|
2345
|
+ // patient_id: schedule.patient_id,
|
|
2346
|
+ // patient: that.currentData.patient,
|
|
2347
|
+ //
|
|
2348
|
+ //
|
|
2349
|
+ // dialysis_machine_name: schedule.dialysis_machine_name,
|
|
2350
|
+ //
|
|
2351
|
+ // patient_contagions: that.currentData.contagions,
|
|
2352
|
+ // mode_name:
|
|
2353
|
+ // typeof that.modeOptions[schedule.mode_id] === "undefined"
|
|
2354
|
+ // ? ""
|
|
2355
|
+ // : that.modeOptions[schedule.mode_id].name
|
|
2356
|
+ // };
|
|
2357
|
+ //
|
|
2358
|
+ // that.scheduleZone[index].total += 1;
|
|
2359
|
+ // }
|
|
2360
|
+ // }
|
|
2361
|
+ // if (
|
|
2362
|
+ // zone.zone_id == that.currentData.partition_id &&
|
|
2363
|
+ // zone.jihao_id == that.currentData.bed_id
|
|
2364
|
+ // ) {
|
|
2365
|
+ // var weekPath = that.weekPath(
|
|
2366
|
+ // that.currentData.schedule_week,
|
|
2367
|
+ // that.currentData.schedule_type
|
|
2368
|
+ // );
|
|
2369
|
+ // if (weekPath.length == 2) {
|
|
2370
|
+ // var weekPathKey = weekPath[0] + "_" + weekPath[1];
|
|
2371
|
+ // that.scheduleZone[index][weekPathKey] = {
|
|
2372
|
+ // schedule_id: 0,
|
|
2373
|
+ // mode_id: 0,
|
|
2374
|
+ // patient_id: 0,
|
|
2375
|
+ // patient: "",
|
|
2376
|
+ // mode_name: "",
|
|
2377
|
+ // dialysis_machine_name: "",
|
|
2378
|
+ // patient_contagions: []
|
|
2379
|
+ // };
|
|
2380
|
+ //
|
|
2381
|
+ // that.scheduleZone[index].total -= 1;
|
|
2382
|
+ // }
|
|
2383
|
+ // }
|
|
2384
|
+ // });
|
2384
|
2385
|
this.$refs[formName].resetFields();
|
2385
|
2386
|
this.jhDialogVisible = false;
|
2386
|
2387
|
}
|
|
@@ -2508,7 +2509,6 @@ export default {
|
2508
|
2509
|
return false;
|
2509
|
2510
|
}
|
2510
|
2511
|
|
2511
|
|
- this.changeSchedule.bed_id = this.device_id;
|
2512
|
2512
|
for (let i = 0; i < this.origin_device_numbers.length; i++) {
|
2513
|
2513
|
if (this.origin_device_numbers[i].id == this.device_id) {
|
2514
|
2514
|
this.changeSchedule.partition_id = this.origin_device_numbers[
|
|
@@ -2516,7 +2516,6 @@ export default {
|
2516
|
2516
|
].zone_id;
|
2517
|
2517
|
}
|
2518
|
2518
|
}
|
2519
|
|
- this.changeSchedule.partition_id = this.zone_name
|
2520
|
2519
|
this.changeSchedule.change_action = "change_device";
|
2521
|
2520
|
this.changeScheduleActon(formName);
|
2522
|
2521
|
|
|
@@ -3303,7 +3302,7 @@ export default {
|
3303
|
3302
|
})();
|
3304
|
3303
|
};
|
3305
|
3304
|
},
|
3306
|
|
-
|
|
3305
|
+
|
3307
|
3306
|
};
|
3308
|
3307
|
</script>
|
3309
|
3308
|
|