排版

src/api/schedule_template/sch_template.js

@@ -125,3 +125,19 @@ export function BatchSmartSch(params,patient_id) {
     data: params
   })
 }
+
+
+
+
+export function updateEditSchedules(obj,delObj) {
+  var params = {
+    edit_schs: obj,
+    del_schs: delObj,
+
+  }
+  return request({
+    url: '/api/schedule/update_schtemplate',
+    method: 'post',
+    params: params,
+  })
+}

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -488,6 +488,9 @@
                   <td width="80">
                     <label-box :isChecked="prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
                   </td>
+                  <td width="80">
+                    <label-box :isChecked="prescription.mode_id == 8 ? true : false" showValue="HFHD"></label-box>
+                  </td>
                 </tr>
                 </tbody>
               </table>

src/xt_pages/workforce/appointment.vue

@@ -356,290 +356,6 @@ export default {
           }
       )
 
-    },getWeekPanelsTwo() {
-      // this.scheduleZoneRow = []
-      // this.scheduleZone = []
-      getWeekPanels(1, this.partition_id).then(response => {
-        if (response.data.state == 0) {
-          return false
-        }
-        var partitions = response.data.data.partitions
-        // console.log("分区",partitions)
-        this.theWeek.thisWeek = response.data.data.theWeek
-        this.theWeek.lastWeek = response.data.data.theLastWeek
-        this.theWeek.nextWeek = response.data.data.theNextWeek
-        this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
-        // 在控制变量改变的时候进行 强制渲染更新
-        let childrenRefs = this.$refs.elTabs.$children
-        this.$nextTick(() => {
-          childrenRefs.forEach(child => child.$forceUpdate())
-        })
-
-        var that = this
-
-        if (partitions.length > 0) {
-          let arrSort = []
-          partitions.forEach((item) => {
-            let num = Math.max.apply(Math, item.jihaos.map(function (o) {
-              return o.sort
-            }))
-            item.sort = num
-            arrSort.push(item)
-          })
-          arrSort.sort(this.compare('sort'))
-          partitions = arrSort
-          partitions.forEach(function (partition) {
-            if (partition.jihaos.length == 0) {
-              return false
-            }
-            that.scheduleZoneRow.push(partition.jihaos.length)
-            that.partitions[partition.id] = partition
-            partition.jihaos.forEach(function (jihao) {
-              var thisPa = {
-                area: partition.name,
-                zone_id: partition.id,
-                zone_type: partition.type,
-                cut: jihao.number,
-                jihao_id: jihao.id,
-                Mon_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Mon_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Mon_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Tue_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Tue_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Tue_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Wed_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Wed_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Wed_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Thurs_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Thurs_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Thurs_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Fri_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Fri_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Fri_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sat_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sat_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sat_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sun_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sun_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sun_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                total: 0
-              }
-              that.scheduleZone.push(thisPa)
-            })
-
-          })
-        }
-        this.export_file_step_two()
-      })
     },
     getWeekPanels() {
       // this.scheduleZoneRow = []
@@ -921,7 +637,10 @@ export default {
               that.scheduleZone.push(thisPa)
             })
           })
+
         }
