Home Explore Help
Register Sign In
seimin
/
zy-pc
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

拉取最新代码

maotao 8 months ago
parent
6ddabf8e3f
commit
15ea266f67
2 changed files with 96 additions and 48 deletions
Split View Show Diff Stats
  1. 48 24
      src/app/views/admin-office-prescription/admin-office-prescription.component.html
  2. 48 24
      src/app/views/dispensing-batch/dispensing-batch.component.html

+ 48 - 24
src/app/views/admin-office-prescription/admin-office-prescription.component.html
View File 

@@ -153,57 +153,79 @@
153 153 
 			</div>
154 154 
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
155 155 
 				<div class="thead" style="display: flex;">
156 
-					<div style="text-align: center;width: 30%;height: 23px;
157 
-					line-height: 23px;
156 
+					<div style="width: 40%;display: flex;
157 
+					align-items: center;
158 
+					justify-content: center;
159 
+					flex-wrap: wrap;
158 160 
 					border-right: 1px solid #e7e7e7;
159 161 
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
160 162
161 
-					<div style="text-align: center;width: 20%;height: 23px;
162 
-					line-height: 23px;
163 
+					<div style="width: 20%;display: flex;
164 
+					align-items: center;
165 
+					justify-content: center;
166 
+					flex-wrap: wrap;
163 167 
 					border-right: 1px solid #e7e7e7;
164 168 
 					border-bottom: 1px solid #e7e7e7;">规格</div>
165 169
166 
-					<div style="text-align: center;width: 10%;height: 23px;
167 
-					line-height: 23px;
170 
+					<div style="width: 10%;display: flex;
171 
+					align-items: center;
172 
+					justify-content: center;
173 
+					flex-wrap: wrap;
168 174 
 					border-right: 1px solid #e7e7e7;
169 175 
 					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
170 176
171 
-					<div style="text-align: center;width: 10%;height: 23px;
172 
-					line-height: 23px;
177 
+					<div style="width: 10%;display: flex;
178 
+					align-items: center;
179 
+					justify-content: center;
180 
+					flex-wrap: wrap;
173 181 
 					border-right: 1px solid #e7e7e7;
174 182 
 					border-bottom: 1px solid #e7e7e7;">临时增发</div>
175 183
176 
-					<div style="text-align: center;width: 10%;height: 23px;
177 
-					line-height: 23px;
184 
+					<div style="width: 10%;display: flex;
185 
+					align-items: center;
186 
+					justify-content: center;
187 
+					flex-wrap: wrap;
178 188 
 					border-right: 1px solid #e7e7e7;
179 189 
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
180 190
181 
-					<div style="text-align: center;width: 20%;height: 23px;
182 
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
191 
+					<div style="width: 20%;display: flex;
192 
+					align-items: center;
193 
+					justify-content: center;
194 
+					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">取药药房</div>
183 195 
 				</div>
184 196 
 				<div *ngFor="let data of codes" style="display: flex;">
185 
-					<div style="text-align: center;width: 30%;height: 23px;
186 
-					line-height: 23px;
197 
+					<div style="width: 40%;display: flex;
198 
+					align-items: center;
199 
+					justify-content: center;
200 
+					flex-wrap: wrap;
187 201 
 					border-right: 1px solid #e7e7e7;
188 202 
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
189 203
190 
-					<div style="text-align: center;width: 20%;height: 23px;
191 
-					line-height: 23px;
204 
+					<div style="width: 20%;display: flex;
205 
+					align-items: center;
206 
+					justify-content: center;
207 
+					flex-wrap: wrap;
192 208 
 					border-right: 1px solid #e7e7e7;
193 209 
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
194 210
195 
-					<div style="text-align: center;width: 10%;height: 23px;
196 
-					line-height: 23px;
211 
+					<div style="width: 10%;display: flex;
212 
+					align-items: center;
213 
+					justify-content: center;
214 
+					flex-wrap: wrap;
197 215 
 					border-right: 1px solid #e7e7e7;
198 216 
 					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
199 217
200 
-					<div style="text-align: center;width: 10%;height: 23px;
201 
-					line-height: 23px;
218 
+					<div style="width: 10%;display: flex;
219 
+					align-items: center;
220 
+					justify-content: center;
221 
+					flex-wrap: wrap;
202 222 
 					border-right: 1px solid #e7e7e7;
203 223 
 					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
204 224
205 
-					<div style="text-align: center;width: 10%;height: 23px;
206 
-					line-height: 23px;
225 
+					<div style="width: 10%;display: flex;
226 
+					align-items: center;
227 
+					justify-content: center;
228 
+					flex-wrap: wrap;
207 229 
 					border-right: 1px solid #e7e7e7;
208 230 
 					border-bottom: 1px solid #e7e7e7;">
209 231 
 						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
 
@@ -212,8 +234,10 @@
212 234 
 						</span>
213 235 
 					</div>
