Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/workforce/components/editTableData.vue

@@ -2272,7 +2272,7 @@ export default {
           return false;
         } else {
           var devices = response.data.data.devices;
-          row.ihaos = [];
+          row.jihaos = [];
           row.jihaos = devices;
         }
       });
@@ -2293,7 +2293,7 @@ export default {
           return false;
         } else {
           var devices = response.data.data.devices;
-          row.ihaos = [];
+          row.jihaos = [];
           row.jihaos = devices;
           if (devices && devices.length > 0) {
             row.jihao_id = devices[0].id;

src/xt_pages/workforce/components/template_table.vue

@@ -868,7 +868,7 @@
                     <el-select
                       v-model="scope.row.zone_id"
                       placeholder="请选择"
-                      @change="changeArea(scope.row)"
+                      @change="changeSch(scope.row)"
                       size="mini"
                       class="select_list_arrage"
                     >
@@ -885,7 +885,7 @@
                       v-model="scope.row.device_number_id"
                       placeholder="请选择"
                       size="mini"
-                      @click.native="changeJihao(scope.row)"
+                      @change="changeJihao"
                       class="select_list_arrage"
                     >
                       <el-option
@@ -922,7 +922,8 @@ import {
   getPatientSmartSchTemplate,
   getTemplateScheduleSearchResult,
   updateSchedules,
-  updateEditSchedules
+  updateEditSchedules,
+  getTemplateSmartDevices
 } from "@/api/schedule_template/sch_template";
 import TemplateTableItem from "./template_table_item";
 import ScheduleSelectorDialog from "./template_schedule_selector_dialog";
@@ -1593,57 +1594,7 @@ export default {
       this.smartVisible = true;
     },
     SetSmartSch(tempData) {
-      //
-      // let isJiXu = true;
-      // //进行校验
-      // for (let i = 0; i < tempData.length; i++) {
-      //   for (let index = 0; index < this.opera_device_numbers_two.length; index++) {
-      //     const device_number = this.opera_device_numbers_two[index];
-      //     for (let t_y = 1; t_y <= 3; t_y++) {
-      //       if (
-      //         t_y == tempData[i].time_type &&
-      //         tempData[i].jihao_id == device_number.id &&
-      //         device_number[tempData[i].schedule_week + "_" + t_y].pid != 0 &&
-      //         device_number[tempData[i].schedule_week + "_" + t_y].pid !=
-      //         tempData[i].patient_id
-      //       ) {
-      //         console.log( device_number[tempData[i].schedule_week + "_" + t_y].pid)
-      //         console.log(tempData[i].patient_id)
-      //         console.log( tempData[i].jihao_id)
-      //         console.log( device_number.id)
-      //         let msg = "";
-      //         let name = "";
-      //         for(let i = 0; i < this.editableTabs.length;i++){
-      //           if(this.editableTabs[i].name == tempData[i].t_id){
-      //             name = this.editableTabs[i].title
-      //           }
-      //         }
-      //         msg = name + "周" + tempData[i].schedule_week;
-      //
-      //         if (tempData[i].time_type == 1) {
-      //           msg = msg + "上午";
-      //         } else if (tempData[i].time_type == 2) {
-      //           msg = msg + "下午";
-      //         } else {
-      //           msg = msg + "晚上";
-      //         }
-      //         isJiXu = false;
-      //         this.smartSaveLoading = false;
-      //         msg =
-      //           msg +
-      //           device_number.zone.name +
-      //           device_number.number +
-      //           "已有排班";
-      //         this.$message.error(msg);
-      //       }
-      //     }
-      //   }
-      // }
-      // if (isJiXu) {
-        var delTempData = []
-        this.saveActionThree(tempData,delTempData);
-
-      // }
+        this.saveActionThree(tempData);
     },
     check(tempData) {
       let isJiXu = true;
@@ -1707,6 +1658,7 @@ export default {
             sch_id: this.editableTabs[b].tableWeekArrage[c].id,
             zone_id: this.editableTabs[b].tableWeekArrage[c].zone_id,
             t_id: this.editableTabs[b].name,
+            title:this.editableTabs[b].title,
             patient_id: this.cur_smart_patient_id,
           };
           tempData.push(obj);
@@ -1724,99 +1676,110 @@ export default {
 
       this.isEdit = true
       this.$emit("saveData", tempData);
+    },changeJihao(){
+
+      this.$forceUpdate()
+
     },
     changeSch(row) {
-      let devices = [];
-      devices = this.opera_device_numbers_two;
-      let cur_key =
-        this.getWeekByzhongwen(row.week).toString() +
-        "_" +
-        row.time_type.toString();
-      row.jihaos = [];
-      for (let i = 0; i < devices.length; i++) {
-        if (devices[i].zone_id == row.zone_id) {
-          let is_sch = false; //是否有排班
-          for (let key in devices[i]) {
-            if (key == cur_key) {
-              if (
-                devices[i][key].pid > 0 &&
-                devices[i][key].treat_mode_id > 0 &&
-                devices[i][key].pid != this.cur_smart_patient_id
-              ) {
-                is_sch = true;
-              }
-            }
-          }
-          if (!is_sch) {
-            row.jihaos.push(devices[i]);
+
+      console.log(row)
+      let params = {
+        zone_id: row.zone_id,
+        sch_type: row.time_type,
+        weekday: this.getWeekByzhongwen(row.week),
+        patient_id: this.cur_smart_patient_id,
+        template_id:this.editableTabsValue,
+      };
+      //进行网络请求，获取空排班机位
+      getTemplateSmartDevices(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
+        } else {
+          var devices = response.data.data.devices;
+          row.jihaos = [];
+          // row.jihaos = devices;
+          for (let i = 0; i < devices.length; i++){
+            this.$set(row.jihaos , i, devices[i])
           }
+
+          row.device_number_id = "";
         }
-      }
-      if(row.jihaos.length > 0){
-        row.device_number_id = row.jihaos[0].id;
-      }else{
-        row.device_number_id = ""
-      }
+      });
     },
     changeArea(row) {
 
-      let devices = [];
-      devices = this.opera_device_numbers_two;
-      let cur_key =
-        this.getWeekByzhongwen(row.week).toString() +
-        "_" +
-        row.time_type.toString();
-      row.jihaos = [];
-      for (let i = 0; i < devices.length; i++) {
-        if (devices[i].zone_id == row.zone_id) {
-          let is_sch = false; //是否有排班
-          for (let key in devices[i]) {
-            if (key == cur_key) {
-              if (
-                devices[i][key].pid > 0 &&
-                devices[i][key].treat_mode_id > 0 &&
-                devices[i][key].pid != this.cur_smart_patient_id
-              ) {
-                is_sch = true;
-              }
-            }
-          }
-          if (!is_sch) {
-            row.jihaos.push(devices[i]);
-          }
-        }
-      }
-      row.device_number_id = ""
-    },
-    changeJihao(row) {
-      let devices = [];
-      devices = this.opera_device_numbers_two;
-      let cur_key =
-        this.getWeekByzhongwen(row.week).toString() +
-        "_" +
-        row.time_type.toString();
-      row.jihaos = [];
-      for (let i = 0; i < devices.length; i++) {
-        if (devices[i].zone_id == row.zone_id) {
-          let is_sch = false; //是否有排班
-          for (let key in devices[i]) {
-            if (key == cur_key) {
-              if (
-                devices[i][key].pid > 0 &&
-                devices[i][key].treat_mode_id > 0 &&
-                devices[i][key].pid != this.cur_smart_patient_id
-              ) {
-                is_sch = true;
-              }
-            }
-          }
-          if (!is_sch) {
-            row.jihaos.push(devices[i]);
-          }
+
+      let params = {
+        zone_id: row.zone_id,
+        sch_type: row.time_type,
+        weekday: this.getWeekByzhongwen(row.week),
+        patient_id: this.cur_smart_patient_id,
+        template_id:this.editableTabsValue,
+      };
+      //进行网络请求，获取空排班机位
+      getTemplateSmartDevices(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
+        } else {
+          var devices = response.data.data.devices;
+          row.jihaos = [];
+          row.jihaos = devices;
+          row.device_number_id = "";
         }
-      }
-      row.device_number_id = ""
+      });
+
     },
+    // changeJihao(row) {
+    //   // let devices = [];
+    //   // devices = this.opera_device_numbers_two;
+    //   // let cur_key =
+    //   //   this.getWeekByzhongwen(row.week).toString() +
+    //   //   "_" +
+    //   //   row.time_type.toString();
+    //   // row.jihaos = [];
+    //   // for (let i = 0; i < devices.length; i++) {
+    //   //   if (devices[i].zone_id == row.zone_id) {
+    //   //     let is_sch = false; //是否有排班
+    //   //     for (let key in devices[i]) {
+    //   //       if (key == cur_key) {
+    //   //         if (
+    //   //           devices[i][key].pid > 0 &&
+    //   //           devices[i][key].treat_mode_id > 0 &&
+    //   //           devices[i][key].pid != this.cur_smart_patient_id
+    //   //         ) {
+    //   //           is_sch = true;
+    //   //         }
+    //   //       }
+    //   //     }
+    //   //     if (!is_sch) {
+    //   //       row.jihaos.push(devices[i]);
+    //   //     }
+    //   //   }
+    //   // }
+    //   // row.device_number_id = ""
+    //   // let params = {
+    //   //   zone_id: row.zone_id,
+    //   //   sch_type: row.time_type,
+    //   //   weekday: row.weekday,
+    //   //   patient_id: this.cur_smart_patient_id,
+    //   // };
+    //   // //进行网络请求，获取空排班机位
+    //   // getTemplateSmartDevices(params).then((response) => {
+    //   //   if (response.data.state == 0) {
+    //   //     return false;
+    //   //   } else {
+    //   //     var devices = response.data.data.devices;
+    //   //     row.ihaos = [];
+    //   //     row.jihaos = devices;
+    //   //     if (devices && devices.length > 0) {
+    //   //       row.jihao_id = devices[0].id;
+    //   //     } else {
+    //   //       row.jihao_id = "";
+    //   //     }
+    //   //   }
+    //   // });
+    // },
 
     select_week(val) {
       this.handledDataLoading = true;
@@ -1976,53 +1939,134 @@ export default {
       this.cur_smart_patient_id = val.id;
       this.cur_smart_patient_name = val.name;
       this.cur_smart_patient_no = val.dialysis_no;
-      var schedules = val.XtPatientScheduleTemplateId;
-      var data = [];
-      for (let i = 0; i < schedules.length; i++) {
-        if (i == 0) {
-          this.editableTabsValue = schedules[0].id;
-        }
-        let obj = {
-          id: schedules[i].id,
-          checkedWeek: [],
-          title: schedules[i].week,
-          name: schedules[i].id,
-          tableWeekArrage: schedules[i].template,
-        };
 
-        if (i == 0) {
-          obj.title = "一周模版";
-        } else if (i == 1) {
-          obj.title = "二周模版";
-        } else if (i == 2) {
-          obj.title = "三周模版";
-        } else if (i == 3) {
-          obj.title = "四周模版";
+      let params = {
+        patient_id: this.cur_smart_patient_id,
+      };
+
+      getPatientSmartSchTemplate(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
         }
-        for (let b = 0; b < schedules[i].template.length; b++) {
-          let devices = [];
-          for (let d = 0; d < this.devices.length; d++) {
-            if (this.devices[d].zone.id == schedules[i].template[b].zone_id) {
-              devices.push(this.devices[d]);
-            }
+
+        if ((response.data.data.status = 1)) {
+          var data = [];
+          var schedules = response.data.data.schedules_template;
+          for (let i = 0; i < this.editableTabs.length; i++) {
+            this.editableTabs[i].checkedWeek = [];
+            this.editableTabs[i].tableWeekArrage = [];
           }
-          schedules[i].template[b]["jihaos"] = devices;
-          schedules[i].template[b]["week"] = this.getWeekDay(
-            schedules[i].template[b].weekday
-          );
-          for (let c = 0; c < this.weeks.length; c++) {
-            if (schedules[i].template[b].weekday == this.weeks[c].week_type) {
-              obj.checkedWeek.push(this.weeks[c]);
+          for (let i = 0; i < schedules.length; i++) {
+            if (i == 0) {
+              this.editableTabsValue = schedules[0].id;
+            }
+            let obj = {
+              id: schedules[i].id,
+              checkedWeek: [],
+              title: schedules[i].week,
+              name: schedules[i].id,
+              tableWeekArrage: schedules[i].template,
+            };
+            if (i == 0) {
+              obj.title = "一周模版";
+            } else if (i == 1) {
+              obj.title = "二周模版";
+            } else if (i == 2) {
+              obj.title = "三周模版";
+            } else if (i == 3) {
+              obj.title = "四周模版";
             }
+            for (let b = 0; b < schedules[i].template.length; b++) {
+              let devices = [];
+              for (let d = 0; d < this.devices.length; d++) {
+                if (
+                  this.devices[d].zone.id == schedules[i].template[b].zone_id
+                ) {
+                  devices.push(this.devices[d]);
+                }
+              }
+              schedules[i].template[b]["jihaos"] = devices;
+              schedules[i].template[b]["week"] = this.getWeekDay(
+                schedules[i].template[b].weekday
+              );
+              schedules[i].template[b]["week_type"] = this.getWeekByzhongwen(
+                schedules[i].template[b].weekday
+              );
+
+              for (let c = 0; c < this.weeks.length; c++) {
+                if (
+                  schedules[i].template[b].weekday == this.weeks[c].week_type
+                ) {
+                  obj.checkedWeek.push(this.weeks[c]);
+                }
+              }
+            }
+            schedules[i].template.sort(function (a, b) {
+              return a.week_type - b.week_type;
+            });
+            data.push(obj);
           }
+
+          this.editableTabs = data;
+          this.current_patient_data = data;
+          this.current_all_schtemplate = this.editableTabs;
+          this.current_all_schtemplate = this.deepClone(this.current_all_schtemplate)
+        } else {
         }
-        data.push(obj);
-      }
-      this.editableTabs = data;
-      // this.current_patient_data = data;
-      this.current_patient_data = data
-      this.current_all_sch =data;
-      this.current_patient_data = data
+      });
+
+      // var schedules = val.XtPatientScheduleTemplateId;
+      // var data = [];
+      // for (let i = 0; i < schedules.length; i++) {
+      //   if (i == 0) {
+      //     this.editableTabsValue = schedules[0].id;
+      //   }
+      //   let obj = {
+      //     id: schedules[i].id,
+      //     checkedWeek: [],
+      //     title: schedules[i].week,
+      //     name: schedules[i].id,
+      //     tableWeekArrage: schedules[i].template,
+      //   };
+      //
+      //   if (i == 0) {
+      //     obj.title = "一周模版";
+      //   } else if (i == 1) {
+      //     obj.title = "二周模版";
+      //   } else if (i == 2) {
+      //     obj.title = "三周模版";
+      //   } else if (i == 3) {
+      //     obj.title = "四周模版";
+      //   }
+      //   for (let b = 0; b < schedules[i].template.length; b++) {
+      //     let devices = [];
+      //     for (let d = 0; d < this.devices.length; d++) {
+      //       if (this.devices[d].zone.id == schedules[i].template[b].zone_id) {
+      //         devices.push(this.devices[d]);
+      //       }
+      //     }
+      //
+      //     schedules[i].template[b]["jihaos"] = devices;
+      //     schedules[i].template[b]["week"] = this.getWeekDay(
+      //       schedules[i].template[b].weekday
+      //     );
+      //     schedules[i].template[b]["week_type"] = this.getWeekByzhongwen(
+      //       schedules[i].template[b].weekday
+      //     );
+      //
+      //     for (let c = 0; c < this.weeks.length; c++) {
+      //       if (schedules[i].template[b].weekday == this.weeks[c].week_type) {
+      //         obj.checkedWeek.push(this.weeks[c]);
+      //       }
+      //     }
+      //   }
+      //   data.push(obj);
+      // }
+      // this.editableTabs = data;
+      // // this.current_patient_data = data;
+      // this.current_patient_data = data
+      // this.current_all_sch =data;
+      // this.current_patient_data = data
 
     },
     querySearchAsync(keyword, cb) {
@@ -2852,14 +2896,12 @@ export default {
         });
       }
     },
-    saveActionThree: function (val,delTempData) {
+    saveActionThree: function (val) {
       updateEditSchedules(
         JSON.stringify(val),
-        JSON.stringify(delTempData),
       ).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
-          // this.opera_device_numbers = this.origin_device_numbers
           this.all_template = resp.data.items
           this.$emit("setTemplate",resp.data.items)
           if(this.active_name == 'first'){
@@ -2878,111 +2920,7 @@ export default {
           this.$message.error(resp.msg);
         }
       });
-
-      // console.log(this.data)
-      // var add_items = [];
-      // var del_items = [];
-      // var change_items = [];
-      // var weekdays = [1, 2, 3, 4, 5, 6, 7]; // 周一-周日
-      // var time_types = [1, 2, 3]; // 上下晚
-      // for (let d_n_i = 0; d_n_i < this.opera_device_numbers.length; d_n_i++) {
-      //   const op_d_n = this.opera_device_numbers[d_n_i];
-      //   const or_d_n = this.origin_device_numbers[d_n_i];
-      //
-      //   for (let w_i = 0; w_i < weekdays.length; w_i++) {
-      //     const weekday = weekdays[w_i];
-      //     for (let t_i = 0; t_i < time_types.length; t_i++) {
-      //       const time_type = time_types[t_i];
-      //
-      //       var item_key = weekday + "_" + time_type;
-      //       var op_item = op_d_n[item_key];
-      //       var or_item = or_d_n[item_key];
-      //       if (op_item.pid == 0 && or_item.pid == 0) {
-      //         continue;
-      //       }
-      //       if (
-      //         op_item.pid == or_item.pid &&
-      //         op_item.treat_mode_id == or_item.treat_mode_id
-      //       ) {
-      //         continue;
-      //       }
-      //       if (op_item.pid == 0) {
-      //         del_items.push({
-      //           device_number_id: op_d_n.id,
-      //           weekday: weekday,
-      //           time_type: time_type,
-      //         });
-      //
-      //       } else if (or_item.pid == 0) {
-      //         console.log(op_item.pid);
-      //         add_items.push({
-      //           device_number_id: op_d_n.id,
-      //           patient_id: op_item.pid,
-      //           mode: op_item.treat_mode_id,
-      //           weekday: weekday,
-      //           time_type: time_type,
-      //         });
-      //
-      //
-      //       } else {
-      //         if (
-      //           op_item.pid != or_item.pid ||
-      //           op_item.treat_mode_id != or_item.treat_mode_id
-      //         ) {
-      //           change_items.push({
-      //             device_number_id: op_d_n.id,
-      //             patient_id: op_item.pid,
-      //             mode: op_item.treat_mode_id,
-      //             weekday: weekday,
-      //             time_type: time_type,
-      //           });
-      //         }
-      //       }
-      //     }
-      //   }
-      // }
-      // if (
-      //   add_items.length == 0 &&
-      //   del_items.length == 0 &&
-      //   change_items.length == 0
-      // ) {
-      //
-      // } else {
-      //   var res = [];
-      //   for (var i = 0, arrayLen = add_items.length; i < arrayLen; i++) {
-      //     for (var j = 0, resLen = res.length; j < resLen; j++) {
-      //       if (
-      //         add_items[i].weekday === res[j].weekday &&
-      //         add_items[i].patient_id === res[j].patient_id
-      //       ) {
-      //         break;
-      //       }
-      //     }
-      //     // 如果array[i]是唯一的，那么执行完循环，j等于resLen
-      //     if (j === resLen) {
-      //       res.push(add_items[i]);
-      //     }
-      //   }
-      //
-      //   updateSchedules(
-      //     this.template.id,
-      //     JSON.stringify(res),
-      //     JSON.stringify(del_items),
-      //     JSON.stringify(change_items)
-      //   ).then((rs) => {
-      //     var resp = rs.data;
-      //     if (resp.state == 1) {
-      //       // this.opera_device_numbers = this.origin_device_numbers
-      //       this.$emit("setTemplate",resp.data.items)
-      //       this.smartSaveLoading = false;
-      //     } else {
-      //       this.$message.error(resp.msg);
-      //     }
-      //   });
-      // }
     },
-
-
     saveAction: function () {
       var add_items = [];
       var del_items = [];

src/xt_pages/workforce/template.vue

@@ -3190,22 +3190,12 @@ export default {
 
     },saveData(val){
       var tempDataOne = []
-      // var tempDataTwo = []
-      // var tempDataThree = []
-      // var tempDataFour = []
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
       }
-
       if(tempDataOne.length > 0){
         this.$refs.table.SetSmartSch(tempDataOne)
       }
-
-
-      // this.first_template.items.push({device_number_id:652,id:0,patient_id:7007,template_id:421,time_type:2,treat_mode:2,weekday:4})
-      // this.activeName  = ""
-      // this.activeName = "first"
-
     },
     getWeekPanels(val) {
       getWeekPanels(1,val).then(response => {