Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/workforce/components/tableData.vue

@@ -2337,62 +2337,63 @@ export default {
               type: "success",
               message: "修改成功!"
             });
-            var that = this;
-            var schedule = response.data.data.schedule;
-            this.scheduleZone.forEach(function(zone, index) {
-              if (
-                zone.zone_id == schedule.partition_id &&
-                zone.jihao_id == schedule.bed_id
-              ) {
-                var weekPath = that.weekPath(
-                  schedule.schedule_week,
-                  schedule.schedule_type
-                );
-                if (weekPath.length == 2) {
-                  var weekPathKey = weekPath[0] + "_" + weekPath[1];
-                  that.scheduleZone[index][weekPathKey] = {
-                    schedule_id: schedule.id,
-                    mode_id: schedule.mode_id,
-                    patient_id: schedule.patient_id,
-                    patient: that.currentData.patient,
-
-
-                    dialysis_machine_name:schedule.dialysis_machine_name,
-
-                    patient_contagions: that.currentData.contagions,
-                    mode_name:
-                      typeof that.modeOptions[schedule.mode_id] === "undefined"
-                        ? ""
-                        : that.modeOptions[schedule.mode_id].name
-                  };
-
-                  that.scheduleZone[index].total += 1;
-                }
-              }
-              if (
-                zone.zone_id == that.currentData.partition_id &&
-                zone.jihao_id == that.currentData.bed_id
-              ) {
-                var weekPath = that.weekPath(
-                  that.currentData.schedule_week,
-                  that.currentData.schedule_type
-                );
-                if (weekPath.length == 2) {
-                  var weekPathKey = weekPath[0] + "_" + weekPath[1];
-                  that.scheduleZone[index][weekPathKey] = {
-                    schedule_id: 0,
-                    mode_id: 0,
-                    patient_id: 0,
-                    patient: "",
-                    mode_name: "",
-                    dialysis_machine_name:"",
-                    patient_contagions: []
-                  };
-
-                  that.scheduleZone[index].total -= 1;
-                }
-              }
-            });
+            this.getSchedules()
+            // var that = this;
+            // var schedule = response.data.data.schedule;
+            // this.scheduleZone.forEach(function(zone, index) {
+            //   if (
+            //     zone.zone_id == schedule.partition_id &&
+            //     zone.jihao_id == schedule.bed_id
+            //   ) {
+            //     var weekPath = that.weekPath(
+            //       schedule.schedule_week,
+            //       schedule.schedule_type
+            //     );
+            //     if (weekPath.length == 2) {
+            //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
+            //       that.scheduleZone[index][weekPathKey] = {
+            //         schedule_id: schedule.id,
+            //         mode_id: schedule.mode_id,
+            //         patient_id: schedule.patient_id,
+            //         patient: that.currentData.patient,
+            //
+            //
+            //         dialysis_machine_name:schedule.dialysis_machine_name,
+            //
+            //         patient_contagions: that.currentData.contagions,
+            //         mode_name:
+            //           typeof that.modeOptions[schedule.mode_id] === "undefined"
+            //             ? ""
+            //             : that.modeOptions[schedule.mode_id].name
+            //       };
+            //
+            //       that.scheduleZone[index].total += 1;
+            //     }
+            //   }
+            //   if (
+            //     zone.zone_id == that.currentData.partition_id &&
+            //     zone.jihao_id == that.currentData.bed_id
+            //   ) {
+            //     var weekPath = that.weekPath(
+            //       that.currentData.schedule_week,
+            //       that.currentData.schedule_type
+            //     );
+            //     if (weekPath.length == 2) {
+            //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
+            //       that.scheduleZone[index][weekPathKey] = {
+            //         schedule_id: 0,
+            //         mode_id: 0,
+            //         patient_id: 0,
+            //         patient: "",
+            //         mode_name: "",
+            //         dialysis_machine_name:"",
+            //         patient_contagions: []
+            //       };
+            //
+            //       that.scheduleZone[index].total -= 1;
+            //     }
+            //   }
+            // });
             this.$refs[formName].resetFields();
             this.jhDialogVisible = false;
           }
@@ -2523,11 +2524,12 @@ export default {
           this.changeSchedule.bed_id = this.device_id;
           for (let i = 0; i < this.origin_device_numbers.length; i++) {
             if (this.origin_device_numbers[i].id == this.device_id) {
-              this.changeSchedule.partition_id = this.origin_device_numbers[
-                i
-              ].zone_id;
+              this.changeSchedule.partition_id = this.origin_device_numbers[i].zone_id;
+              console.log("123123123123",this.origin_device_numbers[i].zone_id)
+
             }
           }
+
           console.log("23233232232",this.zones)
           var zone_id = 0
           for(let i=0;i<this.zones.length;i++){
@@ -2535,7 +2537,7 @@ export default {
                zone_id = this.zones[i].id
             }
           }
-          this.changeSchedule.partition_id = zone_id
+          this.changeSchedule.partition_id = this.zone_name
           this.changeSchedule.change_action = "change_device";
           this.changeScheduleActon(formName);
 
@@ -2722,6 +2724,7 @@ export default {
           this.current_devices = [];
           this.current_devices = devices;
           this.device_id = ""
+          this.zone_name = this.currentData.partition_id
         }
       });
       // const params = {