+        console.log("111111111")
+        console.log(that.scheduleZone)
       })
     },changeSch(val){
       console.log(this.partitions)
@@ -3085,12 +2804,12 @@ export default {
 
     changePartition(val) {
       this.partition_id = val
-      this.getThreeWeekList()
-      this.getWeekPanels()
-    },
+      // this.getThreeWeekList()
+      // this.getWeekPanels()
+   },
 
     changeSchedule(val) {
-      this.schedule_type = val
+      this.schedule_type = vald
       this.getThreeWeekList()
       this.getWeekPanels()
     },
@@ -3307,8 +3026,8 @@ export default {
     }
     let newNum = 0
     for (let i = 0; i < this.weekList.length; i++) {
-      if (this.weekNum + i + 1 <= 53) {
-        let num = this.weekNum + i
+      if (this.weekNum + i +2 <= 53) {
+        let num = this.weekNum + i +1
         let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
         this.typeOptions.push({value: i, label: str})
         let stt = this.weekList[i][0] + "~" + this.weekList[i][6]

src/xt_pages/workforce/components/editTableData.vue

@@ -1903,6 +1903,7 @@ export default {
 
   data() {
     return {
+      current_patient_data:[],
       week_zhongwens: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
       week_type: "",
       saveloading: false,
@@ -1919,18 +1920,23 @@ export default {
           title: "本周",
           name: "1",
           tableWeekArrage: [],
+          weeks:[],
         },
         {
           checkedWeek: [],
           title: "下周",
           name: "2",
           tableWeekArrage: [],
+          weeks:[],
+
         },
         {
           checkedWeek: [],
           title: "下下周",
           name: "3",
           tableWeekArrage: [],
+          weeks:[],
+
         },
       ],
 
@@ -2344,7 +2350,9 @@ export default {
       this.smart_keyword = "";
     },
     batchSetSch() {
-      var tempData = [];
+      var saveOrEditTempData = [];
+      var delTempData = [];
+
       var day = new Date().getDay();
       if (day == 0) {
         day = 7;
@@ -2372,7 +2380,7 @@ export default {
             week_type: "1",
             week_name: this.editableTabs[0].tableWeekArrage[b].week,
           };
-          tempData.push(obj);
+          saveOrEditTempData.push(obj);
         }
       }
       for (let b = 0; b < this.editableTabs[1].tableWeekArrage.length; b++) {
@@ -2389,9 +2397,8 @@ export default {
           week_type: "2",
           week_name: this.editableTabs[1].tableWeekArrage[b].week,
         };
-        tempData.push(obj);
+        saveOrEditTempData.push(obj);
       }
-
       for (let b = 0; b < this.editableTabs[2].tableWeekArrage.length; b++) {
         let obj = {
           schedule_date: this.editableTabs[2].tableWeekArrage[b].schedule_date,
@@ -2406,21 +2413,100 @@ export default {
           week_type: "3",
           week_name: this.editableTabs[2].tableWeekArrage[b].week,
         };
-        tempData.push(obj);
+        saveOrEditTempData.push(obj);
+      }
+
+      //原始数据，用来与智能排版的数据进行比对，查出有排班记录，取消勾选的数据，作为删除的数据，提交给后端
+
+      for (let b = 0; b < this.current_patient_data[0].tableWeekArrage.length; b++) {
+        //只有大于等于今天的数据才能保存和没有上机的
+        if (
+          this.getWeekByzhongwen(
+            this.current_patient_data[0].tableWeekArrage[b].week
+          ) >= day &&
+          this.current_patient_data[0].tableWeekArrage[b].is_edit
+        ) {
+          let obj = {
+            schedule_date:
+            this.current_patient_data[0].tableWeekArrage[b].schedule_date,
+            schedule_type: this.current_patient_data[0].tableWeekArrage[b].sch_type,
+            bed_id: this.current_patient_data[0].tableWeekArrage[b].jihao_id,
+            schedule_week: this.getWeekByzhongwen(
+              this.current_patient_data[0].tableWeekArrage[b].week
+            ),
+            mode_id: this.current_patient_data[0].tableWeekArrage[b].mode_id,
+            sch_id: this.current_patient_data[0].tableWeekArrage[b].sch_id,
+            zone_id: this.current_patient_data[0].tableWeekArrage[b].zone_id,
+            week_type: "1",
+            week_name: this.current_patient_data[0].tableWeekArrage[b].week,
+          };
+          delTempData.push(obj);
+        }
+      }
+      for (let b = 0; b < this.current_patient_data[1].tableWeekArrage.length; b++) {
+        let obj = {
+          schedule_date: this.current_patient_data[1].tableWeekArrage[b].schedule_date,
+          schedule_type: this.current_patient_data[1].tableWeekArrage[b].sch_type,
+          bed_id: this.current_patient_data[1].tableWeekArrage[b].jihao_id,
+          schedule_week: this.getWeekByzhongwen(
+            this.current_patient_data[1].tableWeekArrage[b].week
+          ),
+          mode_id: this.current_patient_data[1].tableWeekArrage[b].mode_id,
+          sch_id: this.current_patient_data[1].tableWeekArrage[b].sch_id,
+          zone_id: this.current_patient_data[1].tableWeekArrage[b].zone_id,
+          week_type: "2",
+          week_name: this.current_patient_data[1].tableWeekArrage[b].week,
+        };
+        delTempData.push(obj);
+      }
+      for (let b = 0; b < this.current_patient_data[2].tableWeekArrage.length; b++) {
+        let obj = {
+          schedule_date: this.current_patient_data[2].tableWeekArrage[b].schedule_date,
+          schedule_type: this.current_patient_data[2].tableWeekArrage[b].sch_type,
+          bed_id: this.current_patient_data[2].tableWeekArrage[b].jihao_id,
+          schedule_week: this.getWeekByzhongwen(
+            this.current_patient_data[2].tableWeekArrage[b].week
+          ),
+          mode_id: this.current_patient_data[2].tableWeekArrage[b].mode_id,
+          sch_id: this.current_patient_data[2].tableWeekArrage[b].sch_id,
+          zone_id: this.current_patient_data[2].tableWeekArrage[b].zone_id,
+          week_type: "3",
+          week_name: this.current_patient_data[2].tableWeekArrage[b].week,
+        };
+        delTempData.push(obj);
       }
 
-      for (let i = 0; i < tempData.length; i++) {
-        if (tempData[i].bed_id == "" || tempData[i].zone_id == "") {
+
+
+      for (let i = 0; i < saveOrEditTempData.length; i++) {
+        if (saveOrEditTempData[i].bed_id == "" || saveOrEditTempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
           return;
         }
       }
+      console.log(saveOrEditTempData)
+      console.log(delTempData)
+
+
+      if (saveOrEditTempData.length > 0 ) {
+        // console.log("111111")
+
+        // for(let i = 0; i < delTempData.length; i++){
+        //   for(let b = 0; b < saveOrEditTempData.length; b++){
+        //     console.log(delTempData[i].sch_id)
+        //     console.log(saveOrEditTempData[b].sch_id)
+        //
+        //     if(delTempData[i].sch_id == saveOrEditTempData[b].sch_id){
+        //         console.log("被删元素"+delTempData[i])
+        //         delTempData.splice(i,1)
+        //       }
+        //   }
+        // }
 
-      if (tempData.length > 0) {
         let obj = {
-          smart_schs: tempData,
+          smart_schs: saveOrEditTempData,
+          del_schs:[],
         };
-        console.log(obj);
         this.saveloading = true;
         BatchSmartSch(obj, this.cur_smart_patient_id).then((response) => {
           if (response.data.state == 1) {
@@ -2556,6 +2642,9 @@ export default {
                 }
                 this.editableTabs[0].checkedWeek.push(this.weeks[b]);
               }
+
+
+
             }
 
             this.editableTabs[0].tableWeekArrage.push(obj);
@@ -2585,9 +2674,11 @@ export default {
 
             for (let b = 0; b < this.weeks.length; b++) {
               if (val.sch[i].schedule_week == this.weeks[b].week_type) {
-                this.weeks[b].is_edit = true;
+                // this.weeks[b].is_edit = true;
                 this.editableTabs[1].checkedWeek.push(this.weeks[b]);
               }
+
+
             }
 
             this.editableTabs[1].tableWeekArrage.push(obj2);
@@ -2609,15 +2700,32 @@ export default {
             obj3.is_edit = is_edit3;
             for (let b = 0; b < this.weeks.length; b++) {
               if (val.sch[i].schedule_week == this.weeks[b].week_type) {
-                this.weeks[b].is_edit = true;
+                // this.weeks[b].is_edit = true;
                 this.editableTabs[2].checkedWeek.push(this.weeks[b]);
+
               }
+
+
             }
 
             this.editableTabs[2].tableWeekArrage.push(obj3);
             break;
         }
       }
+      if(this.editableTabsValue == "1") {
+        var tempDate = new Date();
+        var day = tempDate.getDay();
+        if (day == 0) {
+          day = 7;
+        }
+        for (let i = 0; i < this.weeks.length; i++) {
+          if (this.weeks[i].week_type < day) {
+            this.weeks[i].is_edit = false;
+          }
+        }
+      }
+
+      this.current_patient_data = this.editableTabs
 
       this.current_all_sch = this.editableTabs;
     },
@@ -2779,6 +2887,8 @@ export default {
           return false;
         }
         var schedules = response.data.data.schedules;
+
+
         this.current_all_sch[0].tableWeekArrage = [];
         this.current_all_sch[1].tableWeekArrage = [];
         this.current_all_sch[2].tableWeekArrage = [];
@@ -2793,9 +2903,10 @@ export default {
         if (day == 0) {
           day = 7;
         }
-        console.log(day);
 
         for (let i = 0; i < schedules.length; i++) {
+
+
           var week_type = this.getWeekType(
               this.getTime(schedules[i].schedule_date, "{y}-{m}-{d}")
           ).toString();
@@ -2826,18 +2937,20 @@ export default {
               }
               obj.is_edit = is_edit;
 
+
               for (let b = 0; b < this.weeks.length; b++) {
-                console.log(schedules[i].schedule_week);
-                console.log(this.weeks[b].week_type);
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
                   if (
-                      this.weeks[b].week_type >= day ||
+                      this.weeks[b].week_type >= day &&
                       schedules[i].order.id == 0
                   ) {
+                    console.log( "this.weeks[b].week_type")
+                    console.log( this.weeks[b].week_type )
                     this.weeks[b].is_edit = true;
                   } else {
                     this.weeks[b].is_edit = false;
                   }
+
                   this.editableTabs[0].checkedWeek.push(this.weeks[b]);
                 }
               }
@@ -2860,7 +2973,7 @@ export default {
 
               for (let b = 0; b < this.weeks.length; b++) {
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
-                  this.weeks[b].is_edit = true;
+                  // this.weeks[b].is_edit = true;
                   this.editableTabs[1].checkedWeek.push(this.weeks[b]);
                 }
               }
@@ -2882,7 +2995,7 @@ export default {
               };
               for (let b = 0; b < this.weeks.length; b++) {
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
-                  this.weeks[b].is_edit = true;
+                  // this.weeks[b].is_edit = true;
                   this.editableTabs[2].checkedWeek.push(this.weeks[b]);
                 }
               }
@@ -2894,47 +3007,53 @@ export default {
         }
       });
 
-      for (let i = 0; i < this.weeks.length; i++) {
+      if(this.editableTabsValue == "1") {
         var tempDate = new Date();
         var day = tempDate.getDay();
         if (day == 0) {
           day = 7;
         }
-        if (this.weeks[i].week_type >= day) {
-          this.weeks[i].is_edit = true;
-        } else {
-          this.weeks[i].is_edit = false;
+        for (let i = 0; i < this.weeks.length; i++) {
+          if (this.weeks[i].week_type < day) {
+            this.weeks[i].is_edit = false;
+          }
         }
       }
-      console.log("weeks");
-      console.log(this.weeks);
 
-      this.smartVisible = true;
 
-      var now = new Date();
-      var day = now.getDay();
-      switch (day) {
-        case 0:
-          break;
-        case 1:
-          break;
-        case 2:
-          break;
-        case 3:
-          break;
-        case 4:
-          break;
-        case 5:
-          break;
-        case 6:
-          break;
+      for (let i = 0; i < this.editableTabs.length; i++) {
+        for(let b = 0; b < this.editableTabs[i].tableWeekArrage.length;b++){
+          data[i]["week_type"] = this.getWeekByzhongwen(data[i].week);
+
+
+
+        }
       }
-      // this.current_all_sch = this.editableTabs
+
+      data.sort(function (a, b) {
+        return a.week_type - b.week_type;
+      });
+
+
+
+      this.current_patient_data = data
+      this.smartVisible = true;
       this.current_all_sch = data;
     },
+
     select_week(val) {
-      // this.current_all_sch = this.editableTabs
-      console.log(this.current_all_sch);
+      // for(this)
+
+
+      this.current_all_sch = this.editableTabs
+      // for(let i = 0; i < this.editableTabs[0].tableWeekArrage.length; i++){
+      //
+      //
+      // }
+
+
+
+
 
       var sch = [];
       for (let i = 0; i < this.current_all_sch.length; i++) {
@@ -2942,7 +3061,6 @@ export default {
           sch = this.current_all_sch[i];
         }
       }
-      console.log(sch);
 
       let data = [];
 
@@ -2957,10 +3075,7 @@ export default {
             obj = sch.tableWeekArrage[b];
           }
         }
-        console.log("日志");
 
-        console.log(is_new);
-        console.log(obj);
 
         let keyIndex = "";
         for (var key in this.partitionsProp) {
@@ -3023,7 +3138,9 @@ export default {
           this.editableTabs[i].tableWeekArrage = data;
         }
       }
-      //
+
+      this.current_all_sch = this.editableTabs
+
     },
     patientClick(row) {
       console.log(row);
@@ -3425,6 +3542,7 @@ export default {
             });
           });
         }
+
         this.scheduleZone.sort(this.compare("sort"));
       });
     },
@@ -4730,7 +4848,7 @@ export default {
       this.$emit("event1", val);
       this.partition_id = val;
       this.getWeekPanels();
-      this.getSchedules();
+      // this.getSchedules();
     },
     changeSchedule_type(val) {
       this.$emit("event2", val);

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -23,6 +23,11 @@
         >
         </el-date-picker>
       </el-form-item>
+
+      <el-form-item label="模板生成起始周" v-if="template_mode.original_week">
+       <label>{{ template_mode.original_week?'第'+template_mode.original_week+'周':""}}</label>
+      </el-form-item>
+
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="hide">取 消</el-button>
@@ -43,16 +48,20 @@ export default {
       pickerOptions0: {
         'firstDayOfWeek': 1,
         disabledDate(time) {
-          var nowDate = new Date();
-          var nowYear = nowDate.getFullYear();
-          var nowMonth = nowDate.getMonth() + 1;
-          var nowDay = nowDate.getDate()+7;
+
+          let weekFirstDay = new Date(new Date() - (new Date().getDay() - 1) * 86400000)
+          let firstMonth = Number(weekFirstDay.getMonth()) + 1
+
+          if (firstMonth < 10) {
+            firstMonth = '0' + firstMonth
+          }
+          let weekFirstDays = weekFirstDay.getDate() + 7;
+          if (weekFirstDays < 10) {
+            weekFirstDays = '0' + weekFirstDays;
+          }
+
           let time_temp =
-              nowYear +
-              "-" +
-              (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-              "-" +
-              (nowDay < 10 ? "0" + nowDay : nowDay);
+            weekFirstDay.getFullYear() + '-' + firstMonth + '-' + weekFirstDays
 
           time_temp = time_temp.replace(/-/g,'/'); // 将-替换成/，因为下面这个构造函数只支持/分隔的日期字符串
 
@@ -113,6 +122,7 @@ export default {
     },
     show() {
       this.clear()
+      this.form.week_time = this.template_mode.origin_mode
       this.visible = true
     },
     hide() {
@@ -162,6 +172,8 @@ export default {
         var resp = rs.data
         if (resp.state == 1) {
           this.template_mode.mode = this.form.mode
+          this.template_mode.original_week = this.form.week_time
+
           this.hide()
           this.$emit('chenge_mode', this.form.mode)
         } else {

src/xt_pages/workforce/components/template_table_three.vue

@@ -1658,18 +1658,18 @@ export default {
 
     },
     setEditData(patients,template,device_numbers) {
+      this.device_numbers = []
+      this.template = []
       this.patientList = patients
       this.template = template
       this.all_patients = patients
-
       this.cur_info.patient_name = this.patientList[0].name
       this.cur_info.mode_name = this.modes[0].name
       this.cur_info.patient_id = this.patientList[0].id
       this.cur_info.mode_id = this.modes[0].id
       this.$refs.patient_table.setCurrentRow(this.patientList[0])
       this.$refs.mode_table.setCurrentRow(this.modes[0])
-
-
+      this.device_numbers = device_numbers
 
     },search_two: function () {
       if (this.keywords.length == 0) {

src/xt_pages/workforce/template.vue

@@ -118,55 +118,59 @@
 <!--          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :is_editing="false"-->
 <!--                          :patients="patients" :data="data"></template-table>-->
 <!--        </el-tab-pane>-->
-        <el-tab-pane name="first" :disabled="template_mode.mode == 0">
-          <span slot="label"> 一周模版 {{first_template.week?first_template.week+'周':""}}
-          </span>
-          <template-table  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"
-                          :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>
-
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" :label=" first_template.week?'一周模版'+ first_template.week+'周':'一周模版'">
+<!--          <span slot="label">-->
+<!--          </span>-->
 
         </el-tab-pane>
 
-        <el-tab-pane name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
-          <span slot="label">二周模版 {{  second_template.week?second_template.week+'周':""}}
-
-           </span>
-          <template-table-two  ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="second_template"
-                          :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh"></template-table-two>
+        <el-tab-pane :label="  second_template.week?'二周模版' + second_template.week+'周':'二周模版'" name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+<!--          <template-table   ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
+<!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
 
         </el-tab-pane>
 
 
 
-        <el-tab-pane name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
-          <span slot="label">三周模版{{ third_template.week?third_template.week+'周':" "}}
+        <el-tab-pane :label="  third_template.week? '三周模版' + third_template.week+'周':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+<!--          <span slot="label">三周模版{{ third_template.week?third_template.week+'周':" "}}-->
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
 <!--                  <span v-if="schedule.execute_times%4==0">(本周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==1">(下一周)</span>-->
 <!--            <span v-if="schedule.execute_times%4==2">(下二周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==3">(下三周)</span>-->
-           </span>
-          <template-table-three   ref="table_three" :editable="true" :device_numbers="device_numbers" :template="third_template" :is_editing="is_editing"
-                          :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh" ></template-table-three>
-
+<!--           </span>-->
+<!--          <template-table  ref="table_three"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
+<!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
         </el-tab-pane>
 
-      <el-tab-pane name="four" :disabled="template_mode.mode  != 4 ">
-          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}
+      <el-tab-pane :label="four_template.week?'四周模版'+four_template.week+'周':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+<!--          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}-->
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
 <!--            <span v-if="schedule.execute_times%4==0">(本周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==1">(下一周)</span>-->
 <!--            <span v-if="schedule.execute_times%4==2">(下二周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==3">(下三周)</span>-->
-           </span>
-          <template-table-four   ref="table_four" :editable="true" :device_numbers="device_numbers" :template="four_template" :is_editing="is_editing"
-                      :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>
+<!--           </span>-->
+<!--        <template-table   ref="table_four"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
+<!--                         :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
 
         </el-tab-pane>
 
+
+<!--        <template-table-two   v-show="activeName =='second'"  ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="second_template"-->
+<!--                             :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh"></template-table-two>-->
+<!--        <template-table-three  v-show="activeName =='third'"  ref="table_three" :editable="true" :device_numbers="device_numbers" :template="third_template" :is_editing="is_editing"-->
+<!--                                :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh" ></template-table-three>-->
+<!--        <template-table-four  v-show="activeName =='four'" ref="table_four" :editable="true" :device_numbers="device_numbers" :template="four_template" :is_editing="is_editing"-->
+<!--                               :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>-->
+
+
       </el-tabs>
+      <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" @setTemplate="setTemplate" @changeLoading="changeLoading"></template-table>
 
 
 <!--      <template-table  ref="table" :editable="true" :device_numbers="device_numbers" :template="tar_template" :is_editing="is_editing"-->
@@ -178,10 +182,10 @@
 
 
 
-      <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
-                              @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     </div>
 
+    <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
+                            @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     <el-dialog title="同步排班" width="600px" :visible.sync="newVisible">
       <el-form :model="form" ref="form" label-width="90px" :rules="rules">
         <el-form-item label="同步模板:" v-if="template_mode.mode == 1">
@@ -260,6 +264,7 @@ export default {
   },
   data: function () {
     return {
+      dataloading:true,
       is_editing:true,
       editable:false,
       data:[],
@@ -326,9 +331,6 @@ export default {
       newVisible: false,
       weekList: [],
       currentFirstDate1: '',
-      rules: {
-        copyWeek: [{required: true, message: "请选择复制时间段", trigger: "blur"}],
-      },
       weekNum: '',
       weekDayArr: [],
       todayDate: '',
@@ -425,41 +427,16 @@ export default {
 
         }
 
-
-
         var patients = resp.data.patients
-        // var schedules = resp.data.schedules
-
         this.template_mode = mode
         this.origin_mode = mode.mode
         this.device_numbers = device_numbers
         this.patients = patients
-
-
-
-        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
-        this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
-        this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
-        this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
-
+        this.tar_template = this.first_template
+        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
 
         var fakeTemplateItems = []
-        // for (let index = 0; index < schedules.length; index++) {
-        //   const schedule = schedules[index]
-        //   var item = {}
-        //   this.$set(item, 'id', schedule.id)
-        //   this.$set(item, 'template_id', 0)
-        //   this.$set(item, 'device_number_id', schedule.bed_id)
-        //   this.$set(item, 'treat_mode', schedule.mode_id)
-        //   this.$set(item, 'weekday', schedule.schedule_week)
-        //   this.$set(item, 'time_type', schedule.schedule_type)
-        //   var patient = {}
-        //   this.$set(patient, 'id', schedule.patient_id)
-        //   this.$set(patient, 'name', schedule.patient)
-        //   this.$set(item, 'patient', patient)
-        //
-        //   fakeTemplateItems.push(item)
-        // }
+
         this.this_week_schedules.items = fakeTemplateItems
 
       } else {
@@ -470,19 +447,48 @@ export default {
 
   },
   methods: {
+    changeLoading(){
+      this.dataloading = false
+    },
+    setTemplate(items){
+      if(this.template_mode.mode == 1){
+        this.first_template = items[0]
+      }else   if(this.template_mode.mode == 2){
+        this.first_template = items[0]
+        this.second_template = items[1]
+      }else   if(this.template_mode.mode == 3){
+        this.first_template = items[0]
+        this.second_template = items[1]
+        this.third_template = items[2]
+      }else   if(this.template_mode.mode == 4){
+        this.first_template = items[0]
+        this.second_template = items[1]
+        this.third_template = items[2]
+        this.four_template = items[3]
+      }
+    },
     handleClick(val){
+      this.dataloading = true
       if(this.activeName == "first"){
         this.activeName = "first"
-        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
+        // this.tar_template = this.first_template
+
+        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
       }else if(this.activeName == "second"){
         this.activeName = "second"
-        this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
+        // this.tar_template = this.second_template
+
+        this.$refs.table.setEditData(this.patients,this.second_template,this.device_numbers,this.templates,  this.activeName)
       }else if(this.activeName == "third"){
         this.activeName = "third"
-        this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
+        // this.tar_template = this.third_template
+
+        this.$refs.table.setEditData(this.patients,this.third_template,this.device_numbers,this.templates,  this.activeName)
       }else {
         this.activeName = "four"
-        this.$refs.table_four.setEditData(this.patients, this.four_template,this.device_numbers)
+        // this.tar_template = this.four_template
+
+        this.$refs.table.setEditData(this.patients, this.four_template,this.device_numbers,this.templates,  this.activeName)
       }
 
     },
@@ -558,7 +564,7 @@ export default {
           var mode = resp.data.template_mode
           var device_numbers = resp.data.device_numbers
           var templates = resp.data.templates
-
+          this.templates = templates
           if(templates.length > 0){
             this.firstWeekData = templates[0].items
             this.first_template = templates[0]
@@ -1456,13 +1462,13 @@ export default {
       if (!is_system_zone || !is_device_number) {
         console.log("123123123123")
         this.dialogVisible = true
-        return
+
       } else {
 
 
         if (is_exist_repeat) {
           this.isExistRepeatVisible = true
-          return
+
         } else {
 
           this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
@@ -1475,8 +1481,7 @@ export default {
           let params = {
             schedule: datas
           }
-          console.log("datas")
-          console.log(datas)
+
           //今天的时间
           var day2 = new Date()
           day2.setTime(day2.getTime())
@@ -1487,7 +1492,8 @@ export default {
             if (response.data.state == 0) {
               return false
             }
-            this.getWeekPanels("")
+            this.$message.success("导入成功")
+            // this.getWeekPanels("")
             this.getInitData()
 
           })
@@ -1516,9 +1522,30 @@ export default {
 
           this.first_template = templates[0]
           this.second_template = templates[1]
-
+          this.templates = templates
           this.third_template = templates[2]
           this.four_template = templates[3]
+          if(this.activeName == "first"){
+            this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }else if(this.activeName == "second"){
+
+            this.$refs.table.setEditData(this.patients,this.second_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }else if(this.activeName == "third"){
+
+            this.$refs.table.setEditData(this.patients,this.third_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }else if(this.activeName == "four"){
+
+            this.$refs.table.setEditData(this.patients,this.four_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }
+
 
           // var fakeTemplateItems = []
           // for (let index = 0; index < schedules.length; index++) {
@@ -3130,10 +3157,10 @@ export default {
 
 
 
-          this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
-          this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
-          this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
-          this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
+          this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,this.activeName)
+          // this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
+          // this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
+          // this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
 
 
           var fakeTemplateItems = []
@@ -3163,41 +3190,16 @@ export default {
 
     },saveData(val){
       var tempDataOne = []
-      var tempDataTwo = []
-      var tempDataThree = []
-      var tempDataFour = []
+      // var tempDataTwo = []
+      // var tempDataThree = []
+      // var tempDataFour = []
       for(let i = 0; i < val.length; i++){
-        if(val[i].t_id == this.first_template.id){
           tempDataOne.push(val[i])
-        }
-        if(val[i].t_id == this.second_template.id){
-          tempDataTwo.push(val[i])
-        }
-        if(val[i].t_id == this.third_template.id){
-          tempDataThree.push(val[i])
-        }
-        if(val[i].t_id == this.four_template.id){
-          tempDataFour.push(val[i])
-        }
       }
 
       if(tempDataOne.length > 0){
         this.$refs.table.SetSmartSch(tempDataOne)
       }
-      if(tempDataTwo.length > 0){
-         this.$refs.table_two.SetSmartSch(tempDataTwo)
-      }
-      if(tempDataThree.length > 0){
-         this.$refs.table_three.SetSmartSch(tempDataThree)
-      }
-      if(tempDataFour.length > 0){
-        this.$refs.table_four.SetSmartSch(tempDataFour)
-      }
-
-
-
-
-
 
 
       // 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})
@@ -3385,27 +3387,23 @@ export default {
           this.$refs.table.showSmartDialog()
         }else if(this.activeName == "second"){
           this.activeName = "second"
-          this.$refs.table_two.showSmartDialog()
+          this.$refs.table.showSmartDialog()
         }else if(this.activeName == "third"){
           this.activeName = "third"
-          this.$refs.table_three.showSmartDialog()
+          this.$refs.table.showSmartDialog()
         }else {
           this.activeName = "four"
-          this.$refs.table_four.showSmartDialog()
+          this.$refs.table.showSmartDialog()
         }
       })
 
     },saveClick:function (){
       if(this.template_mode.mode == 0){
-        this.$router.go(-1)
+        // this.$router.go(-1)
+        this.$router.back()
+
       }else{
         this.$message.success("保存成功")
-
-        // this.$refs.table.saveAction()
-        // this.$refs.table_two.saveAction()
-        // this.$refs.table_three.saveAction()
-        // this.$refs.table_four.saveAction()
-        // this.$router.go(-1)
         this.$router.back()
 
       }
@@ -3491,10 +3489,10 @@ export default {
 
 
 
-            this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
-            this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
-            this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
-            this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
+            this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
+            // this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
+            // this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
+            // this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
 
 
             var fakeTemplateItems = []