Просмотр исходного кода

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

See999 4 лет назад
Родитель
Сommit
6f1851af61

+ 0 - 1
src/xt_pages/components/UploadExcel/index.vue Просмотреть файл

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

+ 3 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue Просмотреть файл

@@ -25,7 +25,9 @@
25 25
           <td style="text-align:center;">
26 26
             年龄:
27 27
             <span style="display:inline-block;margin-left:10px;">
28
-              {{getAge(patientInfo)}}
28
+              {{
29
+              getAge(patientInfo)
30
+              }}
29 31
             </span>
30 32
           </td>
31 33
           <td style="text-align:center;">

+ 6 - 8
src/xt_pages/user/patients.vue Просмотреть файл

@@ -5,15 +5,13 @@
5 5
       :visible.sync="dialogVisible"
6 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 9
       <span slot="footer" class="dialog-footer">
11 10
     <el-button @click="dialogVisible = false">取 消</el-button>
12 11
     <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
13 12
   </span>
14 13
     </el-dialog>
15 14
 
16
-
17 15
     <el-dialog
18 16
       title="提示"
19 17
       :visible.sync="dialysisVisible"
@@ -80,7 +78,7 @@
80 78
     <div class="position">
81 79
       <bread-crumb :crumbs="crumbs"></bread-crumb>
82 80
 
83
-      
81
+
84 82
 
85 83
       <div style="display:flex;align-items:center">
86 84
         <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
@@ -101,7 +99,7 @@
101 99
           class="filter-item"
102 100
           type="primary"
103 101
           size="small"
104
-        >下载错误日志
102
+        >下载日志
105 103
         </el-button>
106 104
 
107 105
         <el-button
@@ -846,7 +844,7 @@
846 844
                   }
847 845
 
848 846
                   if (results[i]['*患者来源'] === undefined) {
849
-                    obj['source'] = '0'
847
+                    obj['source'] = '3'
850 848
 
851 849
                   } else {
852 850
                     if (key == '*患者来源') {
@@ -861,7 +859,7 @@
861 859
                   }
862 860
 
863 861
                   if (results[i]['*治疗状态'] === undefined) {
864
-                    obj['lapseto'] = '0'
862
+                    obj['lapseto'] = '3'
865 863
 
866 864
                   } else {
867 865
                     if (key == '*治疗状态') {
@@ -877,7 +875,7 @@
877 875
 
878 876
                   if (results[i]['*传染病'] === undefined) {
879 877
                     let contagions = []
880
-                    obj['is_infectious'] = '0'
878
+                    obj['is_infectious'] = '3'
881 879
                     obj['contagions'] = contagions
882 880
 
883 881
                   } else {

+ 1 - 1
src/xt_pages/workforce/appointment.vue Просмотреть файл

@@ -61,7 +61,7 @@
61 61
             class="filter-item"
62 62
             type="primary"
63 63
             size="small"
64
-          >下载错误日志
64
+          >下载日志
65 65
           </el-button>
66 66
 
67 67
           <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>

+ 1 - 1
src/xt_pages/workforce/template.vue Просмотреть файл

@@ -76,7 +76,7 @@
76 76
           class="filter-item"
77 77
           type="primary"
78 78
           size="small"
79
-        >下载错误日志
79
+        >下载日志
80 80
         </el-button>
81 81
 
82 82
         <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->