see999 3 年前
父节点
当前提交
393f26bc8a

+ 32 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue 查看文件

985
           </td>
985
           </td>
986
           
986
           
987
           
987
           
988
+          <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
989
+          <td>
990
+            <span v-if="setAdminUserES(advice.execution_staff) == ''">
991
+              {{ getAdminUser(advice.execution_staff) }}
992
+            </span>
993
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
994
+              <img style="height:38px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
995
+            </span>
996
+          </td>
997
+        </tr>
998
+        <tr v-for="(advice, advice_index) in projects" :key="advice_index + 'no'">
999
+          <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
1000
+          <td class="parent" style="text-align:left;padding-left:10px;">
1001
+            <span v-if="advice.type == 2">{{ advice.project.project_name }} &nbsp;&nbsp;{{advice.count}}{{advice.unit}}</span>
1002
+            <span v-if="advice.type == 3">{{ advice.good_info.good_name }} &nbsp;&nbsp;{{advice.count}}{{advice.unit}}</span>
1003
+          </td>
1004
+          <td>
1005
+            <span v-if="setAdminUserES(advice.doctor) == ''">
1006
+              {{ getAdminUser(advice.doctor) }}
1007
+            </span>
1008
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
1009
+              <img style="height:38px;" :src="setAdminUserES(advice.doctor)" alt srcset />
1010
+            </span>
1011
+          </td>
1012
+          
1013
+          
988
           <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
1014
           <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
989
           <td>
1015
           <td>
990
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
1016
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
1122
         gaijiliang_unit: ''
1148
         gaijiliang_unit: ''
1123
       },
1149
       },
1124
       org_id:0,
1150
       org_id:0,
1125
-      tableAdvice:[]
1151
+      tableAdvice:[],
1152
+      projects:[]
1126
     }
1153
     }
1127
   },
1154
   },
1128
   methods: {
1155
   methods: {
1409
             }
1436
             }
1410
           }
1437
           }
1411
           this.jilurow = this.monitors.length + 1
1438
           this.jilurow = this.monitors.length + 1
1412
-
1439
+          this.projects = response.data.data.projects
1413
           var doctorAdevieInfo = response.data.data.advices
1440
           var doctorAdevieInfo = response.data.data.advices
1414
           var tableAdvice = doctorAdevieInfo
1441
           var tableAdvice = doctorAdevieInfo
1415
-          if (tableAdvice.length < 30) {
1416
-            var nl = 30 - tableAdvice.length
1442
+          if (tableAdvice.length + this.projects.length < 30) {
1443
+            var nl = 30 - (tableAdvice.length + this.projects.length)
1417
             for (let index = 0; index < nl; index++) {
1444
             for (let index = 0; index < nl; index++) {
1418
-              tableAdvice.push([])
1445
+              this.projects.push([])
1419
             }
1446
             }
1420
           }
1447
           }
1421
           this.tableAdvice = tableAdvice
1448
           this.tableAdvice = tableAdvice

+ 13 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 查看文件

2
     <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
2
     <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
3
     element-loading-text="拼命加载中"
3
     element-loading-text="拼命加载中"
4
     element-loading-spinner="el-icon-loading"
4
     element-loading-spinner="el-icon-loading"
5
-    element-loading-background="rgba(0, 0, 0, 0.8)">
5
+    element-loading-background="rgba(0, 0, 0, 0.4)">
6
         <div class="position">
6
         <div class="position">
7
             <bread-crumb :crumbs='crumbs'></bread-crumb>
7
             <bread-crumb :crumbs='crumbs'></bread-crumb>
8
         </div>
8
         </div>
4252
     }
4252
     }
4253
 
4253
 
4254
     }
4254
     }
4255
+    .el-icon-loading{
4256
+      font-size: 30px;
4257
+    }
4258
+    .el-loading-spinner .el-loading-text{
4259
+      font-size: 30px;
4260
+    }
4261
+    .outpatientChargesManagement{
4262
+      .el-loading-mask{
4263
+        z-index: 5000;
4264
+      }
4265
+    }
4266
+    
4255
 </style>
4267
 </style>
4256
 
4268