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

src/xt_pages/user/patients.vue

@@ -666,7 +666,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'
+        aLink.download = this.timestampToTime(log.export_time)+'错误日志'+".txt"
         aLink.click()
 
       },

src/xt_pages/workforce/appointment.vue

@@ -162,7 +162,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'
+        aLink.download = this.timestampToTime(log.export_time)+'错误日志.txt'
         aLink.click()
 
       },
@@ -412,7 +412,7 @@
             for (let b = 0; b < jihaos.length; b++) {
               let obj = {}
               obj['区号'] = this.partitions[key].name
-              obj['机号'] = jihaos[b].number
+              obj['机号'] = jihaos[b].number.toString()
               list.push(obj)
             }
 
@@ -655,6 +655,8 @@
 
         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)
           }
@@ -666,12 +668,23 @@
           }
         }
 
+        console.log(deviceNumber)
+        console.log(total_device_number)
+
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
             is_device_number = false
           }
         }
 
+
+        console.log("111111111")
+        console.log(is_system_zone)
+        console.log(is_device_number)
+        console.log("22222222222")
+
+
+
         //
 
         let tempObj = null
@@ -726,6 +739,10 @@
 
         }
 
+        console.log("333333333")
+        console.log(datas)
+        console.log("44444444444")
+
         let date_arr = []
         //校验文档是否规范
         for (let i = 0; i < datas.length; i++) {
@@ -734,6 +751,7 @@
           }
 
           if (datas[i].device_number_name == undefined) {
+            console.log(datas[i].name)
             is_device_number = false
 
           }
@@ -759,6 +777,11 @@
           }
         }
 
+        console.log("333333333")
+        console.log(is_system_zone)
+        console.log(is_device_number)
+        console.log("44444444444")
+
         //校验文档中同一天同个人是否存在多个排班
         let is_exist_repeat = false
         const obj3 = {}
@@ -797,6 +820,11 @@
           }
         }
 
+        console.log(header.length )
+        console.log(is_system_zone )
+        console.log(is_device_number)
+
+
         if (header.length > 65 || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return

src/xt_pages/workforce/template.vue

@@ -224,7 +224,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'
+        aLink.download = this.timestampToTime(log.export_time)+'错误日志.txt'
         aLink.click()
 
       },
@@ -2134,7 +2134,7 @@
             for (let b = 0; b < jihaos.length; b++) {
               let obj = {}
               obj['区号'] = this.partitions[key].name
-              obj['机号'] = jihaos[b].number
+              obj['机号'] = jihaos[b].number.toString()
               list.push(obj)
             }