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

src/xt_pages/user/patients.vue

@@ -1075,7 +1075,13 @@
                 return
               }
 
-              this.exportVisible = true
+              // this.exportVisible = true
+              this.$alert('您提交的患者名单已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
+                confirmButtonText: '确定',
+                callback: action => {
+
+                }
+              });
               let params = {
                 'patients': this.export_date
               }

src/xt_pages/workforce/appointment.vue

@@ -499,49 +499,20 @@
 
 
           var isHas_1 = headers.includes('区号')
-          console.log(isHas_1)
           var isHas_2 = headers.includes('机号')
-          console.log(isHas_2)
-
           var isHas_3 = headers.includes('周一')
-          console.log(isHas_3)
-
           var isHas_4 = headers.includes('')
-          console.log(isHas_4)
-
           var isHas_5 = headers.includes('_1')
-          console.log(isHas_5)
-
           var isHas_6 = headers.includes('周二')
-          console.log(isHas_6)
-
           var isHas_7 = headers.includes('_2')
-          console.log(isHas_7)
-
           var isHas_8 = headers.includes('_3')
-          console.log(isHas_8)
-
           var isHas_9 = headers.includes('周三')
-          console.log(isHas_9)
-
           var isHas_10 = headers.includes('_4')
-          console.log(isHas_1)
-
           var isHas_11 = headers.includes('_5')
-          console.log(isHas_1)
-
           var isHas_12 = headers.includes('周四')
-          console.log(isHas_1)
-
           var isHas_13 = headers.includes('_6')
-          console.log(isHas_1)
-
           var isHas_14 = headers.includes('_7')
-          console.log(isHas_1)
-
           var isHas_15 = headers.includes('周五')
-          console.log(isHas_1)
-
           var isHas_16 = headers.includes('_8')
           console.log(isHas_1)
 
@@ -700,6 +671,8 @@
         }
 
         let datas = []
+        let failed_datas = []
+
         for (let i = 0; i < results.length; i++) {
           for (let key in results[i + 1]) {
             let tempObjTwo = { partition_name: '', device_number_name: '' }
@@ -735,11 +708,11 @@
               var m_month = current_date.getMonth() + 1
               m_month = m_month < 10 ? '0' + m_month.toString() : m_month.toString()
               var m_date = current_date.getDate() < 10 ? '0' + current_date.getDate().toString() : current_date.getDate().toString()
-
               var current_date_two = new Date(m_year + '-' + m_month + '-' + m_date)
-
-              if (new Date(tempObjTwo['schedule_date']).getTime() >= new Date(current_date_two).getTime()) {
+              if (new Date(tempObjTwo['schedule_date']).getTime() > new Date(current_date_two).getTime()) {
                 datas.push(tempObjTwo)
+              }else{
+                failed_datas.push(tempObjTwo)
               }
             }
           }
@@ -830,8 +803,20 @@
             this.isExistRepeatVisible = true
             return
           } else {
+            // this.exportVisible = true
+
+            this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
+              confirmButtonText: '确定',
+              callback: action => {
+
+              }
+            });
+
+
             let params = {
-              schedule: datas
+              schedule: datas,
+              failed_schedule: failed_datas
+
             }
 
             //今天的时间
@@ -839,10 +824,7 @@
             day2.setTime(day2.getTime())
             var month = day2.getMonth() + 1 < 10 ? '0' + (day2.getMonth() + 1).toString() : (day2.getMonth() + 1).toString()
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
-
             var date = day2.getFullYear() + '-' + month + '-' + day
-            this.exportVisible = true
-
             exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {
                 return false

src/xt_pages/workforce/template.vue

@@ -312,13 +312,13 @@
       },
       handleSuccess({ results, header }) {
 
-        console.log(this.template_mode.mode)
+        let headers = []
+        for (let key in results[0]) {
+          headers.push(key)
+        }
         if (this.template_mode.mode == 1) {
           if(results.length > 0) {
-            let headers = []
-            for (let key in results[0]) {
-              headers.push(key)
-            }
+
             var isHas_1 = headers.includes('区号')
             console.log(isHas_1)
             var isHas_2 = headers.includes('机号')
@@ -402,12 +402,7 @@
           }
 
         }else if(this.template_mode.mode == 2){
-
           if(results.length > 0) {
-            let headers = []
-            for (let key in results[0]) {
-              headers.push(key)
-            }
 
             var isHas_1 = headers.includes('区号')
             console.log(isHas_1)
@@ -706,7 +701,21 @@
           }
         }
 
-        if (!is_system_zone || !is_device_number) {
+        let isHeader = true
+
+        if(this.template_mode.mode == 1){
+          if(headers.length > 23){
+            isHeader = false
+          }
+
+        }else if(this.template_mode.mode == 2){
+          if(headers.length > 44){
+            isHeader = false
+          }
+
+        }
+
+        if (!isHeader || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return
         } else {
@@ -714,7 +723,14 @@
             this.isExistRepeatVisible = true
             return
           } else {
-            this.exportVisible = true
+
+            this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
+              confirmButtonText: '确定',
+              callback: action => {
+
+              }
+            });
+
             let params = {
               schedule: datas
             }