From bbf86a9ed964c4aaa459bdc9dd75aaea767e989b Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Mon, 27 Nov 2023 20:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=8A=9F=E8=83=BD=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/basicUnitMaintain.js            |  9 ++++++++
 src/api/basic/product/udiInfo.js              |  8 +++++++
 src/api/basic/product/udiRelevance.js         |  8 +++++++
 src/api/basic/udiRelevance.js                 |  8 +++++++
 .../basic/product/UdiInfoSelectLocalUdi.vue   | 22 +++++++++----------
 src/views/basic/product/product.vue           | 22 +++++++++----------
 6 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js
index ed2224b..34340e3 100644
--- a/src/api/basic/basicUnitMaintain.js
+++ b/src/api/basic/basicUnitMaintain.js
@@ -7,6 +7,15 @@ export function getBasicUnitMaintains(query) {
     params: query
   });
 }
+
+export function getBasicUnitMaintainsOptimize(query) {
+    return axios({
+        url: "/udiwms/basic/unit/maintain/filterOptimize",
+        method: "get",
+        params: query
+    });
+}
+
 export function getCorpFilter(query) {
   return axios({
     url: "/sale/info/company/product/corp/filter",
diff --git a/src/api/basic/product/udiInfo.js b/src/api/basic/product/udiInfo.js
index b8db673..481d302 100644
--- a/src/api/basic/product/udiInfo.js
+++ b/src/api/basic/product/udiInfo.js
@@ -16,6 +16,14 @@ export function filterCompany(query) {
   });
 }
 
+export function filterCompanyOptimize(query) {
+  return axios({
+    url: "/udiwms/udiinfo/filterCompanyOptimize",
+    method: "get",
+    params: query
+  });
+}
+
 export function filterByUuid(query) {
   return axios({
     url: "/udiwms/udiinfo/local/filterByUuid",
diff --git a/src/api/basic/product/udiRelevance.js b/src/api/basic/product/udiRelevance.js
index 89b726e..d95fb27 100644
--- a/src/api/basic/product/udiRelevance.js
+++ b/src/api/basic/product/udiRelevance.js
@@ -160,6 +160,14 @@ export function sysFilter(query) {
   });
 }
 
+export function sysFilterOptimize(query) {
+  return axios({
+    url: "/udiwms/udirel/thirdSys/filterOptimize",
+    method: "get",
+    params: query
+  });
+}
+
 export function spcombie(query) {
   return axios({
     url: "/udiwms/udiinfo/spcombie",
diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js
index ae9e830..ff27638 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -150,6 +150,14 @@ export function sysFilter(query) {
   });
 }
 
+export function sysFilterOptimize(query) {
+  return axios({
+    url: "/udiwms/udirel/thirdSys/filterOptimize",
+    method: "get",
+    params: query
+  });
+}
+
 export function spcombie(query) {
   return axios({
     url: "/udiwms/udiinfo/spcombie",
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 00c2bd3..1e3917f 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -38,9 +38,9 @@
                   clearable>
                   <el-option
                     v-for="item in options[item.clickFuc]"
-                    :key="item.filterType"
-                    :label="item.sysName"
-                    :value="item.filterType"
+                      :key="item.code"
+                      :label="item.label"
+                      :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -489,7 +489,7 @@
 </template>
 
 <script>
-import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
+import {getUdiInfos, filterCompanyOptimize} from "@/api/basic/product/udiInfo";
 import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
@@ -558,7 +558,9 @@ export default {
       tableHeader:[],
       queryList:[],
       fromList:[],
-      options:[],
+      options:{
+        findMethod:[]
+      },
       total: 0,
       currentRow: null,
       fromOptions: [],
@@ -828,18 +830,14 @@ export default {
         page: 1,
         limit: 10,
       };
-      filterCompany(cQuery)
+      filterCompanyOptimize(cQuery)
         .then((response) => {
           _this.options.loading = false;
-          _this.options = {
-            findMethod: response.data || []
-          };
+          _this.options.findMethod = response.data.list || [];
         })
         .catch(() => {
           _this.options.loading = false;
-          _this.options = {
-            findMethod:  []
-          };
+          _this.options.findMethod = []
         });
     },
     executeFuc(row,number,type,clickFuc,value){
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 1f35941..5abd54e 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -79,9 +79,9 @@
                     clearable>
                     <el-option
                       v-for="item in options[item.clickFuc]"
-                      :key="item.filterType"
-                      :label="item.sysName"
-                      :value="item.filterType"
+                       :key="item.code"
+                       :label="item.label"
+                       :value="item.code"
                     />
                   </el-select>
                 </el-form-item>
@@ -1705,7 +1705,7 @@ import {
   uploadSmp,
   thirdSysDetail,
   removeRl,
-  sysFilter,
+  sysFilterOptimize,
   spcombie,
   lockStatus,
   removeDiRl,
@@ -1815,7 +1815,9 @@ export default {
       detailList: [],
       sysList: [],
       filterList: [],
-      options: {},
+      options: {
+        getSysFilter:[]
+      },
       queryList:[],
       tableHeader:[],
       fromList:[],
@@ -2214,18 +2216,14 @@ export default {
     },
 
     getSysFilter(_this,query) {
-      sysFilter()
+      sysFilterOptimize()
         .then((response) => {
           _this.loading = false;
-          _this.options = {
-            getSysFilter: response.data.list || []
-          };
+           _this.options.getSysFilter = response.data.list || []
         })
         .catch(() => {
           _this.loading = false;
-          _this.options = {
-            getSysFilter: []
-          };
+          _this.options.getSysFilter =  []
         });
     },
     singleDiEdit() {