From 94c66184f2a256ee442a5c0e34d8fdc5e4eb04f2 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 25 Jun 2023 16:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E9=9A=8F=E6=9F=A5=E8=AF=A2=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/udi/trace/search/index.vue     | 27 +++++++++++------
 src/views/udi/trace/searchLive/index.vue | 37 ++++--------------------
 src/views/udi/trace/task/index.vue       | 11 +++----
 3 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index aa50614..bf185eb 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -141,7 +141,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
           </el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="getList" size="mini"
+          <el-button type="primary" icon="el-icon-search" @click="getList" size="mini" :loading="searchIng"
           >查询
           </el-button
           >
@@ -466,19 +466,25 @@
                     style="width: 100%"
                     border highlight-current-row>
             <el-table-column label="序号" type="index"></el-table-column>
+
+            <!--            <el-table-column label="单据源头类型" prop="sourceType" width="100"-->
+            <!--                             :formatter="formaterSourceType"></el-table-column>-->
+            <!--            <el-table-column label="出入库类型" prop="inOutType" width="100"-->
+            <!--                             :formatter="formaterInOutType"></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"></el-table-column>
             <el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
-            <el-table-column label="单据源头类型" prop="sourceType" width="100"
-                             :formatter="formaterSourceType"></el-table-column>
-            <el-table-column label="出入库类型" prop="inOutType" width="100"
-                             :formatter="formaterInOutType"></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="companyIdFk" width="220"
+            <el-table-column label="上报企业" prop="companyIdFk" width="220"
                              :formatter="formatCompanyName"></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>-->
@@ -770,7 +776,8 @@ export default {
       companyNameList: [],
       formateCompanyName: null,
       formateInOutType: null,
-      formateSourceType: null
+      formateSourceType: null,
+      searchIng: false,
     }
   },
   methods: {
@@ -831,9 +838,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) {
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index b743a9d..996195b 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -498,44 +498,19 @@
                     style="width: 100%"
                     border highlight-current-row>
             <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="社会统一信用号" prop="creditNum" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="批次号" prop="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="sourceType" width="100"
-                             :formatter="formaterSourceType"></el-table-column>
-            <el-table-column label="出入库类型" prop="inOutType" width="100"
-                             :formatter="formaterInOutType"></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="companyIdFk" width="220"
+            <el-table-column label="上报企业" prop="companyIdFk" width="220"
                              :formatter="formatCompanyName"></el-table-column>
-
-            <!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
-            <!--        <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
-                    <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
-                    <el-table-column label="单据类型" prop="billType" width="150"></el-table-column>
-                    <el-table-column label="客户端类型" prop="clientType" width="150"></el-table-column>
-                    <el-table-column label="当前企业统一社会信用号" prop="companyCertNum" width="200"></el-table-column>
-                    <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
-                    <el-table-column label="单据创建者" prop="createUser" width="150"></el-table-column>
-                    <el-table-column label="销毁原因" prop="destoryReason" width="150"></el-table-column>
-                    <el-table-column label="执行销毁人证件号" prop="excuseCode" width="150"></el-table-column>
-                    <el-table-column label="执行销毁人" prop="excuseUser" width="150"></el-table-column>
-                    <el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
-                    <el-table-column label="发货企业统一社会信用号" prop="fromCorpCreditNum" width="200"></el-table-column>
-                    <el-table-column label="出入库类型" prop="inOutType" width="150" :formatter="formaterInOutType"></el-table-column>
-                    <el-table-column label="退货原因" prop="returnReason" width="150"></el-table-column>
-                    <el-table-column label="单据源头类型" prop="sourceType" width="150" :formatter="formaterSourceType"></el-table-column>
-                    <el-table-column label="监督人证件号" prop="superviserCode" width="150"></el-table-column>
-                    <el-table-column label="监督人姓名" prop="superviserUser" width="150"></el-table-column>
-                    <el-table-column label="收货企业" prop="toCorp" width="150"></el-table-column>
-                    <el-table-column label="收货企业统一社会信用号" prop="toCorpCreditNum" width="200"></el-table-column>
-                    <el-table-column label="使用者信息" prop="toUserInfo" width="150"></el-table-column>
-                    <el-table-column label="更新时间" prop="updateTime" width="220"></el-table-column>
-                    <el-table-column label="上传人" prop="uploadUser" width="220"></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
diff --git a/src/views/udi/trace/task/index.vue b/src/views/udi/trace/task/index.vue
index 3385373..0a38181 100644
--- a/src/views/udi/trace/task/index.vue
+++ b/src/views/udi/trace/task/index.vue
@@ -140,10 +140,11 @@
             </el-tag>
           </template>
         </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="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>
@@ -385,11 +386,11 @@ export default {
     formatTaskType(row) {
       switch (row.taskType) {
         case 1:
-          return '生产订单';
+          return '生产单据';
         case 2:
-          return '入库订单';
+          return '出入库单据';
         case 3:
-          return '出库订单';
+          return '出入库单据';
         default:
           return '任务类型有误！！';
       }