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

src/xt_pages/user/patients.vue

@@ -1,5 +1,22 @@
 <template>
   <div class="main-contain">
+
+    <el-dialog
+      title="提示"
+      :visible.sync="exportVisible"
+      width="40%"
+    >
+
+      <div>
+        您提交的患者名单已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
     <el-dialog
       title="提示"
       :visible.sync="dialogVisible"
@@ -62,8 +79,8 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue" @click="generateTxt(item)">点击</span>
-        <span>查看详情</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
         <br/>
         <br/>
       </div>
@@ -81,7 +98,7 @@
 
 
       <div style="display:flex;align-items:center">
-        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
+        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload" v-if="isShow"></upload-excel>
         <el-link target="_blank" href="https://kuyi.shengws.com/patient_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -576,6 +593,7 @@
         phoneVisible:false,
         idCardNoVisible:false,
         wechatbindimg: '',
+        isShow:true,
         active: true,
         schedulType: 0,
         lapsetoForm: {
@@ -708,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()
 
       },
@@ -1058,14 +1076,29 @@
               }
 
 
+
+              // this.exportVisible = true
+              this.$alert('您提交的患者名单已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
+                confirmButtonText: '确定',
+                callback: action => {
+
+                }
+              });
+
+              this.isShow = false
               let params = {
                 'patients': this.export_date
               }
               postExportPatients(params).then(
                 response => {
                   if (response.data.state === 1) {
+
                     this.getList()
+                    this.isShow = true
+
                   } else {
+                    this.isShow = true
+
                     this.$message.error(response.data.msg)
                   }
                 }