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

src/api/patient.js

@@ -356,6 +356,13 @@ export function postExportPatients(params) {
 
 
 
+export function getMaxDialysisNo() {
+  return request({
+    url: '/api/patients/dialysis_no',
+    method: 'Get',
+  })
+}
+
 
 
 

src/xt_pages/user/patients.vue

@@ -14,6 +14,45 @@
     </el-dialog>
 
 
+    <el-dialog
+      title="提示"
+      :visible.sync="dialysisVisible"
+      width="40%"
+    >
+      <span>您提交的文档中存在不同病人存在相同的透析号,请检查修改后在提交 </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialysisVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialysisVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="提示"
+      :visible.sync="phoneVisible"
+      width="40%"
+    >
+      <span>您提交的文档中存在不同病人存在相同的手机号,请检查修改后在提交 </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="phoneVisible = false">取 消</el-button>
+    <el-button type="primary" @click="phoneVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="提示"
+      :visible.sync="idCardNoVisible"
+      width="40%"
+    >
+      <span>您提交的文档中存在不同病人存在相同的身份证,请检查修改后在提交 </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="idCardNoVisible = false">取 消</el-button>
+    <el-button type="primary" @click="idCardNoVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
     <el-dialog
       title="提示"
       :visible.sync="exportLogVisible"
@@ -25,7 +64,7 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue"  @click="generateTxt(item)">点击</span>
+        <span style="color:blue" @click="generateTxt(item)">点击</span>
         <span>查看详情</span>
         <br/>
         <br/>
@@ -499,7 +538,7 @@
 </template>
 
 <script>
-  import { code, EditLapseto, fetchList, OpenView, postExportPatients } from '@/api/patient'
+  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients } from '@/api/patient'
   import { generateLog } from '@/api/config'
 
   import QRCode from 'qrcodejs2'
@@ -535,6 +574,8 @@
         isIndeterminate: true,
         dialogVisible: false,
         exportLogVisible: false,
+        phoneVisible:false,
+        idCardNoVisible:false,
         wechatbindimg: '',
         active: true,
         schedulType: 0,
@@ -601,7 +642,9 @@
         // value2: '',
         total: 0,
         pageTotal: 0,
+        dialysisVisible:false,
         pageSelect: 0,
