浏览代码

Merge branch 'master' of http://git.shengws.com/csx/Vue_New

csx 5 年前
父节点
当前提交
952be330bc
共有 2 个文件被更改,包括 11 次插入13 次删除
  1. 10 11
      src/xt_pages/workforce/appointment.vue
  2. 1 2
      src/xt_pages/workforce/components/tableData.vue

+ 10 - 11
src/xt_pages/workforce/appointment.vue 查看文件

490
         }
490
         }
491
         return isShow
491
         return isShow
492
       }, handleSuccess({ results, header }) {
492
       }, handleSuccess({ results, header }) {
493
-
493
+        let headers = []
494
+        for (let key in results[0]) {
495
+          headers.push(key)
496
+        }
497
+        console.log(headers)
494
         if (results.length > 0) {
498
         if (results.length > 0) {
495
-          let headers = []
496
-          for (let key in results[0]) {
497
-            headers.push(key)
498
-          }
499
+
499
 
500
 
500
           var isHas_1 = headers.includes('区号')
501
           var isHas_1 = headers.includes('区号')
501
           console.log(isHas_1)
502
           console.log(isHas_1)
621
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
622
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
622
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
623
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
623
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
624
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
625
+            console.log("1111111")
624
             this.dialogVisible = true
626
             this.dialogVisible = true
625
             return
627
             return
626
           }
628
           }
627
         } else {
629
         } else {
630
+          console.log("2222222222")
631
+
628
           this.dialogVisible = true
632
           this.dialogVisible = true
629
           return
633
           return
630
         }
634
         }
667
 
671
 
668
         for (let key in this.partitions) {
672
         for (let key in this.partitions) {
669
           var jihaos = this.partitions[key].jihaos
673
           var jihaos = this.partitions[key].jihaos
670
-          console.log(jihaos)
671
 
674
 
672
           for (let i = 0; i < jihaos.length; i++) {
675
           for (let i = 0; i < jihaos.length; i++) {
673
             total_device_number.push(jihaos[i].number)
676
             total_device_number.push(jihaos[i].number)
684
 
687
 
685
         for (let i = 0; i < deviceNumber.length; i++) {
688
         for (let i = 0; i < deviceNumber.length; i++) {
686
           if (!total_device_number.includes(deviceNumber[i])) {
689
           if (!total_device_number.includes(deviceNumber[i])) {
687
-            console.log(deviceNumber[i])
688
             is_device_number = false
690
             is_device_number = false
689
           }
691
           }
690
         }
692
         }
819
           }
821
           }
820
         }
822
         }
821
 
823
 
822
-        console.log(header.length)
823
-        console.log(is_system_zone)
824
-        console.log(is_device_number)
825
 
824
 
826
-        if (header.length > 65 || !is_system_zone || !is_device_number) {
825
+        if (headers.length > 65 || !is_system_zone || !is_device_number) {
827
           this.dialogVisible = true
826
           this.dialogVisible = true
828
           return
827
           return
829
         } else {
828
         } else {

+ 1 - 2
src/xt_pages/workforce/components/tableData.vue 查看文件

1020
                 }
1020
                 }
1021
               });
1021
               });
1022
             }
1022
             }
1023
-            console.log("hhhh", that.scheduleZone);
1024
-            console.log(theSchedules);
1023
+
1025
           });
1024
           });
1026
         } else {
1025
         } else {
1027
           this.$message.error("网络错误");
1026
           this.$message.error("网络错误");