XMLWAN 5 years ago
parent
commit
8fe4d2b5c6

+ 13 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue View File

@@ -28,6 +28,7 @@
28 28
             </td>
29 29
           </tr>
30 30
           <tr>
31
+<<<<<<< HEAD
31 32
             <td style="text-align:left;">
32 33
               <span style="display:inline-block;margin-left:15px;"
33 34
                 >上机前病情</span
@@ -55,6 +56,18 @@
55 56
               </div>
56 57
             </td>
57 58
           </tr>
59
+=======
60
+            <td style="text-align:left;"><span style="display:inline-block;margin-left:15px;">上机前病情</span>:<div style="display:inline-block;">
61
+                    <label-box :isChecked='receiverTreatmentAccess.way==1?true:false' showValue='步行'></label-box>
62
+                    &nbsp;
63
+                    <label-box :isChecked='receiverTreatmentAccess.way==2?true:false' showValue='扶行'></label-box>
64
+                    &nbsp;
65
+                    <label-box :isChecked='receiverTreatmentAccess.way==3?true:false' showValue='轮椅'></label-box>
66
+                    &nbsp;
67
+                    <label-box :isChecked='receiverTreatmentAccess.way==4?true:false' showValue='平车'></label-box>
68
+                  </div></td>
69
+          </tr>  
70
+>>>>>>> 62fe3df8139e458f8ec02667f4fdba291e5fb132
58 71
         </tbody>
59 72
       </table>
60 73
       <table class="print-table" style="margin-top: 10px;" border="2">

+ 8 - 7
src/xt_pages/upload/data/DataCity.vue View File

@@ -63,13 +63,9 @@
63 63
     </div>
64 64
     <div v-else>
65 65
       <div class="cell clearfix">
66
-        <el-row :gutter="20">
67
-          <el-col :span="24" :offset="6">
68
-            <div>
69
-              质控平台上报配置未完成!请在"质控上报>质控上报配置"中完成集成配置内容,再重新打开此功能。
70
-            </div>
71
-          </el-col>
72
-        </el-row>
66
+        <div class="cellTitle">
67
+          质控平台上报配置未完成!请在"质控上报>质控上报配置"中完成集成配置内容,再重新打开此功能。
68
+        </div>
73 69
       </div>
74 70
     </div>
75 71
   </div>
@@ -134,6 +130,11 @@ export default {
134 130
 .marginBottom2 {
135 131
   margin-bottom: 20px !important;
136 132
 }
133
+.cellTitle {
134
+  width: 100%;
135
+  text-align: center;
136
+  margin-top: 50px;
137
+}
137 138
 </style>
138 139
 
139 140
 <style>

+ 8 - 7
src/xt_pages/upload/data/DataCountry.vue View File

@@ -63,13 +63,9 @@
63 63
     </div>
64 64
     <div v-else>
65 65
       <div class="cell clearfix">
66
-        <el-row :gutter="20">
67
-          <el-col :span="24" :offset="6">
68
-            <div>
69
-              质控平台上报配置未完成!请在"质控上报>质控上报配置"中完成集成配置内容,再重新打开此功能。
70
-            </div>
71
-          </el-col>
72
-        </el-row>
66
+        <div class="cellTitle">
67
+          质控平台上报配置未完成!请在"质控上报>质控上报配置"中完成集成配置内容,再重新打开此功能。
68
+        </div>
73 69
       </div>
74 70
     </div>
75 71
   </div>
@@ -134,6 +130,11 @@ export default {
134 130
 .marginBottom2 {
135 131
   margin-bottom: 20px !important;
136 132
 }
133
+.cellTitle {
134
+  width: 100%;
135
+  text-align: center;
136
+  margin-top: 50px;
137
+}
137 138
 </style>
138 139
 
139 140
 <style>

+ 8 - 7
src/xt_pages/upload/data/DataProvince.vue View File

@@ -64,13 +64,9 @@
64 64
     </div>
65 65
     <div v-else>
66 66
       <div class="cell clearfix">
67
-        <el-row :gutter="20">
68
-          <el-col :span="24" :offset="6">
69
-            <div>
70
-              质控平台上报配置未完成!请在"质控上报>质控上报配置"中完成集成配置内容,再重新打开此功能。
71
-            </div>
72
-          </el-col>
73
-        </el-row>
67
+        <div class="cellTitle">
68
+          质控平台上报配置未完成!请在"质控上报>质控上报配置"中完成集成配置内容,再重新打开此功能。
69
+        </div>
74 70
       </div>
75 71
     </div>
76 72
   </div>
@@ -135,6 +131,11 @@ export default {
135 131
 .marginBottom2 {
136 132
   margin-bottom: 20px !important;
137 133
 }
134
+.cellTitle {
135
+  width: 100%;
136
+  text-align: center;
137
+  margin-top: 50px;
138
+}
138 139
 </style>
139 140
 
140 141
 <style>

File diff suppressed because it is too large
+ 756 - 478
src/xt_pages/upload/fast/One.vue


+ 1 - 1
src/xt_pages/upload/fast/Two.vue View File

@@ -1153,7 +1153,7 @@
1153 1153
     }
1154 1154
     .copy {
1155 1155
       float: left;
1156
-      margin-left: 20px;
1156
+      margin-left: 20px !important;
1157 1157
       margin-top: 6px;
1158 1158
     }
1159 1159
     .copy1 {

File diff suppressed because it is too large
+ 1132 - 954
src/xt_pages/user/components/PatientForm.vue