Quellcode durchsuchen

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

csx vor 4 Jahren
Ursprung
Commit
3eea6e8531
2 geänderte Dateien mit 5 neuen und 8 gelöschten Zeilen
  1. 0 1
      src/xt_pages/components/UploadExcel/index.vue
  2. 5 7
      src/xt_pages/user/patients.vue

+ 0 - 1
src/xt_pages/components/UploadExcel/index.vue Datei anzeigen

25
     },
25
     },
26
     methods: {
26
     methods: {
27
       generateDate({ header, results }) {
27
       generateDate({ header, results }) {
28
-        console.log("11111111")
29
         this.excelData.header = header
28
         this.excelData.header = header
30
         this.excelData.results = results
29
         this.excelData.results = results
31
         this.onSuccess && this.onSuccess(this.excelData)
30
         this.onSuccess && this.onSuccess(this.excelData)

+ 5 - 7
src/xt_pages/user/patients.vue Datei anzeigen

5
       :visible.sync="dialogVisible"
5
       :visible.sync="dialogVisible"
6
       width="40%"
6
       width="40%"
7
     >
7
     >
8
-<!--      <span>您提交的文档不是系统标准导入模板,请检查您的文档或重新 <a href="https://kuyi.shengws.com/patient_template.xlsx" style="color: blue"-->
9
-<!--                                           download="template">下载导入模板</a></span>-->
8
+      <span>患者导入,提交非标准模版 <a href="https://kuyi.shengws.com/patient_template.xlsx" style="color: blue" download="template">下载导入模板</a></span>
10
       <span slot="footer" class="dialog-footer">
9
       <span slot="footer" class="dialog-footer">
11
     <el-button @click="dialogVisible = false">取 消</el-button>
10
     <el-button @click="dialogVisible = false">取 消</el-button>
12
     <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
11
     <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
13
   </span>
12
   </span>
14
     </el-dialog>
13
     </el-dialog>
15
 
14
 
16
-
17
     <el-dialog
15
     <el-dialog
18
       title="提示"
16
       title="提示"
19
       :visible.sync="dialysisVisible"
17
       :visible.sync="dialysisVisible"
80
     <div class="position">
78
     <div class="position">
81
       <bread-crumb :crumbs="crumbs"></bread-crumb>
79
       <bread-crumb :crumbs="crumbs"></bread-crumb>
82
 
80
 
83
-      
81
+
84
 
82
 
85
       <div style="display:flex;align-items:center">
83
       <div style="display:flex;align-items:center">
86
         <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
84
         <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
846
                   }
844
                   }
847
 
845
 
848
                   if (results[i]['*患者来源'] === undefined) {
846
                   if (results[i]['*患者来源'] === undefined) {
849
-                    obj['source'] = '0'
847
+                    obj['source'] = '3'
850
 
848
 
851
                   } else {
849
                   } else {
852
                     if (key == '*患者来源') {
850
                     if (key == '*患者来源') {
861
                   }
859
                   }
862
 
860
 
863
                   if (results[i]['*治疗状态'] === undefined) {
861
                   if (results[i]['*治疗状态'] === undefined) {
864
-                    obj['lapseto'] = '0'
862
+                    obj['lapseto'] = '3'
865
 
863
 
866
                   } else {
864
                   } else {
867
                     if (key == '*治疗状态') {
865
                     if (key == '*治疗状态') {
877
 
875
 
878
                   if (results[i]['*传染病'] === undefined) {
876
                   if (results[i]['*传染病'] === undefined) {
879
                     let contagions = []
877
                     let contagions = []
880
-                    obj['is_infectious'] = '0'
878
+                    obj['is_infectious'] = '3'
881
                     obj['contagions'] = contagions
879
                     obj['contagions'] = contagions
882
 
880
 
883
                   } else {
881
                   } else {