From 25731d637682e97255fefc7c2a4cc1e1f2f4a60a Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Wed, 31 May 2023 15:30:38 +0800
Subject: [PATCH] =?UTF-8?q?UDI=E6=9F=A5=E8=AF=A2=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=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     | 37 +++++++++++++++++++++---
 src/views/udi/trace/searchLive/index.vue | 21 ++++++++++++--
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index 4f6b32f..56be1bc 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -150,9 +150,10 @@
         <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="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="companyIdFk" width="220" :formatter="formatCompanyName"></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>
 
@@ -343,7 +344,7 @@
 
 <script>
 
-import {filterCpmctymc, filterGgxh, filterNameCode, sourceSearch} from "@/api/udi/udiTrace";
+import {filterCpmctymc, filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
 import {filterCompany} from "@/api/basic/udiInfo";
 
 export default {
@@ -369,11 +370,31 @@ export default {
       fromOptions: [],
       cpmctymcList: [],
       ggxhList: [],
-      nameCodeList: []
+      nameCodeList: [],
+      companyNameList: []
     }
   },
   methods: {
+    formatCompanyName(row){
+      let temp =  this.companyNameList.find(item=>{
+        return item.id == row.companyIdFk
+      })
+
+      return temp && temp.companyName
+    },
+    getCompanyName(){
+      let cQuery = {
+        page: 1,
+        limit: 10,
+      };
+      filterCompanyName(cQuery).then((res) => {
+        this.companyNameList = res.data.list || [];
+        console.log(this.companyNameList)
+      })
+    },
     ggxhChange() {
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getNameCodeList()
     },
     getNameCodeList(query) {
@@ -391,6 +412,9 @@ export default {
       })
     },
     cpmctymcChange() {
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getGgxhList()
     },
     getGgxhList(query) {
@@ -407,6 +431,10 @@ export default {
       })
     },
     ylqxzcrbarmcChange() {
+      this.filterQuery.cpmctymc = null
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getCpmctymcList()
     },
     getCpmctymcList(query) {
@@ -464,7 +492,7 @@ export default {
         page: 1,
         limit: 10,
       };
-      //this.list = null
+      this.list = null
       //this.total = 0
     },
     onSubmit() {
@@ -493,6 +521,7 @@ export default {
     },
   },
   created() {
+    this.getCompanyName()
   }
 }
 </script>
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index e272a1a..8889a35 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -175,7 +175,7 @@
         <el-table-column label="单据类型" prop="billType" 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="companyIdFk" width="220" :formatter="formatCompanyName"></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>
 
@@ -397,6 +397,13 @@ export default {
     }
   },
   methods: {
+    formatCompanyName(row){
+      let temp =  this.companyNameList.find(item=>{
+        return item.id == row.companyIdFk
+      })
+
+      return temp && temp.companyName
+    },
     geCompanyNameList(query) {
       let cQuery = {
         companyName: query,
@@ -414,6 +421,8 @@ export default {
         });
     },
     ggxhChange() {
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getNameCodeList()
     },
     getNameCodeList(query) {
@@ -431,6 +440,9 @@ export default {
       })
     },
     cpmctymcChange() {
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getGgxhList()
     },
     getGgxhList(query) {
@@ -447,6 +459,10 @@ export default {
       })
     },
     ylqxzcrbarmcChange() {
+      this.filterQuery.cpmctymc = null
+      this.filterQuery.ggxh = null
+      this.filterQuery.nameCode = null
+      this.filterQuery.batchNo = null
       this.getCpmctymcList()
     },
     getCpmctymcList(query) {
@@ -504,7 +520,7 @@ export default {
         page: 1,
         limit: 10,
       };
-      //this.list = null
+      this.list = null
       //this.total = 0
     },
     onSubmit() {
@@ -533,6 +549,7 @@ export default {
     },
   },
   created() {
+    this.geCompanyNameList()
   }
 }
 </script>