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

src/xt_pages/workforce/next_remind_print.vue

@@ -145,7 +145,14 @@
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
-          this.scheduleData = resp.data.schedule
+         var scheduleData = resp.data.schedule
+
+         for(let i=0;i<scheduleData.length;i++){
+             scheduleData[i].sort = scheduleData[i].number.sort
+          }
+          var arr = scheduleData.sort(this.compare('sort'))
+          console.log("打印数据",arr)
+          this.scheduleData = arr
         } else {
           this.$message.error(resp.msg)
         }
@@ -281,7 +288,15 @@
         }
         
         
+      },
+
+       compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
       }
+     },
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -134,7 +134,14 @@
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
-          this.scheduleData = resp.data.schdules
+           var scheduleData = resp.data.schdules
+           console.log("树",scheduleData)
+          for(let i=0;i<scheduleData.length;i++){
+             scheduleData[i].sort = scheduleData[i].number.sort
+          }
+          var arr = scheduleData.sort(this.compare('sort'))
+          console.log("打印数据",arr)
+          this.scheduleData = arr
         } else {
           this.$message.error(resp.msg)
         }
@@ -267,11 +274,17 @@
         }else{
           var str = year + "年" + month + "月" + day + "日  " + days;
           return str;
-        }
-        
-        
+        } 
+      },
+      compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
       }
+     },
     }
+   
   }
 </script>