From 1c25967b8dd249d1a816bdde9e9c99db4514c4df Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 9 Jul 2023 16:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/improveInfo.vue                 |  94 +++---
 src/views/udi/trace/history/index.vue     | 380 +++++++++++-----------
 src/views/udi/trace/historyTask/index.vue |  79 ++---
 src/views/udi/trace/search/index.vue      | 137 ++++----
 src/views/udi/trace/searchLive/index.vue  |  74 ++---
 5 files changed, 367 insertions(+), 397 deletions(-)

diff --git a/src/views/improveInfo.vue b/src/views/improveInfo.vue
index b51fe1e..757de1d 100644
--- a/src/views/improveInfo.vue
+++ b/src/views/improveInfo.vue
@@ -92,27 +92,27 @@
           <span>本企业信息:</span>
 
         </div>
-<!--        <el-row-->
-<!--          :gutter="20"-->
-<!--          class="el-row"-->
-<!--          type="flex"-->
-<!--        >-->
-<!--          <el-col :span="15" class="el-col">-->
-
-<!--            <el-form-item-->
-<!--              label="本企业信息审核状态:"-->
-<!--              prop="reason"-->
-<!--            >-->
-<!--               <span>-->
-<!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
-<!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
-<!--              </el-tag>-->
-<!--          </span>-->
-<!--            </el-form-item>-->
-
-
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        <el-row-->
+        <!--          :gutter="20"-->
+        <!--          class="el-row"-->
+        <!--          type="flex"-->
+        <!--        >-->
+        <!--          <el-col :span="15" class="el-col">-->
+
+        <!--            <el-form-item-->
+        <!--              label="本企业信息审核状态:"-->
+        <!--              prop="reason"-->
+        <!--            >-->
+        <!--               <span>-->
+        <!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
+        <!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
+        <!--              </el-tag>-->
+        <!--          </span>-->
+        <!--            </el-form-item>-->
+
+
+        <!--          </el-col>-->
+        <!--        </el-row>-->
 
         <el-row
           :gutter="20"
@@ -335,7 +335,6 @@
         </div>
 
 
-
         <el-row
           :gutter="20"
           class="el-row"
@@ -451,17 +450,17 @@
             资质证书信息:
           </span>
 
-        <div style="float: right; text-align: right; margin-bottom: 8px">
-          <el-button
-            type="primary"
-            size="mini"
-            icon="search"
-            @click="addCert()"
-            :disabled="inputQuery.ucstatus == 1 || inputQuery.ucstatus ==3"
-            style="text-align: right"
-          >添加资质证书
-          </el-button>
-        </div>
+          <div style="float: right; text-align: right; margin-bottom: 8px">
+            <el-button
+              type="primary"
+              size="mini"
+              icon="search"
+              @click="addCert()"
+              :disabled="inputQuery.ucstatus == 1 || inputQuery.ucstatus ==3"
+              style="text-align: right"
+            >添加资质证书
+            </el-button>
+          </div>
 
         </div>
         <el-table
@@ -476,11 +475,11 @@
             label="序号"
             width="50"
           ></el-table-column>
-          <el-table-column label="证书名称" prop="name"></el-table-column>
-          <el-table-column label="证书编号" prop="code" ></el-table-column>
-          <el-table-column label="生效日期" prop="validDate"></el-table-column>
-          <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-          <el-table-column label="确认状态" prop="checkStatus" width="80">
+          <el-table-column label="证书名称" prop="name" show-overflow-tooltip></el-table-column>
+          <el-table-column label="证书编号" prop="code" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生效日期" prop="validDate" width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column label="失效日期" prop="expireDate" width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column label="确认状态" prop="checkStatus" width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-tag :type="scope.row.checkStatus | statusFilterType">
                 {{ checkFlag[scope.row.checkStatus] }}
@@ -492,18 +491,18 @@
             prop="checkComment"
             show-overflow-tooltip
           ></el-table-column>
-<!--          <el-table-column label="状态说明" prop="status" width="120">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-tag :type="scope.row.status | statusFilterType">-->
-<!--                {{ statusFlag[scope.row.status] }}-->
-<!--              </el-tag>-->
+          <!--          <el-table-column label="状态说明" prop="status" width="120">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-tag :type="scope.row.status | statusFilterType">-->
+          <!--                {{ statusFlag[scope.row.status] }}-->
+          <!--              </el-tag>-->
 
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
 
           <el-table-column label="备注" prop="remark"></el-table-column>
 
-          <el-table-column label="操作" width="140">
+          <el-table-column label="操作" width="130">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -1027,7 +1026,8 @@ export default {
   margin: auto;
 
 }