214 236
215 
-					<div style="text-align: center;width: 20%;height: 23px;
216 
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
237 
+					<div style="width: 20%;display: flex;
238 
+					align-items: center;
239 
+					justify-content: center;
240 
+					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
217 241 
 				</div>
218 242 
 			</div>
219 243 
 		</div>

+ 48 - 24
src/app/views/dispensing-batch/dispensing-batch.component.html
View File 

@@ -145,57 +145,79 @@
145 145 
 			</div>
146 146 
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
147 147 
 				<div class="thead" style="display: flex;">
148 
-					<div style="text-align: center;width: 30%;height: 23px;
149 
-					line-height: 23px;
148 
+					<div style="width: 40%;display: flex;
149 
+					align-items: center;
150 
+					justify-content: center;
151 
+					flex-wrap: wrap;
150 152 
 					border-right: 1px solid #e7e7e7;
151 153 
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
152 154
153 
-					<div style="text-align: center;width: 25%;height: 23px;
154 
-					line-height: 23px;
155 
+					<div style="width: 20%;display: flex;
156 
+					align-items: center;
157 
+					justify-content: center;
158 
+					flex-wrap: wrap;
155 159 
 					border-right: 1px solid #e7e7e7;
156 160 
 					border-bottom: 1px solid #e7e7e7;">规格</div>
157 161
158 
-					<div style="text-align: center;width: 10%;height: 23px;
159 
-					line-height: 23px;
162 
+					<div style="width: 10%;display: flex;
163 
+					align-items: center;
164 
+					justify-content: center;
165 
+					flex-wrap: wrap;
160 166 
 					border-right: 1px solid #e7e7e7;
161 167 
 					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
162 168
163 
-					<div style="text-align: center;width: 10%;height: 23px;
164 
-					line-height: 23px;
169 
+					<div style="width: 10%;display: flex;
170 
+					align-items: center;
171 
+					justify-content: center;
172 
+					flex-wrap: wrap;
165 173 
 					border-right: 1px solid #e7e7e7;
166 174 
 					border-bottom: 1px solid #e7e7e7;">临时增发</div>
167 175
168 
-					<div style="text-align: center;width: 10%;height: 23px;
169 
-					line-height: 23px;
176 
+					<div style="width: 10%;display: flex;
177 
+					align-items: center;
178 
+					justify-content: center;
179 
+					flex-wrap: wrap;
170 180 
 					border-right: 1px solid #e7e7e7;
171 181 
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
172 182
173 
-					<div style="text-align: center;width: 25%;height: 23px;
174 
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
183 
+					<div style="width: 20%;display: flex;
184 
+					align-items: center;
185 
+					justify-content: center;
186 
+					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">取药药房</div>
175 187 
 				</div>
176 188 
 				<div *ngFor="let data of item.drugsConfigureDTOS" style="display: flex;">
177 
-					<div style="text-align: center;width: 30%;height: 23px;
178 
-					line-height: 23px;
189 
+					<div style="width: 40%;display: flex;
190 
+					align-items: center;
191 
+					justify-content: center;
192 
+					flex-wrap: wrap;
179 193 
 					border-right: 1px solid #e7e7e7;
180 194 
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
181 195
182 
-					<div style="text-align: center;width: 25%;height: 23px;
183 
-					line-height: 23px;
196 
+					<div style="width: 20%;display: flex;
197 
+					align-items: center;
198 
+					justify-content: center;
199 
+					flex-wrap: wrap;
184 200 
 					border-right: 1px solid #e7e7e7;
185 201 
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
186 202
187 
-					<div style="text-align: center;width: 10%;height: 23px;
188 
-					line-height: 23px;
203 
+					<div style="width: 10%;display: flex;
204 
+					align-items: center;
205 
+					justify-content: center;
206 
+					flex-wrap: wrap;
189 207 
 					border-right: 1px solid #e7e7e7;
190 208 
 					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
191 209
192 
-					<div style="text-align: center;width: 10%;height: 23px;
193 
-					line-height: 23px;
210 
+					<div style="width: 10%;display: flex;
211 
+					align-items: center;
212 
+					justify-content: center;
213 
+					flex-wrap: wrap;
194 214 
 					border-right: 1px solid #e7e7e7;
195 215 
 					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
196 216
197 
-					<div style="text-align: center;width: 10%;height: 23px;
198 
-					line-height: 23px;
217 
+					<div style="width: 10%;display: flex;
218 
+					align-items: center;
219 
+					justify-content: center;
220 
+					flex-wrap: wrap;
199 221 
 					border-right: 1px solid #e7e7e7;
200 222 
 					border-bottom: 1px solid #e7e7e7;">
201 223 
 					<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
 
@@ -205,8 +227,10 @@
205 227 
 					</span>
206 228 
 					</div>
207 229
208 
-					<div style="text-align: center;width: 25%;height: 23px;
209 
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
230 
+					<div style="width: 20%;display: flex;
231 
+					align-items: center;
232 
+					justify-content: center;
233 
+					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
210 234 
 				</div>
211 235 
 			</div>
212 236 
 		</div>