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/dialysisPrintOrderTwelve.vue

@@ -1061,10 +1061,18 @@
             核对护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+              <span v-if="doctor_advices[0].execution_staff != check.modifier">
+                <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                </span>
+                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
+              </span>
+              <span v-else>
+                <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                {{ getAdminUser(check == null ? 0 : check.creater) }}
+                </span>
+                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
               </span>
-              <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
             </span>
             护士签名
             <span style="display: inline-block;width:100px;text-align: left;">

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -16,8 +16,8 @@
           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="250">药品名称</td>
-              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="230">药品名称</td>
+              <td style="line-height: 50px" width="230">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">出货数量</td>
               <td style="line-height:50px" width="80">出库价格</td>