From f2fcc3d858b9f580e899438d599f08d9a53d84a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 17 Jan 2023 17:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/BasicEntrutsReceModify.vue | 25 ++++++++++++++++++-
src/views/basic/CorpMaintain.vue | 1 +
src/views/basic/CorpRelevance.vue | 9 +++++--
src/views/basic/UdiInfoManage.vue | 1 +
.../inventory/InvPreInProductsDetail.vue | 2 +-
src/views/inventory/invPreInProducts.vue | 4 +--
src/views/thrsys/ThrProductsCheck.vue | 1 +
src/views/userManage/customerManage.vue | 2 +-
src/views/warehouse/AdditionalOrder.vue | 19 +++-----------
src/views/warehouse/IOCheckErrOrder.vue | 2 +-
src/views/warehouse/addHosOrder.vue | 25 +++++++++++++++++--
11 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index ee75e40..6cf2159 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -86,7 +86,7 @@
生成单据类型:
-
+
item.code == code).parentId
+ this.$set(this.inputQuery, "entrustAction", "");
+ this.$set(this.inputQuery, "entrustUser", "");
+ let query = {
+ code: this.inputQuery.entrustSubInv,
+ }
+ //加载用户数据
+ warehouseUserList(query).then((res) => {
+ this.entrustUserArray = [];
+ this.entrustUserArray = res.data.list;
+ }).catch((error) => {
+ this.$message.error("用户数据加载失败")
+ });
+
+ //加载单据类型数据
+ warehouseBussinessTypeList(query).then((res) => {
+ this.entrustBusArray = res.data.list;
+
+ }).catch((error) => {
+ this.$message.error("单据类型数据加载失败")
+ });
+ },
entrustActionChange() {
this.inputQuery.entrustUser = "";
},
diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue
index e0eb40f..fcf1e36 100644
--- a/src/views/basic/CorpMaintain.vue
+++ b/src/views/basic/CorpMaintain.vue
@@ -427,6 +427,7 @@ export default {
this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
this.list = response.data.page.list || [];
this.total = response.data.page.total || 0;
+ console.log(this.query)
})
.catch(() => {
this.loading = false;
diff --git a/src/views/basic/CorpRelevance.vue b/src/views/basic/CorpRelevance.vue
index c3c2af3..395bb00 100644
--- a/src/views/basic/CorpRelevance.vue
+++ b/src/views/basic/CorpRelevance.vue
@@ -78,7 +78,7 @@
- 查询
+ 查询
选入
@@ -162,12 +162,17 @@ export default {
this.getList();
},
handleErppageChange(val) {
- this.erpQuery.page = val;
+ this.erpQuery.page = 1;
this.getErpList();
},
checkSelectable(row) {
return !row.checked;
},
+ reSearch(){
+ this.unitQuery.page=1
+ this.getList();
+ },
+
getList() {
this.loading = true;
this.unitQuery.thirdSys = this.thirdSysFk;
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 96b3340..146e6b4 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -1316,6 +1316,7 @@ export default {
},
removeErp(row) {
+ debugger
this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index 062f176..d134c61 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -186,7 +186,7 @@ export default {
},
getCodeList() {
this.loading = true;
- this.query.orderIdFk = this.idQuery.orderIdFk;
+ this.query.id = this.idQuery.id;
// let query = {
// orderIdFk: this.idQuery.orderIdFk,
// code:this.query.code,
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index cbd2800..0744e98 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -88,8 +88,7 @@
-
+
{
this.loading = false;
diff --git a/src/views/thrsys/ThrProductsCheck.vue b/src/views/thrsys/ThrProductsCheck.vue
index e8c009f..1d0d456 100644
--- a/src/views/thrsys/ThrProductsCheck.vue
+++ b/src/views/thrsys/ThrProductsCheck.vue
@@ -250,6 +250,7 @@ export default {
this.getList();
},
checDialog(row) {
+ this.remark=null;
this.checkVisible = true;
this.curRow = row;
},
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index 747aeef..14c8667 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -419,7 +419,7 @@ export default {
limit: 20,
};
this.getList();
- this.filterQuery.page=null;
+ this.filterQuery.page=1;
},
formSubmit() {
this.formData.roleId = this.check;
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 5e497e5..20bf14e 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -26,20 +26,7 @@
-
-
- {{ item.name }}
-
-
-
-
-
{
@@ -590,7 +577,7 @@ export default {
};
},
created() {
- this.getStorage();
+ this.invChange();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 9ca62de..321b1e9 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -971,7 +971,7 @@ export default {
});
},
tableRowClassName({row, rowIndex}) {
- if (row.erpCount === row.count) {
+ if (row.reCount === row.count) {
return "success-row";
} else {
return "warning-row";
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 265cf28..5fb02af 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -543,7 +543,20 @@ export default {
this.$message.error('未添加条码');
return;
}
+ if (this.formData.action == null || this.formData.action == '') {
+ this.$message.error('未选择扫码单据类型');
+ return
+ }
+ debugger
+ if (this.formData.fromCorp == null || this.formData.fromCorp == '') {
+ this.$message.error('往来信息不能为空');
+ return
+ }
+ if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
+ this.$message.error('当前分库不能为空');
+ return;
+ }
let tQuery = {
orderId: this.idQuery.id,
locStorageCode: this.formData.locStorageCode,
@@ -576,7 +589,10 @@ export default {
this.$message.error('未选择扫码单据类型');
return
}
-
+ if (this.formData.fromCorp == null || this.formData.fromCorp == '') {
+ this.$message.error('往来信息不能为空');
+ return
+ }
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空');
@@ -697,7 +713,10 @@ export default {
return;
}
}
-
+ if (this.formData.fromCorp == null || this.formData.fromCorp == '') {
+ this.$message.error('往来信息不能为空');
+ return
+ }
if (this.$isBlank(this.formData.corpOrderId)) {
let date = new Date();
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
@@ -866,6 +885,7 @@ export default {
this.query.orderId = this.idQuery.id;
errorCodeList(this.query) //查找该单号下的所有条码
.then((response) => {
+ debugger
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) {
@@ -1186,6 +1206,7 @@ export default {
},
created() {
+ debugger
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];