From cba58fec93264054e29d339bdc3d97bac0c65d47 Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Mon, 27 Nov 2023 19:51:01 +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            | 12 ++++++++--
 src/api/basic/product/udiInfo.js              |  9 ++++++++
 src/api/basic/udiRelevance.js                 |  8 +++++++
 src/utils/customConfig.js                     |  4 +++-
 .../basic/product/UdiInfoSelectLocalUdi.vue   | 23 +++++++++----------
 src/views/basic/product/product.vue           | 12 ++++------
 src/views/basic/product/udiInfoManageSp.vue   | 23 +++++++++++--------
 7 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js
index f47bee75..6a347a20 100644
--- a/src/api/basic/basicUnitMaintain.js
+++ b/src/api/basic/basicUnitMaintain.js
@@ -1,13 +1,21 @@
 import axios from "@/utils/request";
 
-export function getBasicUnitMaintains(query) {
+export function getBasicUnitMaintainsOptimize(query) {
     return axios({
-        url: "/udiwms/basic/unit/maintain/filter",
+        url: "/udiwms/basic/unit/maintain/filterOptimize",
         method: "get",
         params: query
     });
 }
 
+export function getBasicUnitMaintains(query) {
+  return axios({
+    url: "/udiwms/basic/unit/maintain/filter",
+    method: "get",
+    params: query
+  });
+}
+
 export function getCorrespondence(query) {
   return axios({
     url: "/udiwms/basic/unit/maintain/filter2",
diff --git a/src/api/basic/product/udiInfo.js b/src/api/basic/product/udiInfo.js
index 7ca8bc18..54a6c53a 100644
--- a/src/api/basic/product/udiInfo.js
+++ b/src/api/basic/product/udiInfo.js
@@ -1,4 +1,5 @@
 import axios from "@/utils/request";
+import { sysFilterOptimize } from '../udiRelevance'
 
 export function getUdiInfos(query) {
   return axios({
@@ -16,6 +17,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/udiRelevance.js b/src/api/basic/udiRelevance.js
index d17afd06..02ec8457 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -168,6 +168,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/utils/customConfig.js b/src/utils/customConfig.js
index 7ccea2be..695435c6 100644
--- a/src/utils/customConfig.js
+++ b/src/utils/customConfig.js
@@ -60,7 +60,9 @@ export function executeFuc(_this,row,number,type,clickFuc,value){
     }
   }else if("4" == type){
     //颜色方法
-    return getColer(clickFuc,value);
+    if(clickFuc) {
+      return getColer(clickFuc, value);
+    }
   }else if("5" == type){
     //查询input方法
     if(clickFuc){
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 0654f804..c1cac292 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: [],
@@ -595,6 +597,7 @@ export default {
       this.filterQuery.cpmctymc = null;
     },
     searchList() {
+      console.log(this.options)
       this.filterQuery.page = 1;
       this.getList();
     },
@@ -824,18 +827,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 4a3dad9e..a2f3400b 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1843,7 +1843,9 @@ export default {
       detailList: [],
       sysList: [],
       filterList: [],
-      options: {},
+      options: {
+        getSysFilter:[]
+      },
       queryList:[],
       tableHeader:[],
       fromList:[],
@@ -2250,15 +2252,11 @@ export default {
       sysFilter()
         .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() {
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 88fd60c6..b5c4aeaa 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -28,7 +28,7 @@
             </el-form-item>
             <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery[item.columnName]"
+                v-model="filterQuery[`${item.columnName}`]"
                 :placeholder="item.columnDesc"
                 :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
@@ -37,9 +37,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>
@@ -336,12 +336,12 @@ import {
   updateErpProduct,
   uploadSmp,
   thirdSysDetail,
-  removeRl, sysFilter, spcombie, lockStatus
+  removeRl, sysFilter,sysFilterOptimize, spcombie, lockStatus
 } from "@/api/basic/udiRelevance";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {filterByUuid, filterCompany} from "@/api/basic/udiInfo";
 import {filterCompanyProductRelevance, deleteCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
+import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain"
 import selectProduct from "./basicCompanyProductsImport";
 import selectUdi from "./udiInfoRelevance.vue";
 import selectErp from "./udiInfoselectErpUdi";
@@ -392,7 +392,10 @@ export default {
       detailList: [],
       sysList: [],
       filterList: [],
-      options: {},
+      options: {
+        findMethod:[],
+        getSysFilter:[],
+      },
       queryList:[],
       tableHeader:[],
       fromList:[],
@@ -725,7 +728,7 @@ export default {
         });
     },
     getSysFilter(_this,query) {
-      sysFilter()
+      sysFilterOptimize()
         .then((response) => {
           _this.loading = false;
           _this.options.getSysFilter = response.data.list || [];
@@ -836,10 +839,10 @@ export default {
         page: 1,
         limit: 10,
       };
-      getBasicUnitMaintains(cQuery)
+      getBasicUnitMaintainsOptimize(cQuery)
         .then((response) => {
           _this.loading = false;
-          _this.options.findMethod = response.data.list || []
+          _this.options.findMethod = response.data.list || [];
         })
         .catch(() => {
           _this.loading = false;