diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
index 9229d8a0..296c83ab 100644
--- a/src/api/collect/collectOrder.js
+++ b/src/api/collect/collectOrder.js
@@ -26,3 +26,33 @@ export function deleteByOrder(query) {
   });
 }
 
+
+/**
+ * 手动扫码明细
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function manualCodeDetail(query) {
+  return axios({
+    url: "/udiwms/ioSplit/collect/manual/code/list",
+    method: "get",
+    params: query
+  });
+}
+
+/**
+ * 自动扫码明细
+ * @param query
+ * @returns {AxiosPromise}
+ */
+export function autoCodeDetail(query) {
+  return axios({
+    url: "/udiwms/ioSplit/collect/auto/order/filter",
+    method: "get",
+    params: query
+  });
+}
+
+
+
+
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 3f8a7db3..64782f6a 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -2643,7 +2643,6 @@ export default {
     selectUnBindHospProduct,
   },
   created() {
-    // debugger
     // if (this.isChoose != null)
     //   this.isSelect = this.isChoose;
     this.vueRouteSource = this.$route.query.vueRouteSource;
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 7f8e246d..d35a6951 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -170,7 +170,7 @@
       </el-card>
 
       <el-tabs type="border-card" style="margin: 15px">
-        <el-tab-pane label="手动扫码">
+        <el-tab-pane label="扫码详情">
           <PannelOrderBiz
             v-if="panelALive"
             :dealStatus="2"
@@ -179,14 +179,15 @@
 
         </el-tab-pane>
 
-        <el-tab-pane label="自动赋码明细">
+        <el-tab-pane label="扫码明细">
           <prescribeCodePanel
             v-if="panelALive"
+            :fifoSplit="3"
             :prescribeData="curRow"
           ></prescribeCodePanel>
         </el-tab-pane>
 
-        <el-tab-pane label="拆零赋码明细">
+        <el-tab-pane label="拆零明细">
           <prescribeCodePanel
             v-if="panelALive"
             :prescribeData="curRow"
@@ -194,7 +195,7 @@
           ></prescribeCodePanel>
         </el-tab-pane>
 
-        <el-tab-pane label="整取赋码明细">
+        <el-tab-pane label="整取明细">
           <prescribeCodePanel
             v-if="panelALive"
             :prescribeData="curRow"
@@ -432,13 +433,15 @@ export default {
         return;
       }
       let tagQuery = {
-        prescribeNum: this.formData.billNo,
+        billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
       };
       tagCode(tagQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
           this.formData.tagStatus = 2;
+        } else {
+          this.$message.error(res.message)
         }
       }).catch(() => {
         this.loading = false
@@ -501,7 +504,7 @@ export default {
     },
 
     printCodeResult(data, isSuccess) {
-      const resultParts = ["扫码解析结果：" + data.code];
+      const resultParts = ["追溯码：" + data.code+"\r\n"];
 
       if (data.udi) {
         resultParts.push("层级标识: " + data.udi);
diff --git a/src/views/collect/IoSplitFinishCode.vue b/src/views/collect/IoSplitFinishCode.vue
index 90588b29..8b1b3eac 100644
--- a/src/views/collect/IoSplitFinishCode.vue
+++ b/src/views/collect/IoSplitFinishCode.vue
@@ -350,7 +350,7 @@
         </el-form>
 
         <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
-                  row-key="id"
+                  row-key="id" :row-style="{height:'32px'}"
         >
           <template v-for="(item, index) in tableHeader2">
             <el-table-column
@@ -559,7 +559,7 @@
         </el-form>
 
         <el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
-                  row-key="id"
+                  row-key="id" :row-style="{height:'32px'}"
         >
           <template v-for="(item, index) in tableHeader4">
             <el-table-column
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index 3ab316e7..dbe13c62 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -212,6 +212,7 @@
       <el-tab-pane label="扫码明细">
         <prescribeCodePanel
           v-if="panelALive"
+          :fifoSplit="3"
           :prescribeData="curRow"
         ></prescribeCodePanel>
       </el-tab-pane>
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index b29651c0..4e56c356 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -210,6 +210,7 @@
       <el-tab-pane label="扫码明细">
         <prescribeCodePanel
           v-if="panelALive"
+          :fifoSplit="3"
           :prescribeData="curRow"
         ></prescribeCodePanel>
       </el-tab-pane>
diff --git a/src/views/collect/PanelOrderTagCode.vue b/src/views/collect/PanelOrderTagCode.vue
index fee90740..fc88ab0f 100644
--- a/src/views/collect/PanelOrderTagCode.vue
+++ b/src/views/collect/PanelOrderTagCode.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table v-loading="codeLoading" :data="codeDetailList" style="width: 100%" border>
+    <el-table v-loading="codeLoading" :data="codeDetailList" style="width: 100%" :row-style="{height:'32px'}" border>
       <template v-for="(item, index) in tableHeader2">
         <el-table-column
           v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -126,7 +126,7 @@
 <script>
 import {convertDate} from "@/utils/date";
 import {executeFuc, getHead} from "@/utils/customConfig";
-import {materialPrescribePage} from "@/api/inout/splitCode";
+import {autoCodeDetail, manualCodeDetail} from "@/api/collect/collectOrder";
 
 export default {
 
@@ -140,7 +140,7 @@ export default {
       default: null,
       required: true
     },
-    //上货方式：1:拆零上货；2:整取上货;
+    //上货方式：1:拆零上货；2:整取上货;3：手动扫码查询
     fifoSplit: {
       type: Object,
       default: null,
@@ -187,31 +187,47 @@ export default {
         this.query.sort = 'asc'
       }
       this.query.orderBy = column.prop;
-      this.getList();
+      this.getList(this);
     },
     ///界面配置相关------------end
 
     getList(_this) {
-      if (this.prescribeData == null)
+      if (_this.prescribeData == null)
         return
-      if (this.prescribeData != null) {
+      if (_this.prescribeData != null) {
         _this.codeQuery.page = 1
-        _this.codeQuery.prescribeNum = this.prescribeData.code
+        _this.codeQuery.orderIdFk = this.prescribeData.billNo
       }
       _this.codeLoading = true;
-      _this.codeQuery.fifoSplit = this.fifoSplit
-      materialPrescribePage(_this.codeQuery).then(res => {
-        _this.codeLoading = false
-        if (res.code != 20000) {
-          _this.$message.error(res.message)
-          return
-        }
-        _this.codeDetailList = res.data.list
-        _this.codeLoading = false
-      }).catch(() => {
-        _this.codeLoading = false
-        _this.$message.error("数据加载失败")
-      })
+      if (_this.fifoSplit == 3) {
+        manualCodeDetail(_this.codeQuery).then(res => {
+          _this.codeLoading = false
+          if (res.code != 20000) {
+            _this.$message.error(res.message)
+            return
+          }
+          _this.codeDetailList = res.data.list
+          _this.codeLoading = false
+        }).catch(() => {
+          _this.codeLoading = false
+          _this.$message.error("数据加载失败")
+        })
+      } else {
+        _this.codeQuery.fifoSplit = this.fifoSplit
+        autoCodeDetail(_this.codeQuery).then(res => {
+          _this.codeLoading = false
+          if (res.code != 20000) {
+            _this.$message.error(res.message)
+            return
+          }
+          _this.codeDetailList = res.data.list
+          _this.codeLoading = false
+        }).catch(() => {
+          _this.codeLoading = false
+          _this.$message.error("数据加载失败")
+        })
+      }
+
     },
     codeHandleCurrentChange(val) {
       this.filterQuery.page = val.page;
@@ -227,7 +243,7 @@ export default {
       this.tableHeader2 = re.data.tableList;
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
-      this.getList();
+      this.getList(this);
     });
   }