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

src/xt_pages/workforce/scheduleTablePrintOne.vue

         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
         this.partition_id = this.$route.query.partition_id
-        this.getSolutionSchedule()
+        // this.getSolutionSchedule()
     },
     methods:{
          getAllZones(){
                 this.getPatientSheduleCount()
             }
           })
-        },
+        },  compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
         getWeekPanels() {
              this.scheduleZone = []
               var partionStr = this.partition_id
                 this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
                 var that = this
                 if (partitions.length > 0) {
+
                     partitions.forEach(function(partition) {
                         if (partition.jihaos.length == 0) {
                             return false
                             zone_type: partition.type,
                             cut: jihao.number,
                             jihao_id: jihao.id,
-                            Mon_M: {
+                              sort:jihao.sort,
+                              Mon_M: {
                                 schedule_id: 0,
                                 mode_id: 0,
                                 mode_name: '',
                         })
                     })
                 }
-                this.getSchedules()
+              this.scheduleZone.sort(this.compare('sort'))
+
+              this.getSchedules()
             })
         },
         getSchedules() {
                     console.log("newArr222222222",newArr)
                     that.scheduleZone.push(...newArr)
                     console.log('总数据77777777777',that.scheduleZone)
-
                 } else {
                     this.$message.error("网络错误");
                     return false;