From 9c9972cba9ad32259b6b4388f67214b969e524d8 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 5 Jul 2023 22:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                    |  3 +--
 src/views/udi/trace/task/index.vue | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.env.production b/.env.production
index 76601af..c0ed335 100644
--- a/.env.production
+++ b/.env.production
@@ -11,8 +11,7 @@ ENV = 'production'
 
 # 线上
 VUE_APP_BASE_API = 'https://ts.udims.com/api/'
-# 叶东旭
-# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_CPT_SERVER/'
+VUE_APP_BASE_API = 'http://192.168.0.166:9150/UDI_CPT_SERVER/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/src/views/udi/trace/task/index.vue b/src/views/udi/trace/task/index.vue
index 1cfb8c9..0620a0e 100644
--- a/src/views/udi/trace/task/index.vue
+++ b/src/views/udi/trace/task/index.vue
@@ -11,9 +11,8 @@
                          @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>
 
@@ -25,6 +24,7 @@
                 <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>
@@ -140,11 +140,12 @@
             </el-tag>
           </template>
         </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="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="produceDate" width="120" show-overflow-tooltip></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
@@ -497,7 +498,8 @@ export default {
       const statusMap = {
         1: "danger",
         2: "waring",
-        3: "success"
+        3: "success",
+        4: "danger",
 
       };
       return statusMap[status];
@@ -506,7 +508,8 @@ export default {
       const statusMap = {
         1: "未处理",
         2: "正在处理",
-        3: "已处理"
+        3: "已处理",
+        4: "已超时"
       };
       return statusMap[status];
     },