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

@@ -999,7 +999,7 @@
           <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>
+            <span v-if="advice.type == 3">{{ advice.good_info.good_name }} &nbsp;&nbsp;{{advice.count}}{{advice.good_info.packing_unit}}</span>
           </td>
           <td>
             <span v-if="setAdminUserES(advice.doctor) == ''">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -4258,11 +4258,11 @@
     .el-loading-spinner .el-loading-text{
       font-size: 30px;
     }
-    .outpatientChargesManagement{
-      .el-loading-mask{
-        z-index: 5000;
-      }
-    }
+    // .outpatientChargesManagement{
+    //   .el-loading-mask{
+    //     z-index: 5000;
+    //   }
+    // }
     
 </style>