diff --git a/src/api/udi/udiTrace.js b/src/api/udi/udiTrace.js
index db9ce27..64dbb2f 100644
--- a/src/api/udi/udiTrace.js
+++ b/src/api/udi/udiTrace.js
@@ -74,6 +74,16 @@ export function sourceSearch(query) {
   });
 }
 
+
+export function sceneSearch(query) {
+  return axios({
+    url: "/udi/trace/scene/search",
+    method: "get",
+    params: query
+  });
+}
+
+
 export function filterylqxzcrbarmc(query) {
   return axios({
     url: "/udi/basic/dict/filterylqxzcrbarmc",
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index 8dffcef..3ad249b 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -42,7 +42,7 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="用户账号" prop="userName"></el-table-column>
         <el-table-column label="用户名称" prop="employeeName"></el-table-column>
-        <el-table-column label="所属部门" prop="deptName"></el-table-column>
+        <el-table-column label="所属部门" prop="deptName" show-overflow-tooltip></el-table-column>
         <!--<el-table-column label="所属仓库" prop="warehouseName"></el-table-column>-->
         <el-table-column label="状态">
           <template slot-scope="scope">
diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index bf185eb..f3f9f56 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -160,7 +160,6 @@
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="记录号" prop="recordCode" width="180"></el-table-column>
             <el-table-column label="生产订单号" prop="billNo" width="220"></el-table-column>
             <el-table-column label="订单日期" prop="billDate" width="180"></el-table-column>
             <el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column>
@@ -475,7 +474,7 @@
             <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column label="社会统一信用号" prop="creditNum" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
             <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
             <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
             <el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
@@ -483,8 +482,8 @@
             <el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
             <el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
             <el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
-            <el-table-column label="上报企业" prop="companyIdFk" width="220"
-                             :formatter="formatCompanyName"></el-table-column>
+            <el-table-column label="上报企业" prop="companyName" width="220"
+            ></el-table-column>
             <!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
 
             <!--        <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>-->
@@ -820,9 +819,9 @@ export default {
       getRecordResult(query).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
-          this.listOrder = res.data.list || [];
+          this.listOrder = res.data.traceManuOrderEntities || [];
+          this.list = res.data.traceOrderEntities || [];
           this.total = res.data.total || 0;
-          console.log(this.listOrder)
         } else {
           this.$message.error(res.message);
           this.listOrder = [];
@@ -1011,7 +1010,8 @@ export default {
         this.listOrder = null,
         this.listCodeRel = null,
         clearTimeout(this.monitorOrder);
-      this.monitorOrder = ""
+      this.monitorOrder = "",
+        this.searchIng = false;
     },
     getList() {
       this.loading = true;
@@ -1049,13 +1049,6 @@ export default {
 </script>
 
 <style scoped>
-.checkitemTag {
-  float: left;
-  text-align: left;
-  margin-top: 5px;
-  width: 100%;
-}
-
 div /deep/ .el-table .warning-row {
   background: #bebebe;
 }
@@ -1064,10 +1057,6 @@ div /deep/ .el-table .success-row {
   background: #ffffff;
 }
 
-.el-card {
-  margin-right: 20px;
-  /*transition: all .5s;*/
-}
 
 .form-title {
   font-size: 16px;
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index 996195b..2738823 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -164,7 +164,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
           </el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit" size="mini"
+          <el-button type="primary" icon="el-icon-search" @click="getList" size="mini"
           >查询
           </el-button
           >
@@ -192,7 +192,6 @@
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="记录号" prop="recordCode" width="180"></el-table-column>
             <el-table-column label="生产订单号" prop="billNo" width="220"></el-table-column>
             <el-table-column label="订单日期" prop="billDate" width="180"></el-table-column>
             <el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column>
@@ -497,11 +496,10 @@
           <el-table v-loading="loading" :data="list"
                     style="width: 100%"
                     border highlight-current-row>
-            <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column label="社会统一信用号" prop="creditNum" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
             <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
             <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
             <el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
@@ -509,8 +507,8 @@
             <el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
             <el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
             <el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
-            <el-table-column label="上报企业" prop="companyIdFk" width="220"
-                             :formatter="formatCompanyName"></el-table-column>
+            <el-table-column label="上报企业" prop="companyName" width="220"
+            ></el-table-column>
             <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -723,7 +721,7 @@
 
 import {
   filterylqxzcrbarmc, filterCpmctymc, filterGgxh, filterNameCode, sourceSearch, filterCompanyName,
-  getTraceManuOrderList, getManuCodeRelList
+  getTraceManuOrderList, getManuCodeRelList, getRecordResult, sceneSearch
 } from "@/api/udi/udiTrace";
 
 
@@ -774,7 +772,8 @@ export default {
       companyNameList: [],
       companyNameDetail: null,
       formateInOutType: null,
-      formateSourceType: null
+      formateSourceType: null,
+      searchIng: false,
     }
   },
   methods: {
@@ -829,14 +828,41 @@ export default {
         this.total = 0;
       })
     },
+
+    getRecordResult() {
+      //清空校验结果表
+      this.listCodeRel = null;
+      this.loading = true;
+      let query = {
+        recordCode: this.recordCode,
+      }
+      getRecordResult(query).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.listOrder = res.data.traceManuOrderEntities || [];
+          this.list = res.data.traceOrderEntities || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.listOrder = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.listOrder = [];
+        this.total = 0;
+      })
+    },
+
     orderTimeOut() {
       // 执行逻辑代码
       this.filterQuery.page = 1;
+      this.searchIng = true;
       if ((this.list == undefined || this.list.length <= 0)) {
-        this.getList()
-        if (this.manuOrderQuery.recordCode != null || this.manuOrderQuery.recordCode != "") {
-          this.getManuOrderList()
-        }
+        this.getRecordResult()
+      } else {
+        this.searchIng = false;
       }
       // 使用递归法定时执行定时器
       if (this.list == undefined || this.list.length <= 0) {
@@ -1012,19 +1038,16 @@ export default {
         this.listOrder = null,
         this.listCodeRel = null,
         clearTimeout(this.monitorOrder);
-      this.monitorOrder = ""
-    },
-    onSubmit() {
-      this.orderTimeOut()
+      this.monitorOrder = "";
+      this.searchIng = false;
     },
     getList() {
       this.loading = true;
-      sourceSearch(this.filterQuery).then((res) => {
+      sceneSearch(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
-          this.list = res.data || [];
-          this.total = res.data.total || 0;
-          console.log(this.list)
+          this.recordCode = res.data;
+          this.orderTimeOut();
         } else {
           this.$message.error(res.message);
           this.list = [];
@@ -1039,7 +1062,11 @@ export default {
     },
   },
   created() {
-    this.geCompanyNameList()
+    this.getCompanyName()
+    if (this.list > 0) {
+      clearTimeout(this.monitorOrder);
+      this.monitorOrder = ""
+    }
   },
   beforeDestroy() {
     if (this.monitorOrder) {