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

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1016,8 +1016,8 @@
                       <div class="under_line" style="width: 80px">
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
 
-                        <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{ getAdminUser(prescription.prescription_doctor) }}</span>
-                        <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
+                        <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
+                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">

src/xt_pages/stock/inventoryDetails.vue

@@ -49,7 +49,7 @@
 
             <el-table-column  prop="name" label="有效日期" width="200" align="center">
                <template slot-scope="scope">
-                 {{getTime(scope.row.product_date)}}
+                 {{getTime(scope.row.expire_date)}}
                </template>
             </el-table-column>
 

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -277,6 +277,7 @@
               </span>
               </span>
             </td>
+            <td  style="text-align:center;width:170px" colspan="2"></td>
           </tr>
         </table>
      </div>