diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 808964a..c746453 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -490,7 +490,7 @@
是否禁用
+ >是否禁用{{editQuery.isDisable}}
是否寄售
@@ -1151,7 +1151,7 @@ export default {
},
diableChange() {
let query = {
- relId: this.editQuery.id
+ relId: this.pId
}
disableUdi(query)
.then((response) => {
@@ -1278,7 +1278,7 @@ export default {
})
.then(() => {
let query = {
- relId: this.editQuery.id,
+ relId: this.pId,
thirdSys: row.sysId
};
removeRl(query)
@@ -1421,6 +1421,7 @@ export default {
this.editDialogVisible = true;
this.editQuery = row;
this.pId=row.id;
+ this.pId=row.id;
this.relevanceEdit = {
id: row.id,
// thirdId: row.thirdId,
diff --git a/src/views/business/DialogcChangeNewOrder.vue b/src/views/business/DialogcChangeNewOrder.vue
index 476277c..c5d0074 100644
--- a/src/views/business/DialogcChangeNewOrder.vue
+++ b/src/views/business/DialogcChangeNewOrder.vue
@@ -238,7 +238,6 @@ export default {
fromOptions: [],
loading: false,
detailList: [],
- storageList: [],
detailLoading: false,
subInvList: [],
@@ -354,6 +353,7 @@ export default {
},
findSubStorageMethod() {
this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+ this.getBusType();
let cQuery = {
code: this.formData.invWarehouseCode,
filter: 2,
@@ -435,6 +435,7 @@ export default {
},
getBusType() {
let query = {
+ code: this.formData.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
@@ -445,15 +446,6 @@ export default {
.catch(() => {
});
},
- getStorage() {
- this.storageList = [];
- filterAllByUser()
- .then((response) => {
- this.storageList = response.data || [];
- })
- .catch(() => {
- });
- },
getStockOrderDetailList(orderId) {
let query = {
orderIdFk: orderId
@@ -482,9 +474,10 @@ export default {
let date = new Date();
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
}
+ this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
+ this.formData.locStorageCode = this.$store.getters.locInvCode;
this.getBusType();
this.findSubInvByInv(this.formData.locStorageCode);
- this.getStorage();
this.getStockOrderDetailList(this.curRow.id);
}
}
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index cf0a108..3f4cdec 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -871,6 +871,7 @@ export default {
}
},
getBusType() {
+ this.query.locStorageCode= this.subInvList.find(item => item.code == this.query.invWarehouseCode).parentId
let query = {
code: this.query.invWarehouseCode,
enabled: true,
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index 3717f8a..9fa22d2 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -946,6 +946,7 @@ export default {
},
getBusType() {
+ this.query.locStorageCode= this.subInvList.find(item => item.code == this.query.invWarehouseCode).parentId
let query = {
code: this.query.invWarehouseCode,
enabled: true,
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 86a3ba9..4001fa4 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -550,8 +550,10 @@ export default {
let tQuery = {
orderId: this.idQuery.id,
locStorageCode: this.formData.locStorageCode,
+ invStorageCode: this.formData.invStorageCode,
invWarehouseCode: this.formData.invWarehouseCode,
fromSubInvCode: this.formData.fromSubInvCode,
+ subInvCode: this.formData.subInvCode,
action: this.formData.action,
fromCorp: this.formData.fromCorp,
fromCorpId: this.formData.fromCorpId,
@@ -1005,11 +1007,6 @@ export default {
},
findSubStorageMethod(val) {
- this.subInvList.forEach(item => {
- if (item.code === val) {
- this.formData.locStorageCode = item.parentId;
- }
- });
this.getBusType();
let cQuery = {
code: this.formData.invWarehouseCode,
@@ -1229,6 +1226,8 @@ export default {
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
}
+ this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
+ this.formData.locStorageCode = this.$store.getters.locInvCode;
if (this.$isNotBlank(this.formData.locStorageCode)) {
this.findStorageMethod();
}
diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue
index e85f22d..980cbbc 100644
--- a/src/views/purchase/supCertAddDialog.vue
+++ b/src/views/purchase/supCertAddDialog.vue
@@ -377,9 +377,10 @@ export default {
};
if (this.inputQuery.formData == null) {
this.formData = {}
- } else this.formData = this.inputQuery.formData;
-
-
+ } else{
+ this.formData = this.inputQuery.formData;
+ console.log(this.inputQuery.formData);
+ }
if (this.formData.filePath != null) {
this.choiceFile = "更换文件";
} else {
diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue
index 2576fa8..15f40c1 100644
--- a/src/views/purchase/supCompanyEditDialog.vue
+++ b/src/views/purchase/supCompanyEditDialog.vue
@@ -449,8 +449,10 @@ export default {
created() {
if (this.editType == 0) {
this.inputQuery.customerId = getUUID("");
+ }else{
+ this.getCompanyCertList();
}
- this.getCompanyCertList();
+
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
@@ -576,7 +578,7 @@ export default {
,
addCert(row) {
- if (this.$isNotBlank(row)) {
+ if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
this.formName = 2
this.inputQuery.formData = row;
this.editTye = 2;