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

src/xt_pages/user/patients.vue

@@ -726,7 +726,7 @@
         }
         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()
 
       },

src/xt_pages/workforce/appointment.vue

@@ -176,7 +176,7 @@
         }
         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()
 
       },

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

@@ -16,7 +16,7 @@
       :visible.sync="msgTipVisible"
       width="40%"
     >
-      <span>如果导入成功,会将当前已有的排版模版会被全部清除,是否继续导入排版模版数据</span>
+      <span>若执行排班导入,系统将会清除当前已有排班模板数据,是否继续导入？</span>
       <span slot="footer" class="dialog-footer">
     <el-button @click="msgTipVisible = false">取 消</el-button>
     <el-button type="primary" @click="handleUpload()">确 定</el-button>

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

@@ -4,7 +4,7 @@
       :visible.sync="msgTipVisible"
       width="40%"
     >
-      <span>如果导入成功,会将当前已有的排版会被全部清除,是否继续导入排版数据</span>
+      <span>若执行排班导入,系统将会清除当前已有临时排班数据,是否继续导入？</span>
       <span slot="footer" class="dialog-footer">
     <el-button @click="msgTipVisible = false">取 消</el-button>
     <el-button type="primary" @click="handleUpload()">确 定</el-button>

src/xt_pages/workforce/template.vue

@@ -258,7 +258,7 @@
         }
         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()
 
       },