diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index bea6eae..5adaa63 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -165,10 +165,10 @@
- 国家同步库查询
-
+ 国家同步库查询
+
@@ -256,6 +256,7 @@ import {combineUdi} from "../../api/basic/udiRelevance";
import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
import {getInvbasdoc} from "../../api/basic/getErps";
import selectDiDetail from "@/views/basic/SelectDIDetailDialog";
+
export default {
name: "closeDialog",
props: {
@@ -291,6 +292,10 @@ export default {
thirdId: "",
keys: [],
thirdSys: null,
+ manufactory: null,
+ price: null,
+ erpName: null,
+ measname: null,
},
fromOptions: [],
checked: true,
@@ -341,29 +346,29 @@ export default {
this.total = 0;
});
},
- getSuperSeaech() {
- if (this.unionQuery.nameCode == "") {
- this.$message.warning("请输入查询条件");
- return;
- }
- this.loading = true;
- superSearch(this.unionQuery)
- .then((response) => {
- this.loading = false;
- if (response.code == 20000) {
- this.udidlList = response.data.list || [];
- this.total = response.data.total || 0;
- } else {
- this.$message.error(response.message);
- }
- })
- .catch(() => {
- this.loading = false;
- this.udidlList = [];
- this.total = 0;
- });
+ getSuperSeaech() {
+ if (this.unionQuery.nameCode == "") {
+ this.$message.warning("请输入查询条件");
+ return;
+ }
+ this.loading = true;
+ superSearch(this.unionQuery)
+ .then((response) => {
+ this.loading = false;
+ if (response.code == 20000) {
+ this.udidlList = response.data.list || [];
+ this.total = response.data.total || 0;
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ this.udidlList = [];
+ this.total = 0;
+ });
- },
+ },
checkSelectable(row) {
return !row.check;
},
@@ -436,6 +441,7 @@ export default {
}
this.combineQuery.manufactory = this.currentRow.manufactory;
this.combineQuery.price = this.currentRow.price;
+ this.combineQuery.measname = this.currentRow.measname;
combineUdi(this.combineQuery)
.then((response) => {
if (response.code == 20000) {
diff --git a/src/views/warehouse/selectProduct.vue b/src/views/warehouse/selectProduct.vue
index 5bcc72d..71244d7 100644
--- a/src/views/warehouse/selectProduct.vue
+++ b/src/views/warehouse/selectProduct.vue
@@ -301,9 +301,7 @@