+        max_dialysis_no: '',
         listQuery: {
           page: 1,
           limit: 10,
@@ -648,25 +691,25 @@
     },
 
     methods: {
-      generateTxt:function(log) {
+      generateTxt: function(log) {
         var content = ''
-       var errlog =  log.err_logs
-        for (let i = 0; i< errlog.length; i++){
+        var errlog = log.err_logs
+        content = this.getContent(log)
+        for (let i = 0; i < errlog.length; i++) {
           if (content.length == 0) {
             content = errlog[i].err_msg
-          }else{
-            content = content +"\n"+errlog[i].err_msg
+          } else {
+            content = content + '\n' + errlog[i].err_msg
           }
         }
 
-
         var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
         if (typeof url === 'object' && url instanceof Blob) {
           url = URL.createObjectURL(url) // 创建blob地址
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'+".txt"
+        aLink.download = this.timestampToTime(log.export_time) + '错误日志' + '.txt'
         aLink.click()
 
       },
@@ -680,7 +723,7 @@
         var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
         var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
         var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
-        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds())+'秒'
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
         return Y + M + D + h + m + s
       },
       generateLog() {
@@ -700,7 +743,8 @@
 
       },
       handleSuccess({ results, header }) {
-
+        console.log(results)
+        console.log(header)
 
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
@@ -712,177 +756,325 @@
           var isHasLapseto = header.includes('*治疗状态')
           var isHasInfectious = header.includes('*传染病')
           var isHasDiagnose = header.includes('诊断')
-          if (!(isHasName && isHasGender && isHasPhone && isHasIdCard && isHasDate && isHasSource && isHasLapseto && isHasInfectious && isHasDiagnose)) {
+          var isHasDialysisNo = header.includes('透析号')
+
+          var isHasDryWeight = header.includes('干体重(kg)')
+          var isHasHeight = header.includes('身高(cm)')
+          var isHasHomeAddress = header.includes('家庭住址')
+
+          if (!(isHasName && isHasGender && isHasPhone && isHasIdCard && isHasDate && isHasSource && isHasLapseto && isHasInfectious && isHasDiagnose && isHasDialysisNo && isHasDryWeight && isHasHeight && isHasHomeAddress)) {
             this.dialogVisible = true
             return
           }
-        }else{
+        } else {
           this.dialogVisible = true
           return
         }
-        this.export_date = []
-        for (let i = 1; i < results.length; i++) {
-          let obj = {}
-          for (var key in results[i]) {
-            if (results[i]['*姓名'] === undefined) {
-              obj['name'] = ''
-            } else {
-              if (key == '*姓名') {
-                obj['name'] = results[i][key]
+        getMaxDialysisNo().then(
+          response => {
+            if (response.data.state === 1) {
+              this.max_dialysis_no = response.data.data.dialysis_no
+              if (this.max_dialysis_no == 0) {
+                this.max_dialysis_no = 1
+              } else {
+                this.max_dialysis_no++
               }
-            }
 
-            if (results[i]['*性别'] === undefined) {
-              obj['gender'] = '0'
-            } else {
-              if (key == '*性别') {
-                if (results[i][key] == '男') {
-                  obj['gender'] = '1'
-                } else if (results[i][key] == '女') {
-                  obj['gender'] = '2'
-                } else {
-                  obj['gender'] = '0'
+
+              this.export_date = []
+              for (let i = 1; i < results.length; i++) {
+                let obj = {}
+                for (var key in results[i]) {
+                  if (results[i]['*姓名'] === undefined) {
+                    obj['name'] = ''
+                  } else {
+                    if (key == '*姓名') {
+                      obj['name'] = results[i][key].replace(/\s/g,"")
+
+                    }
+                  }
+
+                  if (results[i]['*性别'] === undefined) {
+                    obj['gender'] = '0'
+                  } else {
+                    if (key == '*性别') {
+                      if (results[i][key] == '男') {
+                        obj['gender'] = '1'
+                      } else if (results[i][key] == '女') {
+                        obj['gender'] = '2'
+                      } else {
+                        obj['gender'] = '0'
+                      }
+                    }
+                  }
+
+                  if (results[i]['*手机号'] === undefined) {
+                    obj['phone'] = ''
+                  } else {
+                    if (key == '*手机号') {
+                      obj['phone'] = results[i][key].replace(/\s/g,"")
+                    }
+                  }
+
+                  if (results[i]['*身份证号'] === undefined) {
+                    obj['id_card_no'] = ''
+
+                  } else {
+                    if (key == '*身份证号') {
+                      obj['id_card_no'] = results[i][key].replace(/\s/g,"")
+                    }
+                  }
+
+                  if (results[i]['*首次肾脏治疗时间'] === undefined) {
+                    obj['first_treatment_date'] = ''
+
+                  } else {
+                    if (key == '*首次肾脏治疗时间') {
+                      var month = parseInt(results[i][key].replace(/\s/g,"").split('/')[0])
+                      var day = parseInt(results[i][key].replace(/\s/g,"").split('/')[1])
+                      var year = parseInt(results[i][key].replace(/\s/g,"").split('/')[2])
+
+                      if (day < 10) {
+                        day = '0' + day
+                      }
+                      if (month < 10) {
+                        month = '0' + month
+                      }
+                      obj['first_treatment_date'] = '20' + year + '/' + month + '/' + day
+                    }
+                  }
+
+                  if (results[i]['*患者来源'] === undefined) {
+                    obj['source'] = '0'
+
+                  } else {
+                    if (key == '*患者来源') {
+                      if (results[i][key] == '门诊') {
+                        obj['source'] = '1'
+                      } else if (results[i][key] == '住院') {
+                        obj['source'] = '2'
+                      } else {
+                        obj['source'] = '0'
+                      }
+                    }
+                  }
+
+                  if (results[i]['*治疗状态'] === undefined) {
+                    obj['lapseto'] = '0'
+
+                  } else {
+                    if (key == '*治疗状态') {
+                      if (results[i][key] == '留治') {
+                        obj['lapseto'] = '1'
+                      } else if (results[i][key] == '转归') {
+                        obj['lapseto'] = '2'
+                      } else {
+                        obj['lapseto'] = '0'
+                      }
+                    }
+                  }
+
+                  if (results[i]['*传染病'] === undefined) {
+                    let contagions = []
+                    obj['is_infectious'] = '0'
+                    obj['contagions'] = contagions
+
+                  } else {
+                    if (key == '*传染病') {
+                      if (results[i][key] == '无') {
+                        let contagions = []
+                        obj['is_infectious'] = '1'
+                        obj['contagions'] = contagions
+
+                      } else if (results[i][key] == '乙肝') {
+                        let contagions = []
+                        contagions.push(2)
+                        obj['is_infectious'] = '2'
+                        obj['contagions'] = contagions
+                      } else if (results[i][key] == '丙肝') {
+                        let contagions = []
+                        contagions.push(3)
+                        obj['is_infectious'] = '2'
+                        obj['contagions'] = contagions
+
+                      } else if (results[i][key] == '艾滋病') {
+                        let contagions = []
+                        contagions.push(4)
+                        obj['is_infectious'] = '2'
+                        obj['contagions'] = contagions
+
+                      } else if (results[i][key] == '肺结核') {
+                        let contagions = []
+                        contagions.push(5)
+                        obj['is_infectious'] = '2'
+                        obj['contagions'] = contagions
+
+                      } else if (results[i][key] == '梅毒') {
+                        let contagions = []
+                        contagions.push(6)
+                        obj['is_infectious'] = '2'
+                        obj['contagions'] = contagions
+                      } else {
+                        let contagions = []
+                        obj['is_infectious'] = '0'
+                        obj['contagions'] = contagions
+                      }
+                    }
+                  }
+
+                  if (results[i]['诊断'] === undefined) {
+                    obj['diagnose'] = ''
+                  } else {
+                    if (key == '诊断') {
+                      obj['diagnose'] = results[i][key]
+                    }
+                  }
+                  console.log(obj)
+
+                  if (results[i]['透析号'] === undefined) {
+                    obj['dialysis_no'] = ''
+                  } else {
+                    if (key == '透析号') {
+                      obj['dialysis_no'] = results[i][key].replace(/\s/g,"")
+                    }
+                  }
+
+                  console.log(obj)
+
+                  if (results[i]['干体重(kg)'] === undefined) {
+                    obj['dry_weight'] = ''
+                  } else {
+                    if (key == '干体重(kg)') {
+                      obj['dry_weight'] = results[i][key].replace(/\s/g,"")
+                    }
+                  }
+
+                  console.log(obj)
+
+                  if (results[i]['身高(cm)'] === undefined) {
+                    obj['height'] = ''
+                  } else {
+                    if (key == '身高(cm)') {
+                      obj['height'] = results[i][key].replace(/\s/g,"")
+                    }
+                  }
+
+                  console.log(obj)
+
+                  if (results[i]['家庭住址'] === undefined) {
+                    obj['home_address'] = ''
+                  } else {
+                    if (key == '家庭住址') {
+                      obj['home_address'] = results[i][key]
+                    }
+                  }
                 }
+
+                this.export_date.push(obj)
               }
-            }
 
-            if (results[i]['*手机号'] === undefined) {
-              obj['phone'] = ''
-            } else {
-              if (key == '*手机号') {
-                obj['phone'] = results[i][key].trim()
+              let index = 0
+
+              for (let i = 0; i < this.export_date.length; i++) {
+                if (this.export_date[i].dialysis_no == '') {
+                  let new_dialysis_no = this.max_dialysis_no + index
+                  console.log(new_dialysis_no)
+                  index++
+                  let no = new_dialysis_no.toString()
+                  console.log(no)
+                  let rep = 3 - no.length
+                  console.log(rep)
+                  let tempNo = ""
+                  if (rep == 1){
+                    tempNo = "0"
+                  }
+
+                  if (rep == 2){
+                    tempNo = "00"
+                  }
+
+
+                  console.log(tempNo)
+                  if (rep > 0) {
+                    no = tempNo + no
+                  }
+                  this.export_date[i].dialysis_no = no
+                }
               }
-            }
 
-            if (results[i]['*身份证号'] === undefined) {
-              obj['id_card_no'] = ''
 
-            } else {
-              if (key == '*身份证号') {
-                obj['id_card_no'] = results[i][key].trim()
-              }
-            }
+              console.log(this.export_date)
 
-            if (results[i]['*首次肾脏治疗时间'] === undefined) {
-              obj['first_treatment_date'] = ''
+              var tempExportDate = this.export_date
+              var tempExportDateOne = this.export_date
+              var tempExportDateTwo = this.export_date
 
-            } else {
-              if (key == '*首次肾脏治疗时间') {
-                var month = parseInt(results[i][key].trim().split('/')[0])
-                var day = parseInt(results[i][key].trim().split('/')[1])
-                var year = parseInt(results[i][key].trim().split('/')[2])
 
-                if (day < 10) {
-                  day = '0' + day
-                }
-                if (month < 10) {
-                  month = '0' + month
-                }
-                obj['first_treatment_date'] = '20' + year + '/' + month + '/' + day
-              }
-            }
 
-            if (results[i]['*患者来源'] === undefined) {
-              obj['source'] = '0'
+              const obj2 = {}
+              tempExportDate = tempExportDate.reduce((cur, next) => {
+                obj2[next.dialysis_no] ? '' : obj2[next.dialysis_no] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-            } else {
-              if (key == '*患者来源') {
-                if (results[i][key] == '门诊') {
-                  obj['source'] = '1'
-                } else if (results[i][key] == '住院') {
-                  obj['source'] = '2'
-                } else {
-                  obj['source'] = '0'
-                }
-              }
-            }
 
-            if (results[i]['*治疗状态'] === undefined) {
-              obj['lapseto'] = '0'
 
-            } else {
-              if (key == '*治疗状态') {
-                if (results[i][key] == '留治') {
-                  obj['lapseto'] = '1'
-                } else if (results[i][key] == '转归') {
-                  obj['lapseto'] = '2'
-                } else {
-                  obj['lapseto'] = '0'
-                }
+              if (tempExportDate.length < this.export_date.length){
+                this.dialysisVisible = true
+                return
               }
-            }
 
-            if (results[i]['*传染病'] === undefined) {
-              let contagions = []
-              obj['is_infectious'] = '0'
-              obj['contagions'] = contagions
 
-            } else {
-              if (key == '*传染病') {
-                if (results[i][key] == '无') {
-                  let contagions = []
-                  obj['is_infectious'] = '1'
-                  obj['contagions'] = contagions
-
-                } else if (results[i][key] == '乙肝') {
-                  let contagions = []
-                  contagions.push(2)
-                  obj['is_infectious'] = '2'
-                  obj['contagions'] = contagions
-                } else if (results[i][key] == '丙肝') {
-                  let contagions = []
-                  contagions.push(3)
-                  obj['is_infectious'] = '2'
-                  obj['contagions'] = contagions
-
-                } else if (results[i][key] == '艾滋病') {
-                  let contagions = []
-                  contagions.push(4)
-                  obj['is_infectious'] = '2'
-                  obj['contagions'] = contagions
-
-                } else if (results[i][key] == '肺结核') {
-                  let contagions = []
-                  contagions.push(5)
-                  obj['is_infectious'] = '2'
-                  obj['contagions'] = contagions
-
-                } else if (results[i][key] == '梅毒') {
-                  let contagions = []
-                  contagions.push(6)
-                  obj['is_infectious'] = '2'
-                  obj['contagions'] = contagions
-                } else {
-                  let contagions = []
-                  obj['is_infectious'] = '0'
-                  obj['contagions'] = contagions
-                }
+
+              const obj3 = {}
+              tempExportDateOne = tempExportDateOne.reduce((cur, next) => {
+                obj3[next.phone] ? '' : obj3[next.phone] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+
+
+              if (tempExportDateOne.length < this.export_date.length){
+                this.phoneVisible = true
+                return
               }
-            }
 
-            if (results[i]['诊断'] === undefined) {
-              obj['diagnose'] = ''
-            } else {
-              if (key == '诊断') {
-                obj['diagnose'] = results[i][key]
+
+
+
+              const obj4 = {}
+              tempExportDateTwo = tempExportDateTwo.reduce((cur, next) => {
+                obj4[next.id_card_no] ? '' : obj4[next.id_card_no] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+
+
+              if (tempExportDateTwo.length < this.export_date.length){
+                this.idCardNoVisible = true
+                return
               }
-            }
-          }
-          this.export_date.push(obj)
-        }
 
-        let params = {
-          'patients': this.export_date
-        }
-        postExportPatients(params).then(
-          response => {
-            if (response.data.state === 1) {
-              this.getList()
-            } else {
-              this.$message.error(response.data.msg)
+
+
+
+              // let params = {
+              //   'patients': this.export_date
+              // }
+              // postExportPatients(params).then(
+              //   response => {
+              //     if (response.data.state === 1) {
+              //       this.getList()
+              //     } else {
+              //       this.$message.error(response.data.msg)
+              //     }
+              //   }
+              // )
+
             }
           }
         )
+
       },
       getCount(row) {
         console.log(row)
@@ -946,88 +1138,88 @@
         this.pageSelect = this.multipleSelection.length
       },
 
-    handleCheckedCitiesChange(value) {
-      const checkedCount = value.length;
-      this.checkAll = checkedCount === this.cities.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.cities.length;
-    },
-    handleSizeChange(val) {
-      this.listQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.listQuery.page = val;
-      this.getList();
-    },
-    changeCategoryId(categoryId) {
-      this.categoryId = categoryId;
-    },
-    selectSchedulType(scheduleType) {
-      // alert(scheduleType);/
-      this.schedulType = scheduleType;
-      this.listQuery.schedul_type = scheduleType;
-      this.getList();
-    },
-    selectSystemType(systemType) {
-      this.systemType = systemType;
-      this.listQuery.binding_state = systemType;
-      this.getList();
-    },
-    selectLapseTo(lapseto) {
-      this.lapsetoType = lapseto;
-      this.listQuery.lapseto = lapseto;
-      this.getList();
-    },
-    selectSource(source) {
-      this.sourceType = source;
-      this.listQuery.source = source;
-      this.getList();
-    },
-    changeTimeOne(val) {
-      var time = this.getTimestamp(val) - this.end_time;
-      if (time > 0) {
-        this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.start_time = "";
-      } else {
-        this.getList();
-        this.startTime = this.getTimestamp(val);
-      }
-    },
-    changeTime(val) {
-      var time = this.getTimestamp(val) - this.startTime;
-      if (time < 0) {
-        this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
-      } else {
-        this.getList();
-        this.end_time = this.getTimestamp(val);
-      }
-    },
-    getTimestamp(time) {
-      // 把时间日期转成时间戳
-      return new Date(time).getTime() / 1000;
-    },
-    search() {
-      this.listQuery.keywords = this.searchKey;
-      this.getList();
-    },
-    changeOtherSearch() {
-      this.getList();
-    },
-    getList() {
-      fetchList(this.listQuery).then(response => {
-        if (response.data.state === 0) {
-          this.$message.error(response.data.msg);
-          return false;
+      handleCheckedCitiesChange(value) {
+        const checkedCount = value.length
+        this.checkAll = checkedCount === this.cities.length
+        this.isIndeterminate =
+          checkedCount > 0 && checkedCount < this.cities.length
+      },
+      handleSizeChange(val) {
+        this.listQuery.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.page = val
+        this.getList()
+      },
+      changeCategoryId(categoryId) {
+        this.categoryId = categoryId
+      },
+      selectSchedulType(scheduleType) {
+        // alert(scheduleType);/
+        this.schedulType = scheduleType
+        this.listQuery.schedul_type = scheduleType
+        this.getList()
+      },
+      selectSystemType(systemType) {
+        this.systemType = systemType
+        this.listQuery.binding_state = systemType
+        this.getList()
+      },
+      selectLapseTo(lapseto) {
+        this.lapsetoType = lapseto
+        this.listQuery.lapseto = lapseto
+        this.getList()
+      },
+      selectSource(source) {
+        this.sourceType = source
+        this.listQuery.source = source
+        this.getList()
+      },
+      changeTimeOne(val) {
+        var time = this.getTimestamp(val) - this.end_time
+        if (time > 0) {
+          this.$message.error('结束时间不能小于开始时间')
+          this.listQuery.start_time = ''
         } else {
-          this.tableData = response.data.data.patients;
-          // console.log('病人是', this.tableData)
-          this.pageTotal = this.tableData.length;
-          this.total = response.data.data.total;
+          this.getList()
+          this.startTime = this.getTimestamp(val)
         }
-      });
-    },
+      },
+      changeTime(val) {
+        var time = this.getTimestamp(val) - this.startTime
+        if (time < 0) {
+          this.$message.error('结束时间不能小于开始时间')
+          this.listQuery.end_time = ''
+        } else {
+          this.getList()
+          this.end_time = this.getTimestamp(val)
+        }
+      },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000
+      },
+      search() {
+        this.listQuery.keywords = this.searchKey
+        this.getList()
+      },
+      changeOtherSearch() {
+        this.getList()
+      },
+      getList() {
+        fetchList(this.listQuery).then(response => {
+          if (response.data.state === 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.patients
+            // console.log('病人是', this.tableData)
+            this.pageTotal = this.tableData.length
+            this.total = response.data.data.total
+          }
+        })
+      },
 
       OpenView(name, number, id) {
         this.name = name

src/xt_pages/workforce/appointment.vue

@@ -11,7 +11,7 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue"  @click="generateTxt(item)">点击</span>
+        <span style="color:blue" @click="generateTxt(item)">点击</span>
         <span>查看详情</span>
         <br/>
         <br/>
@@ -54,23 +54,23 @@
         <div>
           <schedule-upload-excel style="float:left;margin-right: -500px" :on-success='handleSuccess'
                                  :before-upload="beforeUpload"></schedule-upload-excel>
-        <el-button v-if="isShow()" type="primary" size="small" @click="export_file()"
-                   :loading="downloadLoading"
-        >
-          导出模版
-        </el-button>
-
-        <el-button
-          @click="generateLog()"
-          class="filter-item"
-          type="primary"
-          size="small"
-        >下载错误日志
-        </el-button>
-
-        <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
-        <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-        </el-button>
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()"
+                     :loading="downloadLoading"
+          >
+            导出模版
+          </el-button>
+
+          <el-button
+            @click="generateLog()"
+            class="filter-item"
+            type="primary"
+            size="small"
+          >下载错误日志
+          </el-button>
+
+          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
+          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+          </el-button>
         </div>
       </el-col>
     </div>
@@ -103,7 +103,7 @@
 <script>
   import { parseTime } from '@/utils'
   import tableData from './components/tableData'
-  import { exportSchedule, getWeekPanels,initDate } from '@/api/schedule'
+  import { exportSchedule, getWeekPanels, initDate } from '@/api/schedule'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
   import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
@@ -121,14 +121,14 @@
         tabPosition: 'top',
         partitions: {},
         scheduleZone: [],
-        days:[],
-        logs:[],
+        days: [],
+        logs: [],
         scheduleZoneRow: [],
         downloadLoading: false,
         msgTipVisible: false,
         dialogVisible: false,
         isExistRepeatVisible: false,
-        exportLogVisible:false,
+        exportLogVisible: false,
         theWeek: {
           lastWeek: 0,
           thisWeek: 0,
@@ -144,25 +144,26 @@
       UploadExcel
     },
     methods: {
-      generateTxt:function(log) {
+      generateTxt: function(log) {
         var content = ''
-        var errlog =  log.err_logs
-        for (let i = 0; i< errlog.length; i++){
+        var errlog = log.err_logs
+        content = this.getContent(log)
+
+        for (let i = 0; i < errlog.length; i++) {
           if (content.length == 0) {
             content = errlog[i].err_msg
-          }else{
-            content = content +"\n"+errlog[i].err_msg
+          } else {
+            content = content + '\n' + errlog[i].err_msg
           }
         }
 
-
         var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
         if (typeof url === 'object' && url instanceof Blob) {
           url = URL.createObjectURL(url) // 创建blob地址
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志.txt'
+        aLink.download = this.timestampToTime(log.export_time) + '错误日志.txt'
         aLink.click()
 
       },
@@ -173,7 +174,7 @@
         var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
         var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
         var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
-        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds())+'秒'
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
         return Y + M + D + h + m + s
       },
       getContent(log) {
@@ -420,13 +421,13 @@
           }
           console.log(list)
           const data = this.formatJson(filterVal, list)
-          const filename = "排班模版"
+          const filename = '排班模版'
           excel.export_json_to_excel({
             multiHeader,
             header,
             merges,
             data,
-            filename,
+            filename
           })
           this.downloadLoading = false
         })
@@ -477,9 +478,7 @@
         return isShow
       }, handleSuccess({ results, header }) {
 
-
-
-        if(results.length > 0) {
+        if (results.length > 0) {
           let headers = []
           for (let key in results[0]) {
             headers.push(key)
@@ -612,13 +611,11 @@
             this.dialogVisible = true
             return
           }
-        }else{
+        } else {
           this.dialogVisible = true
           return
         }
 
-
-
         let is_system_zone = true
         let is_device_number = true
         let zones = []
@@ -678,14 +675,7 @@
         }
 
 
-        console.log("111111111")
-        console.log(is_system_zone)
-        console.log(is_device_number)
-        console.log("22222222222")
-
-
 
-        //
 
         let tempObj = null
         if (results.length > 0) {
@@ -699,7 +689,7 @@
 
             if (key != '区号' && key != '机号') {
               let obj = {}
-              obj['name'] = results[i + 1][key].trim()
+              obj['name'] = results[i + 1][key].replace(/\s/g, '')
               if (tempObj[key] == '上午') {
                 obj['schedule_type'] = 1
               } else if (tempObj[key] == '下午') {
@@ -731,7 +721,7 @@
 
               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)
               }
             }
@@ -739,9 +729,6 @@
 
         }
 
-        console.log("333333333")
-        console.log(datas)
-        console.log("44444444444")
 
         let date_arr = []
         //校验文档是否规范
@@ -777,10 +764,7 @@
           }
         }
 
-        console.log("333333333")
-        console.log(is_system_zone)
-        console.log(is_device_number)
-        console.log("44444444444")
+
 
         //校验文档中同一天同个人是否存在多个排班
         let is_exist_repeat = false
@@ -820,11 +804,10 @@
           }
         }
 
-        console.log(header.length )
-        console.log(is_system_zone )
+        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
@@ -844,30 +827,24 @@
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
 
             var date = day2.getFullYear() + '-' + month + '-' + day
-            exportSchedule(params,date).then(response => {
+            exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {
                 return false
               }
               this.getWeekPanels()
 
-
-
             })
           }
 
         }
 
       },
-      getInitDate(){
+      getInitDate() {
         initDate().then(response => {
           if (response.data.state == 0) {
             return false
           }
-
           this.days = response.data.data.days
-
-
-
         })
       },
       getWeekByResultsStr(key) {
@@ -1413,23 +1390,18 @@
           case '周一_1': //下周一
             return this.days[7]
 
-
-
-
             break
 
           case '_14': //下周一
 
             return this.days[7]
 
-
             break
 
           case   '_15': //下周一
 
             return this.days[7]
 
-
             break
 
           case '周一_2' : //下下周一
@@ -1442,14 +1414,12 @@
 
             return this.days[14]
 
-
             break
 
           case '_29': //下下周一
 
             return this.days[14]
 
-
             break
 
           case '周二' : //本周二
@@ -1475,19 +1445,16 @@
           case  '_16' ://下周二
             return this.days[8]
 
-
             break
 
           case  '_17'://下周二
             return this.days[8]
 
-
             break
 
           case '周二_2' ://下下周二
             return this.days[15]
 
-
             break
 
           case '_30' ://下下周二
@@ -1508,43 +1475,36 @@
           case  '_4': //本周三
             return this.days[2]
 
-
             break
 
           case '_5': //本周三
             return this.days[2]
 
-
             break
 
           case '周三_1': //下周三
             return this.days[9]
 
-
             break
 
           case  '_18' : //下周三
             return this.days[9]
 
-
             break
 
           case '_19': //下周三
             return this.days[9]
 
-
             break
 
           case '周三_2' : //下下周三
             return this.days[16]
 
-
             break
 
           case '_32' : //下下周三
             return this.days[16]
 
-
             break
 
           case  '_33': //下下周三
@@ -1560,20 +1520,17 @@
           case '_6' :
             return this.days[4]
 
-
             break
 
           case  '_7':
             return this.days[4]
 
-
             break
 
           case '周四_1':
 
             return this.days[10]
 
-
             break
 
           case '_20' :
@@ -1592,7 +1549,6 @@
 
             return this.days[17]
 
-
             break
 
           case '_34':
@@ -1609,24 +1565,20 @@
           case '周五':
             return this.days[4]
 
-
             break
 
           case  '_8':
             return this.days[4]
 
-
             break
 
           case  '_9':
             return this.days[4]
 
-
             break
           case '周五_1' :
             return this.days[11]
 
-
             break
 
           case '_22' :
@@ -1637,18 +1589,15 @@
           case  '_23':
             return this.days[11]
 
-
             break
           case '周五_2' :
             return this.days[18]
 
-
             break
 
           case '_36':
             return this.days[18]
 
-
             break
 
           case  '_37':
@@ -1659,7 +1608,6 @@
           case '周六' :
             return this.days[5]
 
-
             break
 
           case  '_10' :
@@ -1670,18 +1618,15 @@
           case '_11':
             return this.days[5]
 
-
             break
           case '周六_1' :
             return this.days[12]
 
-
             break
 
           case  '_24' :
             return this.days[12]
 
-
             break
 
           case  '_25':
@@ -1692,24 +1637,20 @@
           case '周六_2' :
             return this.days[19]
 
-
             break
 
           case '_38' :
             return this.days[19]
 
-
             break
 
           case '_39':
             return this.days[19]
 
-
             break
           case '周日' :
             return this.days[6]
 
-
             break
 
           case  '_12' :
@@ -1723,13 +1664,11 @@
           case '周日_1' :
             return this.days[13]
 
-
             break
 
           case  '_26' :
             return this.days[13]
 
-
             break
 
           case  '_27':

src/xt_pages/workforce/template.vue

@@ -71,6 +71,18 @@
       </el-button>
 
 
+      <el-button
+        @click="generateLog()"
+        class="filter-item"
+        type="primary"
+        size="small"
+      >下载错误日志
+      </el-button>
+
+      <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
+      <schedule-template-upload-excel style="float:right;" :on-success='handleSuccess'
+                                      :before-upload="beforeUpload"></schedule-template-upload-excel>
+
 
       <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
       <!-- </el-col> -->
@@ -209,6 +221,7 @@
       generateTxt:function(log) {
         var content = ''
         var errlog =  log.err_logs
+        content = this.getContent(log)
         for (let i = 0; i< errlog.length; i++){
           if (content.length == 0) {
             content = errlog[i].err_msg
@@ -552,7 +565,7 @@
 
             if (key != '区号' && key != '机号') {
               let obj = {}
-              obj['name'] = results[i + 1][key].trim()
+              obj['name'] = results[i + 1][key].replace(/\s/g,"")
               if (tempObj[key] == '上午') {
                 obj['schedule_type'] = 1
               } else if (tempObj[key] == '下午') {

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //  store.dispatch('VerifyConfigList', []).then(() => {
-  //    next()
-  // })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //  store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //    next()
-  //  })
-  // } else {
-  //   next()
-  // }
-  // return
+  //   if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //    store.dispatch('VerifyConfigList', []).then(() => {
+  //      next()
+  //   })
+  //   }
+  //   if (store.getters.permission_routers === undefined) {
+  //    store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //      next()
+  //    })
+  //   } else {
+  //     next()
+  //   }
+  //   return
   // 线上注释
 
   NProgress.start();