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

src/components/UploadExcel/index.vue

@@ -104,6 +104,12 @@ export default {
       return o
     },
     get_header_row(sheet) {
+      console.log(sheet['!ref'] )
+      if(sheet['!ref'] == undefined){
+        this.loading = false
+        return
+      }
+
       const headers = []
       const range = XLSX.utils.decode_range(sheet['!ref'])
       let C

src/xt_pages/components/UploadExcel/index.vue

@@ -103,6 +103,11 @@
         return o
       },
       get_header_row(sheet) {
+        if(sheet['!ref'] == undefined){
+          this.loading = false
+          return
+        }
+
         const headers = []
         const range = XLSX.utils.decode_range(sheet['!ref'])
         let C

src/xt_pages/user/patients.vue

@@ -700,24 +700,28 @@
 
       },
       handleSuccess({ results, header }) {
-        console.log(header)
-        console.log(results)
-
-        var isHasName = header.includes('*姓名')
-        var isHasGender = header.includes('*性别')
-        var isHasPhone = header.includes('*手机号')
-        var isHasIdCard = header.includes('*身份证号')
-        var isHasDate = header.includes('*首次肾脏治疗时间')
-        var isHasSource = header.includes('*患者来源')
-        var isHasLapseto = header.includes('*治疗状态')
-        var isHasInfectious = header.includes('*传染病')
-        var isHasDiagnose = header.includes('诊断')
-        if (!(isHasName && isHasGender && isHasPhone && isHasIdCard && isHasDate && isHasSource && isHasLapseto && isHasInfectious && isHasDiagnose)) {
+
+
+        if (header != undefined && header.length > 0) {
+          var isHasName = header.includes('*姓名')
+          var isHasGender = header.includes('*性别')
+          var isHasPhone = header.includes('*手机号')
+          var isHasIdCard = header.includes('*身份证号')
+          var isHasDate = header.includes('*首次肾脏治疗时间')
+          var isHasSource = header.includes('*患者来源')
+          var isHasLapseto = header.includes('*治疗状态')
+          var isHasInfectious = header.includes('*传染病')
+          var isHasDiagnose = header.includes('诊断')
+          if (!(isHasName && isHasGender && isHasPhone && isHasIdCard && isHasDate && isHasSource && isHasLapseto && isHasInfectious && isHasDiagnose)) {
+            this.dialogVisible = true
+            return
+          }
+        }else{
           this.dialogVisible = true
           return
         }
         this.export_date = []
-        for (let i = 0; i < results.length; i++) {
+        for (let i = 1; i < results.length; i++) {
           let obj = {}
           for (var key in results[i]) {
             if (results[i]['*姓名'] === undefined) {

src/xt_pages/workforce/appointment.vue

@@ -477,6 +477,148 @@
         return isShow
       }, handleSuccess({ results, header }) {
 
+
+
+        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('机号')
+          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)
+
+          var isHas_17 = headers.includes('_9')
+          console.log(isHas_1)
+
+          var isHas_18 = headers.includes('周六')
+          console.log(isHas_1)
+
+          var isHas_19 = headers.includes('_10')
+          console.log(isHas_1)
+
+          var isHas_20 = headers.includes('_11')
+          console.log(isHas_1)
+
+          var isHas_21 = headers.includes('周日')
+          console.log(isHas_1)
+
+          var isHas_22 = headers.includes('_12')
+          console.log(isHas_1)
+
+          var isHas_23 = headers.includes('_13')
+          console.log(isHas_1)
+
+          var isHas_24 = headers.includes('周一_1')
+          var isHas_25 = headers.includes('_14')
+          var isHas_26 = headers.includes('_15')
+          var isHas_27 = headers.includes('周二_1')
+          var isHas_28 = headers.includes('_16')
+          var isHas_29 = headers.includes('_17')
+          var isHas_30 = headers.includes('周三_1')
+          var isHas_31 = headers.includes('_18')
+          var isHas_32 = headers.includes('_19')
+          var isHas_33 = headers.includes('周四_1')
+          var isHas_34 = headers.includes('_20')
+          var isHas_35 = headers.includes('_21')
+          var isHas_36 = headers.includes('周五_1')
+          var isHas_37 = headers.includes('_22')
+          var isHas_38 = headers.includes('_23')
+          var isHas_39 = headers.includes('周六_1')
+          var isHas_40 = headers.includes('_24')
+          var isHas_41 = headers.includes('_25')
+          var isHas_42 = headers.includes('周日_1')
+          var isHas_43 = headers.includes('_26')
+          var isHas_44 = headers.includes('_27')
+          var isHas_45 = headers.includes('周一_2')
+          var isHas_46 = headers.includes('_28')
+          var isHas_47 = headers.includes('_29')
+          var isHas_48 = headers.includes('周二_2')
+          var isHas_49 = headers.includes('_30')
+          var isHas_50 = headers.includes('_31')
+          var isHas_51 = headers.includes('周三_2')
+          var isHas_52 = headers.includes('_32')
+          var isHas_53 = headers.includes('_33')
+          var isHas_54 = headers.includes('周四_2')
+          var isHas_55 = headers.includes('_34')
+          var isHas_56 = headers.includes('_35')
+          var isHas_57 = headers.includes('周五_2')
+          var isHas_58 = headers.includes('_36')
+          var isHas_59 = headers.includes('_37')
+          var isHas_60 = headers.includes('周六_2')
+          var isHas_61 = headers.includes('_38')
+          var isHas_62 = headers.includes('_39')
+          var isHas_63 = headers.includes('周日_2')
+          var isHas_64 = headers.includes('_40')
+          var isHas_65 = headers.includes('_41')
+
+          if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
+            isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
+            isHas_11 && isHas_12 && isHas_13 && isHas_14 && isHas_15 &&
+            isHas_16 && isHas_17 && isHas_18 && isHas_19 && isHas_20 &&
+            isHas_21 && isHas_22 && isHas_23 && isHas_24 && isHas_25 &&
+            isHas_26 && isHas_27 && isHas_28 && isHas_29 && isHas_30 &&
+            isHas_31 && isHas_32 && isHas_33 && isHas_34 && isHas_35 &&
+            isHas_36 && isHas_37 && isHas_38 && isHas_39 && isHas_40 &&
+            isHas_41 && isHas_42 && isHas_43 && isHas_44 && isHas_45 &&
+            isHas_46 && isHas_47 && isHas_48 && isHas_49 && isHas_50 &&
+            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)) {
+            this.dialogVisible = true
+            return
+          }
+        }else{
+          this.dialogVisible = true
+          return
+        }
+
+
+
         let is_system_zone = true
         let is_device_number = true
         let zones = []

src/xt_pages/workforce/components/scheduleTemplateUploadExcel/index.vue

@@ -1,5 +1,17 @@
 <template>
   <div>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="40%"
+    >
+      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新下载文档</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
     <el-dialog
       :visible.sync="msgTipVisible"
       width="40%"
@@ -29,6 +41,7 @@
       return {
         loading: false,
         msgTipVisible:false,
+        dialogVisible:false,
         excelData: {
           header: null,
           results: null
@@ -104,10 +117,22 @@
           const reader = new FileReader()
           reader.onload = e => {
             const data = e.target.result
+            console.log(data)
+
             const fixedData = this.fixdata(data)
+            console.log(fixedData)
+
             const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            console.log(workbook)
+
             const firstSheetName = workbook.SheetNames[0]
+            console.log(firstSheetName)
+
             const worksheet = workbook.Sheets[firstSheetName]
+            console.log(worksheet)
+
+
+
             const header = this.get_header_row(worksheet)
             const results = XLSX.utils.sheet_to_json(worksheet)
             this.generateDate({ header, results })
@@ -126,6 +151,12 @@
         return o
       },
       get_header_row(sheet) {
+        if(sheet['!ref'] == undefined){
+          this.loading = false
+          return
+        }
+
+
         const headers = []
         const range = XLSX.utils.decode_range(sheet['!ref'])
         let C

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -126,6 +126,12 @@
         return o
       },
       get_header_row(sheet) {
+
+        if(sheet['!ref'] == undefined){
+          this.loading = false
+          return
+        }
+
         const headers = []
         const range = XLSX.utils.decode_range(sheet['!ref'])
         let C

src/xt_pages/workforce/template.vue

@@ -281,6 +281,220 @@
       },
       handleSuccess({ results, header }) {
 
+        console.log(this.template_mode.mode)
+        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('机号')
+            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)
+
+            var isHas_17 = headers.includes('_9')
+            console.log(isHas_1)
+
+            var isHas_18 = headers.includes('周六')
+            console.log(isHas_1)
+
+            var isHas_19 = headers.includes('_10')
+            console.log(isHas_1)
+
+            var isHas_20 = headers.includes('_11')
+            console.log(isHas_1)
+
+            var isHas_21 = headers.includes('周日')
+            console.log(isHas_1)
+
+            var isHas_22 = headers.includes('_12')
+            console.log(isHas_1)
+
+            var isHas_23 = headers.includes('_13')
+            console.log(isHas_1)
+
+            if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
+              isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
+              isHas_11 && isHas_12 && isHas_13 && isHas_14 && isHas_15 &&
+              isHas_16 && isHas_17 && isHas_18 && isHas_19 && isHas_20 &&
+              isHas_21 && isHas_22 && isHas_23 )) {
+
+              this.dialogVisible = true
+              return
+            }
+          }else{
+            this.dialogVisible = true
+            return
+          }
+
+        }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)
+            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)
+
+            var isHas_17 = headers.includes('_9')
+            console.log(isHas_1)
+
+            var isHas_18 = headers.includes('周六')
+            console.log(isHas_1)
+
+            var isHas_19 = headers.includes('_10')
+            console.log(isHas_1)
+
+            var isHas_20 = headers.includes('_11')
+            console.log(isHas_1)
+
+            var isHas_21 = headers.includes('周日')
+            console.log(isHas_1)
+
+            var isHas_22 = headers.includes('_12')
+            console.log(isHas_1)
+
+            var isHas_23 = headers.includes('_13')
+            console.log(isHas_1)
+
+            var isHas_24 = headers.includes('周一_1')
+            var isHas_25 = headers.includes('_14')
+            var isHas_26 = headers.includes('_15')
+            var isHas_27 = headers.includes('周二_1')
+            var isHas_28 = headers.includes('_16')
+            var isHas_29 = headers.includes('_17')
+            var isHas_30 = headers.includes('周三_1')
+            var isHas_31 = headers.includes('_18')
+            var isHas_32 = headers.includes('_19')
+            var isHas_33 = headers.includes('周四_1')
+            var isHas_34 = headers.includes('_20')
+            var isHas_35 = headers.includes('_21')
+            var isHas_36 = headers.includes('周五_1')
+            var isHas_37 = headers.includes('_22')
+            var isHas_38 = headers.includes('_23')
+            var isHas_39 = headers.includes('周六_1')
+            var isHas_40 = headers.includes('_24')
+            var isHas_41 = headers.includes('_25')
+            var isHas_42 = headers.includes('周日_1')
+            var isHas_43 = headers.includes('_26')
+            var isHas_44 = headers.includes('_27')
+
+            if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
+              isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
+              isHas_11 && isHas_12 && isHas_13 && isHas_14 && isHas_15 &&
+              isHas_16 && isHas_17 && isHas_18 && isHas_19 && isHas_20 &&
+              isHas_21 && isHas_22 && isHas_23 && isHas_24 && isHas_25 &&
+              isHas_26 && isHas_27 && isHas_28 && isHas_29 && isHas_30 &&
+              isHas_31 && isHas_32 && isHas_33 && isHas_34 && isHas_35 &&
+              isHas_36 && isHas_37 && isHas_38 && isHas_39 && isHas_40 &&
+              isHas_41 && isHas_42 && isHas_43 && isHas_44)){
+              this.dialogVisible = true
+              return
+            }
+          }else{
+            this.dialogVisible = true
+            return
+          }
+
+        } else {
+          this.dialogVisible = true
+          return
+        }
+
+
+
+
+
+
         let is_system_zone = true
         let is_device_number = true
         let zones = []