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>
@@ -489,7 +489,7 @@