-.el-form-item{
+
+.el-form-item {
   margin-top: 5px;
   margin-bottom: 4px;
 }
diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue
index 40ddf26..5530159 100644
--- a/src/views/udi/trace/history/index.vue
+++ b/src/views/udi/trace/history/index.vue
@@ -1,42 +1,42 @@
 <template>
   <div>
     <el-card>
-      <el-form label-width="100px"  >
-          <el-row type="flex">
-            <el-col type="flex" :span="8">
-              <el-form-item label="记录号:" class="query-form-item">
-                <el-input v-model="filterQuery.recordCode"
-                          style="width: 90%"
-                          placeholder="请输入记录号"
-                          clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col type="flex" :span="8" >
-              <el-form-item label="产品通用名称:" class="query-form-item">
-                <el-input v-model="filterQuery.cpmctymc"
-                          style="width: 90%"
-                          placeholder="请输入产品通用名称"
-                          clearable
+      <el-form label-width="100px">
+        <el-row type="flex">
+          <el-col type="flex" :span="8">
+            <el-form-item label="记录号:" class="query-form-item">
+              <el-input v-model="filterQuery.recordCode"
+                        style="width: 90%"
+                        placeholder="请输入记录号"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col type="flex" :span="8">
+            <el-form-item label="产品通用名称:" class="query-form-item">
+              <el-input v-model="filterQuery.cpmctymc"
+                        style="width: 90%"
+                        placeholder="请输入产品通用名称"
+                        clearable
 
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col type="flex" :span="8">
-              <el-form-item label="规格型号:" class="query-form-item">
-                <el-input v-model="filterQuery.ggxh"
-                          style="width: 90%"
-                          placeholder="请输入规格型号"
-                          clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col type="flex" :span="8">
+            <el-form-item label="规格型号:" class="query-form-item">
+              <el-input v-model="filterQuery.ggxh"
+                        style="width: 90%"
+                        placeholder="请输入规格型号"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
 
-          </el-row>
+        </el-row>
         <el-row>
           <el-col type="flex" :span="8">
-            <el-form-item label="批次号:" class="query-form-item" >
+            <el-form-item label="批次号:" class="query-form-item">
               <el-input v-model="filterQuery.batchNo"
                         style="width: 90%"
                         placeholder="请输入批次号"
@@ -46,16 +46,18 @@
           </el-col>
           <el-col type="flex" :span="8">
             <el-form-item label="查询场景:" prop="traceSource" class="query-form-item">
-              <el-select v-model="filterQuery.traceSource" placeholder="请选择查询场景" style="width: 90%" @change="onSubmit" clearable>
+              <el-select v-model="filterQuery.traceSource" placeholder="请选择查询场景" style="width: 90%" @change="onSubmit"
+                         clearable>
                 <el-option label="源头查询" value="1"></el-option>
                 <el-option label="现场检查查询" value="2"></el-option>
-<!--                <el-option label="出库" value="3"></el-option>-->
+                <!--                <el-option label="出库" value="3"></el-option>-->
               </el-select>
             </el-form-item>
           </el-col>
           <el-col type="flex" :span="8">
             <el-form-item label="查询方案:" prop="traceType" class="query-form-item">
-              <el-select v-model="filterQuery.traceType" placeholder="请选择查询方案" style="width: 90%" @change="onSubmit" clearable>
+              <el-select v-model="filterQuery.traceType" placeholder="请选择查询方案" style="width: 90%" @change="onSubmit"
+                         clearable>
                 <el-option label="按UDI码查询" value="1"></el-option>
                 <el-option label="组合条件查询" value="2"></el-option>
                 <!--                <el-option label="出库" value="3"></el-option>-->
@@ -80,18 +82,18 @@
                 @row-click="recordhandleSelectionChange"
                 highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="查询记录号" prop="recordCode" width="140"show-overflow-tooltip></el-table-column>
-        <el-table-column label="UDI码" prop="udiCode" width="270"show-overflow-tooltip></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"></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="createUser" width="180"></el-table-column>-->
-<!--        <el-table-column label="发货单位" prop="fromCorp" width="180"></el-table-column>-->
-<!--        <el-table-column label="收货单位" prop="toCorp" width="180"></el-table-column>-->
-<!--        <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>-->
-<!--        <el-table-column label="查询场景" prop="traceSource" width="120"></el-table-column>-->
+        <el-table-column label="查询记录号" prop="recordCode" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="UDI码" prop="udiCode" width="270" show-overflow-tooltip></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"></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="createUser" width="180"></el-table-column>-->
+        <!--        <el-table-column label="发货单位" prop="fromCorp" width="180"></el-table-column>-->
+        <!--        <el-table-column label="收货单位" prop="toCorp" width="180"></el-table-column>-->
+        <!--        <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>-->
+        <!--        <el-table-column label="查询场景" prop="traceSource" width="120"></el-table-column>-->
         <el-table-column label="查询场景" prop="traceSource" width="120">
           <template slot-scope="traceSource">
             {{ formatTaskType(traceSource.row) }}
@@ -102,8 +104,11 @@
             {{ formatTaskType1(traceType.row) }}
           </template>
         </el-table-column>
-        <el-table-column label="查询人" prop="createUser" width="120"show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
+        <el-table-column label="查询人" prop="createUser" width="120" show-overflow-tooltip></el-table-column>
+
+        <el-table-column label="查询时间" prop="updateTime" width="120" show-overflow-tooltip></el-table-column>
+        -->
+        <!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -137,7 +142,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="UDI码" prop="udiCode"show-overflow-tooltip>
+            <el-form-item label="UDI码" prop="udiCode" show-overflow-tooltip>
               <el-input v-model="formView.udiCode" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -146,13 +151,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="社会信用号" prop="creditNum"show-overflow-tooltip>
+            <el-form-item label="社会信用号" prop="creditNum" show-overflow-tooltip>
               <el-input v-model="formView.creditNum" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="注册备案人" prop="ylqxzcrbarmc"show-overflow-tooltip>
+            <el-form-item label="注册备案人" prop="ylqxzcrbarmc" show-overflow-tooltip>
               <el-input v-model="formView.ylqxzcrbarmc" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -161,13 +166,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="注册/备案证号" prop="zczbhhzbapzbh"show-overflow-tooltip>
+            <el-form-item label="注册/备案证号" prop="zczbhhzbapzbh" show-overflow-tooltip>
               <el-input v-model="formView.zczbhhzbapzbh" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="产品主DI标识" prop="nameCode"show-overflow-tooltip>
+            <el-form-item label="产品主DI标识" prop="nameCode" show-overflow-tooltip>
               <el-input v-model="formView.nameCode" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -176,13 +181,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品通用名称" prop="cpmctymc"show-overflow-tooltip>
+            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="规格型号" prop="ggxh"show-overflow-tooltip>
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
               <el-input v-model="formView.ggxh" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -191,13 +196,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="生产批次号" prop="batchNo"show-overflow-tooltip>
+            <el-form-item label="生产批次号" prop="batchNo" show-overflow-tooltip>
               <el-input v-model="formView.batchNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="生产日期" prop="produceDate"show-overflow-tooltip>
+            <el-form-item label="生产日期" prop="produceDate" show-overflow-tooltip>
               <el-input v-model="formView.produceDate" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -206,13 +211,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="失效日期" prop="expireDate"show-overflow-tooltip>
+            <el-form-item label="失效日期" prop="expireDate" show-overflow-tooltip>
               <el-input v-model="formView.expireDate" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="序列号" prop="serialNo"show-overflow-tooltip>
+            <el-form-item label="序列号" prop="serialNo" show-overflow-tooltip>
               <el-input v-model="formView.serialNo" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -221,41 +226,41 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="查询记录号" prop="recordCode"show-overflow-tooltip>
+            <el-form-item label="查询记录号" prop="recordCode" show-overflow-tooltip>
               <el-input v-model="formView.recordCode" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="查询人" prop="createUser"show-overflow-tooltip>
+            <el-form-item label="查询人" prop="createUser" show-overflow-tooltip>
               <el-input v-model="formView.createUser" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row type="flex">-->
-<!--          <el-col :span="11" type="flex">-->
-<!--            <el-form-item label="发货单位" prop="fromCorp">-->
-<!--              <el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true"-->
-<!--              ></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="11" class="el-col">-->
-<!--            <el-form-item label="收货单位" prop="toCorp">-->
-<!--              <el-input v-model="formView.toCorp" size="small"-->
-<!--                        style="width: 90%" :disabled="true"-->
-<!--              ></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        <el-row type="flex">-->
+        <!--          <el-col :span="11" type="flex">-->
+        <!--            <el-form-item label="发货单位" prop="fromCorp">-->
+        <!--              <el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="11" class="el-col">-->
+        <!--            <el-form-item label="收货单位" prop="toCorp">-->
+        <!--              <el-input v-model="formView.toCorp" size="small"-->
+        <!--                        style="width: 90%" :disabled="true"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <el-row type="flex">
-<!--          <el-col :span="11" type="flex">-->
-<!--            <el-form-item label="所属企业" prop="companyName">-->
-<!--              <el-input v-model="formView.companyName" size="small" style="width: 90%" :disabled="true"-->
-<!--              ></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="11" type="flex">-->
+          <!--            <el-form-item label="所属企业" prop="companyName">-->
+          <!--              <el-input v-model="formView.companyName" size="small" style="width: 90%" :disabled="true"-->
+          <!--              ></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="11" class="el-col">
             <el-form-item label="查询场景" prop="traceSource">
               <el-input v-model="traceSourceText" size="small" style="width: 90%" :disabled="true"></el-input>
@@ -286,14 +291,16 @@
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></el-table-column>
-<!--            <el-table-column label="记录号" prop="recordCode" width="180"show-overflow-tooltip></el-table-column>-->
-            <el-table-column label="生产订单号" prop="billNo" width="220"show-overflow-tooltip></el-table-column>
-            <el-table-column label="订单日期" prop="billDate" width="180"show-overflow-tooltip></el-table-column>
-            <el-table-column label="DI标识" prop="nameCode" width="180"show-overflow-tooltip></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="180"show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"show-overflow-tooltip></el-table-column>
+            <!--            <el-table-column label="记录号" prop="recordCode" width="180"show-overflow-tooltip></el-table-column>-->
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="上报企业" prop="companyName" width="160"></el-table-column>
+            <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
+            <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
+            <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="160"></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
             <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -312,17 +319,17 @@
                         style="width: 100%"
                         highlight-current-row border>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="UDI码" prop="code" width="180"show-overflow-tooltip></el-table-column>
-<!--                <el-table-column label="父码" prop="pcode" width="180"show-overflow-tooltip></el-table-column>-->
-                <el-table-column label="产品通用名称" prop="cpmctymc" width="160"show-overflow-tooltip></el-table-column>
-                <el-table-column label="DI标识" prop="nameCode" width="160"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="batchNo" width="120"show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产日期" prop="produceDate" width="180"show-overflow-tooltip></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate" width="180"show-overflow-tooltip></el-table-column>
-                <el-table-column label="序列号" prop="serialNo" width="120"show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装层级" prop="bzcj" width="180"show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装状态" prop="packState" width="180"
+                <el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column>
+                <el-table-column label="父级UDI码" prop="pcode" width="180"></el-table-column>
+                <el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column>
+                <el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column>
+                <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
+                <el-table-column label="批次号" prop="batchNo" width="140"></el-table-column>
+                <el-table-column label="生产日期" prop="produceDate" width="140"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate" width="140"></el-table-column>
+                <el-table-column label="序列号" prop="serialNo" width="140"></el-table-column>
+                <el-table-column label="包装层级" prop="bzcj" width="140"></el-table-column>
+                <el-table-column label="包装状态" prop="packState" width="140"
                                  :formatter="formaterPackState"></el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                   <template slot-scope="scope">
@@ -349,13 +356,13 @@
       <el-form :model="manuOrderFormView" :rules="formRules" ref="dataForm" label-width="100px">
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="生产订单号" prop="billNo"show-overflow-tooltip>
+            <el-form-item label="生产订单号" prop="billNo" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.billNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="订单日期" prop="billDate"show-overflow-tooltip>
+            <el-form-item label="订单日期" prop="billDate" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.billDate" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -364,13 +371,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品通用名称" prop="cpmctymc"show-overflow-tooltip>
+            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="规格型号" prop="ggxh"show-overflow-tooltip>
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.ggxh" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -379,13 +386,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品描述" prop="cpms"show-overflow-tooltip>
+            <el-form-item label="产品描述" prop="cpms" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.cpms" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="注册/备案证号" prop="zczbhhzbapzbh"show-overflow-tooltip>
+            <el-form-item label="注册/备案证号" prop="zczbhhzbapzbh" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.zczbhhzbapzbh" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -394,13 +401,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="DI产品标识" prop="nameCode"show-overflow-tooltip>
+            <el-form-item label="DI产品标识" prop="nameCode" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.nameCode" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="国家库UUID" prop="uuid"show-overflow-tooltip>
+            <el-form-item label="国家库UUID" prop="uuid" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.uuid" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -409,13 +416,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="批次号" prop="batchNo"show-overflow-tooltip>
+            <el-form-item label="批次号" prop="batchNo" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.batchNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="生产企业" prop="manufactory"show-overflow-tooltip>
+            <el-form-item label="生产企业" prop="manufactory" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.manufactory" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -424,13 +431,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="更新时间" prop="updateTime"show-overflow-tooltip>
+            <el-form-item label="更新时间" prop="updateTime" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.updateTime" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="所属企业" prop="companyName"show-overflow-tooltip>
+            <el-form-item label="所属企业" prop="companyName" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.companyName" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -439,13 +446,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="查询记录号" prop="recordCode"show-overflow-tooltip>
+            <el-form-item label="查询记录号" prop="recordCode" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.recordCode" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="查询人" prop="createUser"show-overflow-tooltip>
+            <el-form-item label="查询人" prop="createUser" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.createUser" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -454,7 +461,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc"show-overflow-tooltip>
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -469,7 +476,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="备注" prop="remark"show-overflow-tooltip>
+            <el-form-item label="备注" prop="remark" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.remark" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -491,13 +498,13 @@
       <el-form :model="manuOrderCodeRelFormView" :rules="formRules" ref="dataForm" label-width="100px">
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="UDI码" prop="code"show-overflow-tooltip>
+            <el-form-item label="UDI码" prop="code" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.code" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="父码" prop="pcode"show-overflow-tooltip>
+            <el-form-item label="父码" prop="pcode" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.pcode" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -506,13 +513,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="批次号" prop="batchNo"show-overflow-tooltip>
+            <el-form-item label="批次号" prop="batchNo" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.batchNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="序列号" prop="serialNo"show-overflow-tooltip>
+            <el-form-item label="序列号" prop="serialNo" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.serialNo" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -523,14 +530,14 @@
         <el-row type="flex">
 
           <el-col :span="11" class="el-col">
-            <el-form-item label="产品通用名称" prop="cpmctymc"show-overflow-tooltip>
+            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.cpmctymc" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="规格型号" prop="ggxh"show-overflow-tooltip>
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.ggxh" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -538,14 +545,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="生产日期" prop="produceDate"show-overflow-tooltip>
+            <el-form-item label="生产日期" prop="produceDate" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.produceDate" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="失效日期" prop="expireDate"show-overflow-tooltip>
+            <el-form-item label="失效日期" prop="expireDate" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.expireDate" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -560,7 +567,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="包装层级" prop="bzcj"show-overflow-tooltip>
+            <el-form-item label="包装层级" prop="bzcj" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.bzcj" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -571,7 +578,7 @@
         <el-row type="flex">
 
           <el-col :span="11" type="flex">
-            <el-form-item label="DI产品标识" prop="nameCode"show-overflow-tooltip>
+            <el-form-item label="DI产品标识" prop="nameCode" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.nameCode" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -599,19 +606,18 @@
             <!--            <el-table-column label="出入库类型" prop="inOutType" width="100"-->
             <!--                             :formatter="formaterInOutType"></el-table-column>-->
 
+            <el-table-column label="上报企业" prop="companyName" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
+            <el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></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="batchNo" width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column label="单据号" prop="billNo" width="150"show-overflow-tooltip></el-table-column>
-            <el-table-column label="单据类型" prop="billType" width="100"show-overflow-tooltip></el-table-column>
-            <el-table-column label="单据日期" prop="billDate" width="150"show-overflow-tooltip></el-table-column>
-            <el-table-column label="更新时间" prop="updateTime" width="150"show-overflow-tooltip></el-table-column>
-            <el-table-column label="发货企业" prop="fromCorp" width="220"show-overflow-tooltip></el-table-column>
-            <el-table-column label="收货企业" prop="toCorp" width="220"show-overflow-tooltip></el-table-column>
-            <el-table-column label="上报企业" prop="companyIdFk" width="220"
-                             :formatter="formatCompanyName" 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="zczbhhzbapzbh" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="更新时间" prop="updateTime" width="150" show-overflow-tooltip></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>-->
@@ -653,13 +659,13 @@
       <el-form :model="orderFormView" :rules="formRules" ref="dataForm" label-width="100px">
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="单据号" prop="billNo"show-overflow-tooltip>
+            <el-form-item label="单据号" prop="billNo" show-overflow-tooltip>
               <el-input v-model="orderFormView.billNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="单据日期" prop="billDate"show-overflow-tooltip>
+            <el-form-item label="单据日期" prop="billDate" show-overflow-tooltip>
               <el-input v-model="orderFormView.billDate" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -668,14 +674,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="单据类型" prop="billType"show-overflow-tooltip>
+            <el-form-item label="单据类型" prop="billType" show-overflow-tooltip>
               <el-input v-model="orderFormView.billType" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="客户端类型" prop="clientType"show-overflow-tooltip>
+            <el-form-item label="客户端类型" prop="clientType" show-overflow-tooltip>
               <el-input v-model="orderFormView.clientType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -683,14 +689,14 @@
         </el-row>
         <el-row>
           <el-col :span="11" class="el-col">
-            <el-form-item label="所属企业" prop="companyIdFk"show-overflow-tooltip>
+            <el-form-item label="所属企业" prop="companyIdFk" show-overflow-tooltip>
               <el-input v-model="this.formateCompanyName" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="发货企业" prop="fromCorp"show-overflow-tooltip>
+            <el-form-item label="发货企业" prop="fromCorp" show-overflow-tooltip>
               <el-input v-model="orderFormView.fromCorp" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -698,13 +704,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="单据创建者" prop="createUser"show-overflow-tooltip>
+            <el-form-item label="单据创建者" prop="createUser" show-overflow-tooltip>
               <el-input v-model="orderFormView.createUser" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="销毁原因" prop="destoryReason"show-overflow-tooltip>
+            <el-form-item label="销毁原因" prop="destoryReason" show-overflow-tooltip>
               <el-input v-model="orderFormView.destoryReason" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -713,14 +719,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="更新时间" prop="updateTime"show-overflow-tooltip>
+            <el-form-item label="更新时间" prop="updateTime" show-overflow-tooltip>
               <el-input v-model="orderFormView.updateTime" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="执行销毁人" prop="excuseUser"show-overflow-tooltip>
+            <el-form-item label="执行销毁人" prop="excuseUser" show-overflow-tooltip>
               <el-input v-model="orderFormView.excuseUser" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -731,13 +737,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="出入库类型" prop="inOutType"show-overflow-tooltip>
+            <el-form-item label="出入库类型" prop="inOutType" show-overflow-tooltip>
               <el-input v-model="this.formateInOutType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="退货原因" prop="returnReason"show-overflow-tooltip>
+            <el-form-item label="退货原因" prop="returnReason" show-overflow-tooltip>
               <el-input v-model="orderFormView.returnReason" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -746,13 +752,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="查询场景" prop="sourceType"show-overflow-tooltip>
+            <el-form-item label="查询场景" prop="sourceType" show-overflow-tooltip>
               <el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="监督人证件号" prop="superviserCode"show-overflow-tooltip>
+            <el-form-item label="监督人证件号" prop="superviserCode" show-overflow-tooltip>
               <el-input v-model="orderFormView.superviserCode" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -761,13 +767,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="监督人姓名" prop="superviserUser"show-overflow-tooltip>
+            <el-form-item label="监督人姓名" prop="superviserUser" show-overflow-tooltip>
               <el-input v-model="orderFormView.superviserUser" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="收货企业" prop="toCorp"show-overflow-tooltip>
+            <el-form-item label="收货企业" prop="toCorp" show-overflow-tooltip>
               <el-input v-model="orderFormView.toCorp" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -776,13 +782,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="上传人" prop="uploadUser"show-overflow-tooltip>
+            <el-form-item label="上传人" prop="uploadUser" show-overflow-tooltip>
               <el-input v-model="orderFormView.uploadUser" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="使用者信息" prop="toUserInfo"show-overflow-tooltip>
+            <el-form-item label="使用者信息" prop="toUserInfo" show-overflow-tooltip>
               <el-input v-model="orderFormView.toUserInfo" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -793,13 +799,13 @@
         </el-row>
         <el-row>
           <el-col :span="11" type="flex">
-            <el-form-item label="当前企业统一社会信用号" prop="companyCertNum"show-overflow-tooltip>
+            <el-form-item label="当前企业统一社会信用号" prop="companyCertNum" show-overflow-tooltip>
               <el-input v-model="orderFormView.companyCertNum" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="执行销毁人证件号" prop="excuseCode"show-overflow-tooltip>
+            <el-form-item label="执行销毁人证件号" prop="excuseCode" show-overflow-tooltip>
               <el-input v-model="orderFormView.excuseCode" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -807,14 +813,14 @@
         </el-row>
         <el-row>
           <el-col :span="11" class="el-col">
-            <el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum"show-overflow-tooltip>
+            <el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum" show-overflow-tooltip>
               <el-input v-model="orderFormView.fromCorpCreditNum" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum"show-overflow-tooltip>
+            <el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum" show-overflow-tooltip>
               <el-input v-model="orderFormView.toCorpCreditNum" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -822,7 +828,7 @@
         </el-row>
         <el-row>
           <el-col :span="11" type="flex">
-            <el-form-item label="备注" prop="remark"show-overflow-tooltip>
+            <el-form-item label="备注" prop="remark" show-overflow-tooltip>
               <el-input v-model="orderFormView.remark" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -839,7 +845,7 @@
 
 <script>
 
-import {getTraceRecordList,getTraceOrder,getManuOrder,getManuCodeRelList,getRecordResult} from "@/api/udi/udiTrace";
+import {getTraceRecordList, getTraceOrder, getManuOrder, getManuCodeRelList, getRecordResult} from "@/api/udi/udiTrace";
 
 
 export default {
@@ -880,8 +886,8 @@ export default {
         cpmctymc: null,
         ggxh: null,
         batchNo: null,
-        traceSource:null,
-        traceType:null,
+        traceSource: null,
+        traceType: null,
         page: 1,
         limit: 10,
       },
@@ -896,16 +902,16 @@ export default {
       open: false,
       formView: {
         traceType: null,
-        traceSource:null,
+        traceSource: null,
       },
       traceTypes: [
-        { value: 1, label: '按UDI码查询' },
-        { value: 2, label: '按批次号查询' },
+        {value: 1, label: '按UDI码查询'},
+        {value: 2, label: '按批次号查询'},
         //{ value: 3, label: '方案3' },
       ],
       traceSources: [
-        { value: 1, label: '源头查询' },
-        { value: 2, label: '现在检查查询' },
+        {value: 1, label: '源头查询'},
+        {value: 2, label: '现在检查查询'},
         // { value: 3, label: '方式3' },
       ],
       showSearch: true,
@@ -978,7 +984,7 @@ export default {
       })
     },
 
-    recordhandleSelectionChange(val){
+    recordhandleSelectionChange(val) {
       this.currentRow = val;
       //this.getTraceOrder();
       //this.getManuOrder();
@@ -1009,7 +1015,7 @@ export default {
         this.traceOrderTotal = 0;
       })
     },
-    getManuOrder(){
+    getManuOrder() {
       if (this.currentRow.id == null) {
         this.$message.error("请先选择需要查询的单据！")
         return;
@@ -1086,7 +1092,7 @@ export default {
           return '查询方案有误！！';
       }
     },
-    handleView(row){
+    handleView(row) {
       this.list.forEach(obj => {
         if (row.id == obj.id) {
           this.formView = obj
@@ -1095,7 +1101,7 @@ export default {
       console.log(this.formView)
       this.open = true
     },
-    onReset(){
+    onReset() {
       this.$router.push({
         path: "",
       });
@@ -1109,20 +1115,20 @@ export default {
       };
       this.traceOrderQuery = {
         recordCode: null,
-          page: 1,
-          limit: 10,
+        page: 1,
+        limit: 10,
       },
-      this.manuOrderQuery = {
-        recordCode: null,
+        this.manuOrderQuery = {
+          recordCode: null,
           page: 1,
           limit: 10,
-      },
-      this.traceOrderList = null,
-      this.manuOrderList = null,
-      this.listCodeRel = null,
-      this.getList();
+        },
+        this.traceOrderList = null,
+        this.manuOrderList = null,
+        this.listCodeRel = null,
+        this.getList();
     },
-    onSubmit(){
+    onSubmit() {
       this.filterQuery.page = 1;
       this.getList()
     },
@@ -1158,10 +1164,20 @@ export default {
   border-radius: 4px;
   flex-wrap: wrap;
 }
+
 .query-form-item {
   display: block !important;
   margin-right: 10px;
   margin-bottom: 5px;
 }
 
+.form-title {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
+}
+
 </style>
diff --git a/src/views/udi/trace/historyTask/index.vue b/src/views/udi/trace/historyTask/index.vue
index 1e67e69..3b6c2a3 100644
--- a/src/views/udi/trace/historyTask/index.vue
+++ b/src/views/udi/trace/historyTask/index.vue
@@ -11,19 +11,20 @@
                          @change="onSubmit"
                          clearable
               >
-                <el-option label="关联关系" value="1"></el-option>
-                <el-option label="入库" value="2"></el-option>
-                <el-option label="出库" value="3"></el-option>
+                <el-option label="生产单据" value="1"></el-option>
+                <el-option label="出入库单据" value="2"></el-option>
               </el-select>
             </el-form-item>
 
           </el-col>
           <el-col type="flex" :span="8">
             <el-form-item label="任务状态:" prop="status" class="query-form-item">
-              <el-select v-model="filterQuery.status" placeholder="请选择任务状态" style="width: 90%" @change="onSubmit" clearable>
+              <el-select v-model="filterQuery.status" placeholder="请选择任务状态" style="width: 90%" @change="onSubmit"
+                         clearable>
                 <el-option label="未处理" value="1"></el-option>
                 <el-option label="正在处理" value="2"></el-option>
                 <el-option label="已处理" value="3"></el-option>
+                <el-option label="已超时" value="4"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -151,17 +152,17 @@
         </el-table-column>
 
 
-
-
-
-        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200"show-overflow-tooltip></el-table-column>
-        <el-table-column label="社会统一信用号" prop="creditNum" width="220"show-overflow-tooltip></el-table-column>
+        <el-table-column label="查询企业" prop="companyName" 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="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="batchNo" width="180"show-overflow-tooltip></el-table-column>
-        <el-table-column label="序列号" prop="serialNo" width="180"show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产日期" prop="produceDate" width="180"show-overflow-tooltip></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate" 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="batchNo" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产日期" prop="produceDate" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="序列号" prop="serialNo" width="120"show-overflow-tooltip></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="180"show-overflow-tooltip></el-table-column>
 
         <!--        <el-table-column label="创建时间" prop="createTime" width="180"></el-table-column>-->
         <!--        <el-table-column label="更新时间" prop="updateTime" width="180"></el-table-column>-->
@@ -206,13 +207,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品通用名称" prop="cpmctymc"show-overflow-tooltip>
+            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="规格型号" prop="ggxh"show-overflow-tooltip>
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
               <el-input v-model="formView.ggxh" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -221,13 +222,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="批次号" prop="batchNo"show-overflow-tooltip>
+            <el-form-item label="批次号" prop="batchNo" show-overflow-tooltip>
               <el-input v-model="formView.batchNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="序列号" prop="serialNo"show-overflow-tooltip>
+            <el-form-item label="序列号" prop="serialNo" show-overflow-tooltip>
               <el-input v-model="formView.serialNo" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -236,14 +237,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="生产日期" prop="produceDate"show-overflow-tooltip>
+            <el-form-item label="生产日期" prop="produceDate" show-overflow-tooltip>
               <el-input v-model="formView.produceDate" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="失效日期" prop="expireDate"show-overflow-tooltip>
+            <el-form-item label="失效日期" prop="expireDate" show-overflow-tooltip>
               <el-input v-model="formView.expireDate" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -251,13 +252,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="创建时间" prop="createTime"show-overflow-tooltip>
+            <el-form-item label="创建时间" prop="createTime" show-overflow-tooltip>
               <el-input v-model="formView.createTime" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="更新时间" prop="updateTime"show-overflow-tooltip>
+            <el-form-item label="更新时间" prop="updateTime" show-overflow-tooltip>
               <el-input v-model="formView.updateTime" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -266,13 +267,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc"show-overflow-tooltip>
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip>
               <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="社会统一信用号" prop="creditNum"show-overflow-tooltip>
+            <el-form-item label="社会统一信用号" prop="creditNum" show-overflow-tooltip>
               <el-input v-model="formView.creditNum" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -291,6 +292,7 @@
 
 import {isBlank} from "@/utils/strUtil";
 import {deleteTaskList, getTraceHistoryTaskList} from "@/api/udi/udiTrace";
+
 const formJson = {
   id: "",
   passWord: "",
@@ -330,18 +332,18 @@ export default {
       open: false,
       openManuCodeRel: false,
       formView: {
-        taskType:null,
+        taskType: null,
         status: null,
       },
       taskTypes: [
-        { value: 1, label: '关联关系' },
-        { value: 2, label: '入库' },
-        { value: 3, label: '出库' },
+        {value: 1, label: '关联关系'},
+        {value: 2, label: '入库'},
+        {value: 3, label: '出库'},
       ],
       taskStatus: [
-        { value: 1, label: '未处理' },
-        { value: 2, label: '正在处理' },
-        { value: 3, label: '已处理' },
+        {value: 1, label: '未处理'},
+        {value: 2, label: '正在处理'},
+        {value: 3, label: '已处理'},
       ],
       formViewCodeRel: {},
       showSearch: true,
@@ -400,11 +402,11 @@ export default {
     formatTaskType(row) {
       switch (row.taskType) {
         case 1:
-          return '关联关系';
+          return '生产单据';
         case 2:
-          return '入库';
+          return '出入库单据';
         case 3:
-          return '出库';
+          return '出入库单据';
         default:
           return '任务类型有误！！';
       }
@@ -456,7 +458,7 @@ export default {
         });
     },
     //详情
-    handleView(row){
+    handleView(row) {
       this.taskList.forEach(obj => {
         if (row.id == obj.id) {
           this.formView = obj
@@ -465,7 +467,7 @@ export default {
       console.log(this.formView)
       this.open = true
     },
-    handleViewCoderel(row){
+    handleViewCoderel(row) {
       this.listCodeRel.forEach(obj => {
         if (this.listCodeRel[0]) {
           this.formViewCodeRel = obj
@@ -475,7 +477,7 @@ export default {
       this.openManuCodeRel = true
     },
     //重置
-    onReset(){
+    onReset() {
       this.$router.push({
         path: "",
       });
@@ -498,7 +500,7 @@ export default {
       this.getTaskList();
     },
     //查询事件
-    onSubmit(){
+    onSubmit() {
       this.loading = true;
       if (this.actDateRange !== null) {
         this.filterQuery.startTime = this.actDateRange[0];
@@ -569,6 +571,7 @@ export default {
   border-radius: 4px;
   flex-wrap: wrap;
 }
+
 .query-form-item {
   display: block !important;
   margin-right: 10px;
diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index c94f1f5..49a23a5 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -57,7 +57,6 @@
                   :label="item.cpmctymc"
                   :value="item.cpmctymc"
                 >
-
                 </el-option>
               </el-select>
             </el-form-item>
@@ -159,15 +158,14 @@
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></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>
-            <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="180"></el-table-column>
-            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
-            <el-table-column label="上报企业" prop="companyName" width="200"
-            ></el-table-column>
+            <el-table-column label="上报企业" prop="companyName" width="160"></el-table-column>
+            <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
+            <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
+            <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="160"></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
             <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -181,22 +179,22 @@
           <el-divider style="margin: 15px"></el-divider>
           <el-tabs type="border-card">
             <el-tab-pane>
-              <span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系</span>
+              <span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-UDI码关联关系</span>
               <el-table v-loading="manuCodeRelLoading" :data="listCodeRel"
                         style="width: 100%"
                         highlight-current-row border>
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column>
-                <el-table-column label="父码" prop="pcode" width="180"></el-table-column>
+                <el-table-column label="父级UDI码" prop="pcode" width="180"></el-table-column>
                 <el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column>
                 <el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
-                <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
-                <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
-                <el-table-column label="序列号" prop="serialNo" width="120"></el-table-column>
-                <el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
-                <el-table-column label="包装状态" prop="packState" width="180"
+                <el-table-column label="批次号" prop="batchNo" width="140"></el-table-column>
+                <el-table-column label="生产日期" prop="produceDate" width="140"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate" width="140"></el-table-column>
+                <el-table-column label="序列号" prop="serialNo" width="140"></el-table-column>
+                <el-table-column label="包装层级" prop="bzcj" width="140"></el-table-column>
+                <el-table-column label="包装状态" prop="packState" width="140"
                                  :formatter="formaterPackState"></el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                   <template slot-scope="scope">
@@ -471,21 +469,19 @@
             <!--                             :formatter="formaterSourceType"></el-table-column>-->
             <!--            <el-table-column label="出入库类型" prop="inOutType" width="100"-->
             <!--                             :formatter="formaterInOutType"></el-table-column>-->
-
+            <el-table-column label="上报企业" prop="companyName" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
+            <el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></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="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>
-            <el-table-column label="单据日期" prop="billDate" 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="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
-            <el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
-            <el-table-column label="上报企业" prop="companyName" width="200"
-            ></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="更新时间" prop="updateTime" width="150" show-overflow-tooltip></el-table-column>
+
 
             <!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
 
@@ -537,13 +533,13 @@
       <el-form :model="formView" :rules="formRules" ref="dataForm" label-width="100px">
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="单据号" prop="billNo"show-overflow-tooltip>
+            <el-form-item label="单据号" prop="billNo" show-overflow-tooltip>
               <el-input v-model="formView.billNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="单据日期" prop="billDate"show-overflow-tooltip>
+            <el-form-item label="单据日期" prop="billDate" show-overflow-tooltip>
               <el-input v-model="formView.billDate" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -552,14 +548,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="单据类型" prop="billType"show-overflow-tooltip>
+            <el-form-item label="单据类型" prop="billType" show-overflow-tooltip>
               <el-input v-model="formView.billType" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="客户端类型" prop="clientType"show-overflow-tooltip>
+            <el-form-item label="客户端类型" prop="clientType" show-overflow-tooltip>
               <el-input v-model="formView.clientType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -567,14 +563,14 @@
         </el-row>
         <el-row>
           <el-col :span="11" class="el-col">
-            <el-form-item label="所属企业" prop="companyIdFk"show-overflow-tooltip>
+            <el-form-item label="所属企业" prop="companyIdFk" show-overflow-tooltip>
               <el-input v-model="this.formateCompanyName" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="发货企业" prop="fromCorp"show-overflow-tooltip>
+            <el-form-item label="发货企业" prop="fromCorp" show-overflow-tooltip>
               <el-input v-model="formView.fromCorp" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -582,13 +578,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="单据创建者" prop="createUser"show-overflow-tooltip>
+            <el-form-item label="单据创建者" prop="createUser" show-overflow-tooltip>
               <el-input v-model="formView.createUser" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="销毁原因" prop="destoryReason"show-overflow-tooltip>
+            <el-form-item label="销毁原因" prop="destoryReason" show-overflow-tooltip>
               <el-input v-model="formView.destoryReason" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -597,14 +593,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="更新时间" prop="updateTime"show-overflow-tooltip>
+            <el-form-item label="更新时间" prop="updateTime" show-overflow-tooltip>
               <el-input v-model="formView.updateTime" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="执行销毁人" prop="excuseUser"show-overflow-tooltip>
+            <el-form-item label="执行销毁人" prop="excuseUser" show-overflow-tooltip>
               <el-input v-model="formView.excuseUser" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -615,13 +611,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="出入库类型" prop="inOutType"show-overflow-tooltip>
+            <el-form-item label="出入库类型" prop="inOutType" show-overflow-tooltip>
               <el-input v-model="this.formateInOutType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="退货原因" prop="returnReason"show-overflow-tooltip>
+            <el-form-item label="退货原因" prop="returnReason" show-overflow-tooltip>
               <el-input v-model="formView.returnReason" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -630,13 +626,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="查询方式" prop="sourceType"show-overflow-tooltip>
+            <el-form-item label="查询方式" prop="sourceType" show-overflow-tooltip>
               <el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="监督人证件号" prop="superviserCode"show-overflow-tooltip>
+            <el-form-item label="监督人证件号" prop="superviserCode" show-overflow-tooltip>
               <el-input v-model="formView.superviserCode" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -645,13 +641,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="监督人姓名" prop="superviserUser"show-overflow-tooltip>
+            <el-form-item label="监督人姓名" prop="superviserUser" show-overflow-tooltip>
               <el-input v-model="formView.superviserUser" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="收货企业" prop="toCorp"show-overflow-tooltip>
+            <el-form-item label="收货企业" prop="toCorp" show-overflow-tooltip>
               <el-input v-model="formView.toCorp" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -660,13 +656,13 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="上传人" prop="uploadUser"show-overflow-tooltip>
+            <el-form-item label="上传人" prop="uploadUser" show-overflow-tooltip>
               <el-input v-model="formView.uploadUser" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="使用者信息" prop="toUserInfo"show-overflow-tooltip>
+            <el-form-item label="使用者信息" prop="toUserInfo" show-overflow-tooltip>
               <el-input v-model="formView.toUserInfo" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -679,13 +675,13 @@
         </el-row>
         <el-row>
           <el-col :span="11" type="flex">
-            <el-form-item label="当前企业统一社会信用号" prop="companyCertNum"show-overflow-tooltip>
+            <el-form-item label="当前企业统一社会信用号" prop="companyCertNum" show-overflow-tooltip>
               <el-input v-model="formView.companyCertNum" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="执行销毁人证件号" prop="excuseCode"show-overflow-tooltip>
+            <el-form-item label="执行销毁人证件号" prop="excuseCode" show-overflow-tooltip>
               <el-input v-model="formView.excuseCode" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -693,14 +689,14 @@
         </el-row>
         <el-row>
           <el-col :span="11" class="el-col">
-            <el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum"show-overflow-tooltip>
+            <el-form-item label="发货企业统一社会信用号" prop="fromCorpCreditNum" show-overflow-tooltip>
               <el-input v-model="formView.fromCorpCreditNum" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" type="flex">
-            <el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum"show-overflow-tooltip>
+            <el-form-item label="收货企业统一社会信用号" prop="toCorpCreditNum" show-overflow-tooltip>
               <el-input v-model="formView.toCorpCreditNum" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -708,7 +704,7 @@
         </el-row>
         <el-row>
           <el-col :span="11" type="flex">
-            <el-form-item label="备注" prop="remark"show-overflow-tooltip>
+            <el-form-item label="备注" prop="remark" show-overflow-tooltip>
               <el-input v-model="formView.remark" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -837,30 +833,11 @@ export default {
       })
     },
     orderTimeOut() {
-      // 执行逻辑代码
       this.filterQuery.page = 1;
       this.searchIng = true;
-      if ((this.list == undefined || this.list.length <= 0)) {
-        this.getRecordResult()
-      } else {
-        this.searchIng = false;
-      }
       // 使用递归法定时执行定时器
-      // if (this.list == undefined || this.list.length <= 0) {
+      this.getRecordResult()
       this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
-      // }
-    },
-    formaterSourceType(row) {
-      if (row.sourceType == 1) {
-        this.formateSourceType = "起始位置"
-        return "起始位置"
-      } else if (row.sourceType == 2) {
-        this.formateSourceType = "中间位置"
-        return "中间位置"
-      } else {
-        this.formateSourceType = "结束位置"
-        return "结束位置"
-      }
     },
     formaterInOutType(row) {
       if (row.inOutType == 1) {
@@ -1008,12 +985,12 @@ export default {
         page: 1,
         limit: 10,
       };
-      this.list = "",
-        this.listOrder = null,
-        this.listCodeRel = null,
-        clearTimeout(this.monitorOrder);
-      this.monitorOrder = "",
-        this.searchIng = false;
+      this.list = "";
+      this.listOrder = null;
+      this.listCodeRel = null;
+      clearTimeout(this.monitorOrder);
+      this.monitorOrder = "";
+      this.searchIng = false;
     },
     getList() {
       this.loading = true;
@@ -1037,10 +1014,6 @@ export default {
   },
   created() {
     this.getCompanyName()
-    if (this.list > 0) {
-      clearTimeout(this.monitorOrder);
-      this.monitorOrder = ""
-    }
   },
   beforeDestroy() {
     if (this.monitorOrder) {
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index f6fab5d..34f41c6 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -192,13 +192,14 @@
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="生产订单号" prop="billNo" width="220"show-overflow-tooltip></el-table-column>
-            <el-table-column label="订单日期" prop="billDate" width="180"show-overflow-tooltip></el-table-column>
-            <el-table-column label="DI标识" prop="nameCode" width="180"show-overflow-tooltip></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="180"show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"show-overflow-tooltip></el-table-column>
+            <el-table-column label="上报企业" prop="companyName" width="160"></el-table-column>
+            <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
+            <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
+            <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="160"></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
             <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -212,7 +213,7 @@
           <el-divider style="margin: 15px"></el-divider>
           <el-tabs type="border-card">
             <el-tab-pane>
-              <span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系</span>
+              <span slot="label">生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-UDI码关联关系</span>
               <el-table v-loading="manuCodeRelLoading" :data="listCodeRel"
                         style="width: 100%"
                         highlight-current-row border>
@@ -496,19 +497,19 @@
           <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="companyName" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据类型" prop="billType" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
+            <el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></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="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>
-            <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
-            <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="companyName" width="220"
-            ></el-table-column>
+            <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="更新时间" prop="updateTime" width="150" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -856,30 +857,11 @@ export default {
     },
 
     orderTimeOut() {
-      // 执行逻辑代码
       this.filterQuery.page = 1;
       this.searchIng = true;
-      if ((this.list == undefined || this.list.length <= 0)) {
-        this.getRecordResult()
-      } else {
-        this.searchIng = false;
-      }
       // 使用递归法定时执行定时器
-      if (this.list == undefined || this.list.length <= 0) {
-        this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
-      }
-    },
-    formaterSourceType(row) {
-      if (row.sourceType == 1) {
-        this.formateSourceType = "起始位置"
-        return "起始位置"
-      } else if (row.sourceType == 2) {
-        this.formateSourceType = "中间位置"
-        return "中间位置"
-      } else {
-        this.formateSourceType = "结束位置"
-        return "结束位置"
-      }
+      this.getRecordResult()
+      this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
     },
     formaterInOutType(row) {
       if (row.inOutType == 1) {
@@ -1034,10 +1016,10 @@ export default {
         page: 1,
         limit: 10,
       };
-      this.list = null,
-        this.listOrder = null,
-        this.listCodeRel = null,
-        clearTimeout(this.monitorOrder);
+      this.list = "";
+      this.listOrder = null;
+      this.listCodeRel = null;
+      clearTimeout(this.monitorOrder);
       this.monitorOrder = "";
       this.searchIng = false;
     },
@@ -1062,11 +1044,7 @@ export default {
     },
   },
   created() {
-    this.getCompanyName()
-    if (this.list > 0) {
-      clearTimeout(this.monitorOrder);
-      this.monitorOrder = ""
-    }
+    this.geCompanyNameList();
   },
   beforeDestroy() {
     if (this.monitorOrder) {