Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -985,6 +985,32 @@
           </td>
           
           
+          <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td>
+            <span v-if="setAdminUserES(advice.execution_staff) == ''">
+              {{ getAdminUser(advice.execution_staff) }}
+            </span>
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <img style="height:38px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+            </span>
+          </td>
+        </tr>
+        <tr v-for="(advice, advice_index) in projects" :key="advice_index + 'no'">
+          <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
+          <td class="parent" style="text-align:left;padding-left:10px;">
+            <span v-if="advice.type == 2">{{ advice.project.project_name }} &nbsp;&nbsp;{{advice.count}}{{advice.unit}}</span>
+            <span v-if="advice.type == 3">{{ advice.good_info.good_name }} &nbsp;&nbsp;{{advice.count}}{{advice.unit}}</span>
+          </td>
+          <td>
+            <span v-if="setAdminUserES(advice.doctor) == ''">
+              {{ getAdminUser(advice.doctor) }}
+            </span>
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <img style="height:38px;" :src="setAdminUserES(advice.doctor)" alt srcset />
+            </span>
+          </td>
+          
+          
           <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
           <td>
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
@@ -1122,7 +1148,8 @@ export default {
         gaijiliang_unit: ''
       },
       org_id:0,
-      tableAdvice:[]
+      tableAdvice:[],
+      projects:[]
     }
   },
   methods: {
@@ -1409,13 +1436,13 @@ export default {
             }
           }
           this.jilurow = this.monitors.length + 1
-
+          this.projects = response.data.data.projects
           var doctorAdevieInfo = response.data.data.advices
           var tableAdvice = doctorAdevieInfo
-          if (tableAdvice.length < 30) {
-            var nl = 30 - tableAdvice.length
+          if (tableAdvice.length + this.projects.length < 30) {
+            var nl = 30 - (tableAdvice.length + this.projects.length)
             for (let index = 0; index < nl; index++) {
-              tableAdvice.push([])
+              this.projects.push([])
             }
           }
           this.tableAdvice = tableAdvice

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2,7 +2,7 @@
     <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
+    element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
@@ -4252,5 +4252,17 @@
     }
 
     }
+    .el-icon-loading{
+      font-size: 30px;
+    }
+    .el-loading-spinner .el-loading-text{
+      font-size: 30px;
+    }
+    .outpatientChargesManagement{
+      .el-loading-mask{
+        z-index: 5000;
+      }
+    }
+    
 </style>