From 3354a47a9014f70fa513d0f039906681c28b010d Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 1 Jun 2023 10:56:11 +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/api/udi/udiTrace.js                  |  8 ++++++++
 src/views/udi/trace/search/index.vue     | 17 ++++++++++------
 src/views/udi/trace/searchLive/index.vue | 25 ++++++++++++++----------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/api/udi/udiTrace.js b/src/api/udi/udiTrace.js
index dba6131..d38d0c7 100644
--- a/src/api/udi/udiTrace.js
+++ b/src/api/udi/udiTrace.js
@@ -72,6 +72,14 @@ export function sourceSearch(query) {
   });
 }
 
+export function filterylqxzcrbarmc(query) {
+  return axios({
+    url: "/udi/basic/dict/filterylqxzcrbarmc",
+    method: "get",
+    params: query
+  });
+}
+
 
 //任务列 表
 export function getTraceTaskList(query) {
diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index d4fea9a..fced5fd 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -98,6 +98,9 @@
                     remote
                     style="width: 100%"
                     clearable="true"
+                    :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
+                                filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
+                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                     reserve-keyword
                     placeholder="请输入DI"
                     :remote-method="getNameCodeList"
@@ -120,9 +123,10 @@
                     placeholder="请输入批次号"
                     style="width: 100%"
                     clearable="true"
-                    :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
+                    :disabled="filterQuery.nameCode==null || filterQuery.nameCode=='' ||
+                                filterQuery.ggxh==null || filterQuery.ggxh=='' ||
                                 filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
-                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
+                                filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -385,8 +389,9 @@
 
 <script>
 
-import {filterCpmctymc, filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
-import {filterCompany} from "@/api/basic/udiInfo";
+import {filterylqxzcrbarmc,filterCpmctymc,
+  filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
+
 
 export default {
   data() {
@@ -520,10 +525,10 @@ export default {
         page: 1,
         limit: 10,
       };
-      filterCompany(cQuery)
+      filterylqxzcrbarmc(cQuery)
         .then((response) => {
           this.loading = false;
-          this.fromOptions = response.data || [];
+          this.fromOptions = response.data.list || [];
           console.log(this.fromOptions)
         })
         .catch(() => {
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index 6d970fb..801283d 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -14,7 +14,7 @@
               <el-col type="flex" :span="6">
                 <el-form-item label="当前所在企业:" class="query-form-item">
                   <el-select
-                    v-model="filterQuery.companyName"
+                    v-model="filterQuery.companyId"
                     filterable
                     remote
                     style="width: 100%"
@@ -26,9 +26,9 @@
                   >
                     <el-option
                       v-for="item in companyNameList"
-                      :key="item.companyName"
+                      :key="item.id"
                       :label="item.companyName"
-                      :value="item.companyName"
+                      :value="item.id"
                     >
                     </el-option>
                   </el-select>
@@ -121,6 +121,9 @@
                     remote
                     style="width: 100%"
                     clearable="true"
+                    :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
+                                filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
+                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                     reserve-keyword
                     placeholder="请输入DI"
                     :remote-method="getNameCodeList"
@@ -143,9 +146,10 @@
                     placeholder="请输入批次号"
                     style="width: 100%"
                     clearable="true"
-                    :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
+                    :disabled="filterQuery.nameCode==null || filterQuery.nameCode=='' ||
+                                filterQuery.ggxh==null || filterQuery.ggxh=='' ||
                                 filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
-                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
+                                filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -408,8 +412,8 @@
 
 <script>
 
-import {filterCpmctymc, filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
-import {filterCompany} from "@/api/basic/udiInfo";
+import {filterylqxzcrbarmc,filterCpmctymc, filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
+
 
 export default {
   data() {
@@ -421,7 +425,8 @@ export default {
         ggxh: null,
         nameCode: null,
         batchNo: null,
-        companyName: "",
+        companyName: null,
+        companyId: null,
         page: 1,
         limit: 10,
       },
@@ -549,10 +554,10 @@ export default {
         page: 1,
         limit: 10,
       };
-      filterCompany(cQuery)
+      filterylqxzcrbarmc(cQuery)
         .then((response) => {
           this.loading = false;
-          this.fromOptions = response.data || [];
+          this.fromOptions = response.data.list || [];
           console.log(this.fromOptions)
         })
         .catch(() => {