Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2920,20 +2920,20 @@
                           <template
                             v-if="
                               record.prescription &&
-                              record.prescription.creater
+                              record.prescription.prescription_doctor
                             "
                           >
                             <span
                               v-if="
                                 setAdminUserES(
                                   record.prescription,
-                                  'creater'
+                                  'prescription_doctor'
                                 ) == ''
                               "
                               >{{
                                 getAdminUser(
                                   record.prescription,
-                                  "creater"
+                                  "prescription_doctor"
                                 )
                               }}</span
                             >
@@ -2942,7 +2942,7 @@
                               :src="
                                 setAdminUserES(
                                   record.prescription,
-                                  'creater'
+                                  'prescription_doctor'
                                 )
                               "
                               alt=""

src/xt_pages/stock/drugs/historyDrugInvetory.vue

@@ -96,7 +96,7 @@
             </el-table-column>
             <el-table-column label="入库数量"  align="center">
               <template slot-scope="scope">
-                {{scope.row.warehousing_count}}
+                {{scope.row.warehousing_count}}{{scope.row.max_unit}}
               </template>
             </el-table-column>
             <el-table-column label="有效期"  align="center">

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -836,8 +836,8 @@ export default {
                 list[i].drug_name = list[i].XtBaseDrug.drug_name
                 list[i].specification_name = list[i].XtBaseDrug.dose +list[i].XtBaseDrug.dose_unit + "*"+list[i].XtBaseDrug.min_number +list[i].XtBaseDrug.min_unit+"/"+list[i].XtBaseDrug.max_unit
                 list[i].warehouseing_unit = list[i].max_unit
-                list[i].max_unit = list[i].XtBaseDrug.max_unit
-                list[i].min_unit = list[i].XtBaseDrug.min_unit
+                list[i].base_max_unit = list[i].XtBaseDrug.max_unit
+                list[i].base_min_unit = list[i].XtBaseDrug.min_unit
                 list[i].last_stock_max_number = ""
                 list[i].last_stock_min_number = ""
                 list[i].min_number = list[i].XtBaseDrug.min_number