Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/inoutDrug/PanelCreateOrderCodesDrug.vue

@@ -45,18 +45,6 @@
         width="140"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="制剂单位"
-        prop="prepnUnit"
-        width="140"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="价格"
-        prop="price"
-        width="120"
-        show-overflow-tooltip
-      ></el-table-column>
       <el-table-column
         label="扫码数量"
         prop="count"
@@ -69,6 +57,12 @@
         width="80"
         show-overflow-tooltip
       ></el-table-column>
+<!--      <el-table-column-->
+<!--        label="制剂单位"-->
+<!--        prop="prepnUnit"-->
+<!--        width="140"-->
+<!--        show-overflow-tooltip-->
+<!--      ></el-table-column>-->
       <el-table-column
         label="生产日期"
         prop="produceDate"
@@ -88,6 +82,13 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="价格"
+        prop="price"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+
       <!--      <el-table-column-->
       <!--        label="供应商"-->
       <!--        prop="supName"-->

src/views/inoutDrug/PanelCreateOrderDetailDrug.vue

@@ -14,7 +14,8 @@
       <!--<el-table-column label="规格型号" width="140" prop="spec" show-overflow-tooltip></el-table-column>-->
       <el-table-column label="包装规格" width="140" prop="bzgg" show-overflow-tooltip></el-table-column>
       <el-table-column label="制剂规格" width="140" prop="prepnSpec" show-overflow-tooltip></el-table-column>
-      <el-table-column label="制剂单位" width="140" prop="prepnUnit" show-overflow-tooltip></el-table-column>
+      <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
+      <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
       <el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column>
       <el-table-column label="生产日期" width="120" prop="productDate" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -27,8 +28,8 @@
           <span>{{ convertDateFun(scope.row.expireDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
+
-      <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
+<!--      <el-table-column label="制剂单位" width="140" prop="prepnUnit" show-overflow-tooltip></el-table-column>-->
       <!--      <el-table-column width="120" label="价格"-->
       <!--                       v-if="curAction.mainAction=='WareHouseIn' && curAction.corpType==2">-->
       <!--        <template slot-scope="scope">-->