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

src/xt_pages/workforce/appointment.vue

@@ -490,12 +490,13 @@
         }
         return isShow
       }, handleSuccess({ results, header }) {
-
+        let headers = []
+        for (let key in results[0]) {
+          headers.push(key)
+        }
+        console.log(headers)
         if (results.length > 0) {
-          let headers = []
-          for (let key in results[0]) {
-            headers.push(key)
-          }
+
 
           var isHas_1 = headers.includes('区号')
           console.log(isHas_1)
@@ -621,10 +622,13 @@
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
+            console.log("1111111")
             this.dialogVisible = true
             return
           }
         } else {
+          console.log("2222222222")
+
           this.dialogVisible = true
           return
         }
@@ -667,7 +671,6 @@
 
         for (let key in this.partitions) {
           var jihaos = this.partitions[key].jihaos
-          console.log(jihaos)
 
           for (let i = 0; i < jihaos.length; i++) {
             total_device_number.push(jihaos[i].number)
@@ -684,7 +687,6 @@
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
-            console.log(deviceNumber[i])
             is_device_number = false
           }
         }
@@ -819,11 +821,8 @@
           }
         }
 
-        console.log(header.length)
-        console.log(is_system_zone)
-        console.log(is_device_number)
 
-        if (header.length > 65 || !is_system_zone || !is_device_number) {
+        if (headers.length > 65 || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return
         } else {

src/xt_pages/workforce/components/tableData.vue

@@ -1020,8 +1020,7 @@ export default {
                 }
               });
             }
-            console.log("hhhh", that.scheduleZone);
-            console.log(theSchedules);
+
           });
         } else {
           this.$message.error("网络错误");