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

src/xt_pages/components/UploadExcel/index.vue

     },
     methods: {
       generateDate({ header, results }) {
-        console.log("11111111")
         this.excelData.header = header
         this.excelData.results = results
         this.onSuccess && this.onSuccess(this.excelData)

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

           <td style="text-align:center;">
             年龄:
             <span style="display:inline-block;margin-left:10px;">
-              {{getAge(patientInfo)}}
+              {{
+              getAge(patientInfo)
+              }}
             </span>
           </td>
           <td style="text-align:center;">

src/xt_pages/user/patients.vue

       :visible.sync="dialogVisible"
       width="40%"
     >
-<!--      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新 <a href="https://kuyi.shengws.com/patient_template.xlsx" style="color: blue"-->
-<!--                                           download="template">下载导入模板</a></span>-->
+      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新  <a href="https://kuyi.shengws.com/patient_template.xlsx" style="color: blue" download="template">下载导入模板</a></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
       title="提示"
       :visible.sync="dialysisVisible"
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
 
-      
+
 
       <div style="display:flex;align-items:center">
         <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
           class="filter-item"
           type="primary"
           size="small"
-        >下载错误日志
+        >下载日志
         </el-button>
 
         <el-button
                   }
 
                   if (results[i]['*患者来源'] === undefined) {
-                    obj['source'] = '0'
+                    obj['source'] = '3'
 
                   } else {
                     if (key == '*患者来源') {
                   }
 
                   if (results[i]['*治疗状态'] === undefined) {
-                    obj['lapseto'] = '0'
+                    obj['lapseto'] = '3'
 
                   } else {
                     if (key == '*治疗状态') {
 
                   if (results[i]['*传染病'] === undefined) {
                     let contagions = []
-                    obj['is_infectious'] = '0'
+                    obj['is_infectious'] = '3'
                     obj['contagions'] = contagions
 
                   } else {

src/xt_pages/workforce/appointment.vue

             class="filter-item"
             type="primary"
             size="small"
-          >下载错误日志
+          >下载日志
           </el-button>
 
           <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>

src/xt_pages/workforce/template.vue

           class="filter-item"
           type="primary"
           size="small"
-        >下载错误日志
+        >下载日志
         </el-button>
 
         <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->