From 22ddfe3d87a70681ed4d265291123ff321c5991f Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 27 Jul 2022 16:05:27 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/BussinessTypeThird.vue | 6 +--
.../business/stockOrderNewDistribution.vue | 54 +++++++++++--------
src/views/thrsys/SysUdimsConfig.vue | 11 +++-
src/views/thrsys/SysUdimsData.vue | 5 +-
src/views/thrsys/SysUdimsDownloadData.vue | 2 +-
5 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index 061a71c..9d7d7fa 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -29,7 +29,7 @@
查询
新增
@@ -58,7 +58,7 @@
编辑
删除
{{ item.name }}
{{ item.code }}
@@ -153,9 +154,9 @@
-
-
@@ -531,6 +532,7 @@ export default {
},
methods: {
saveOrder(status) {
+
this.code = "";
this.$refs.multipleTable.setCurrentRow();
this.currentRow = {};
@@ -646,7 +648,6 @@ export default {
}
},
findStorageMethod(query) {
- console.log(query);
if (this.formData.locStorageCode == null)
return;
this.fromStorageOptions = [];
@@ -708,12 +709,10 @@ export default {
if (status == '3') {
tQuery.subErpOrders.forEach((obj) => {
obj.reCount = obj.count;
- console.log(obj.reCount);
});
}
- console.log(tQuery);
insertStockOrderWeb(tQuery)
.then(response => {
this.loading = false;
@@ -770,8 +769,8 @@ export default {
this.$message.error("往来信息和单据类型不能为空！")
return;
}
- if (isBlank(this.formData.invWarehouseCode)) {
- this.$message.error("当前分库未选择！");
+ if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
+ this.$message.error("当前仓库和当前分库不能为空！");
return;
}
this.code = "";
@@ -798,13 +797,10 @@ export default {
this.invQueryData = {
locStorageCode: this.formData.corpId,
};
- console.log("his.invQueryData " + this.invQueryData.locStorageCode);
this.selectInvProductVisible = true;
} else {
this.selectProductVisible = true;
}
-
-
return;
}
this.code = this.code.trim();
@@ -826,7 +822,6 @@ export default {
stockOrderDetailQueryProduct(tQuery).then((response) => {
this.loading = false;
- console.log(response)
if (response.code === 20000) {
if (response.data.getType === "1") {
this.loading = true;
@@ -880,7 +875,6 @@ export default {
rData.forEach((obj, index) => {
this.codeArray.unshift(obj);
});
- console.log(this.codeArray);
this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
this.currentRow = this.codeArray[0];
this.selectedIndex = 0;
@@ -1140,7 +1134,6 @@ export default {
this.loading = true;
stockOrderDetail(this.query) //查找该单号下的所有条码
.then((response) => {
- console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
@@ -1154,6 +1147,23 @@ export default {
intentBack() {
this.$router.go(-1);
},
+ // generateBillNo() {
+ // let tQuery = {
+ // action: this.formData.billType
+ // }
+ // this.loading = true;
+ // stockOrderGenerateBillNo(tQuery)
+ // .then((response) => {
+ // this.loading = false;
+ // if (response.code === 20000) {
+ // this.formData.billNo = response.data;
+ // // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
+ // this.formData.billdate = new Date();
+ // } else {
+ // this.closeDialog(true);
+ // }
+ // });
+ // },
getBusType() {
let query = {
code: this.formData.invWarehouseCode,
@@ -1175,15 +1185,11 @@ export default {
});
},
selectOne(event) {
-
this.formData.corpName = event.name;
this.formData.corpId = event.erpId;
this.formData.unitIdFk = event.erpId;
- // console.log("this.inputQuery.companyId" + item);
- console.log("this.inputQuery.companyId" + event.erpId);
},
findMethod(query) {
- console.log(query);
this.fromOptions = [];
let cQuery = {
key: query,
@@ -1228,23 +1234,25 @@ export default {
actionChange(item) {
this.curAction = this.getActionItem(item);
this.formData.corpName = '';
+
if (this.$isNotBlank(this.formData.fromSubInvCode)) {
this.formData.fromSubInvCode = '';
}
+ // '';
this.locInChange();
this.findMethod();
},
locInChange() {
this.$forceUpdate();
// this.getBusType();
- // this.invChange();
+ this.invChange();
this.findStorageMethod();
},
+
subStorageChange() {
this.getBusType();
},
invChange() {
-
if (this.$isNotBlank(this.formData.invWarehouseCode))
this.formData.invWarehouseCode = null;
this.findSubInvs();
@@ -1303,7 +1311,7 @@ export default {
this.formData.billdate = new Date();
// this.generateBillNo();
}
-
+ this.findMethod();
this.getBusType();
this.getStorage();
this.findSubInvByInv();
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 23294e5..b72e0bb 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -229,7 +229,7 @@
移除
{
obj.outChange = false;
- this.checkedBusTypes.push(obj);
+ let isPut = true;
+ for (let i = 0; i < this.checkedBusTypes.length; i++) {
+ if (this.checkedBusTypes[i].action == obj.action) {
+ isPut = false;
+ }
+ }
+ if (isPut)
+ this.checkedBusTypes.push(obj);
});
this.addBusDialogVisible = false;
},
diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue
index 69f04ce..4616f2e 100644
--- a/src/views/thrsys/SysUdimsData.vue
+++ b/src/views/thrsys/SysUdimsData.vue
@@ -6,7 +6,7 @@
-
+
@@ -214,8 +214,9 @@ export default {
path: "",
});
this.filterQuery = {
+ syncTime: null,
id: null,
- status: "1",
+ status: null,
page: 1,
limit: 20,
};
diff --git a/src/views/thrsys/SysUdimsDownloadData.vue b/src/views/thrsys/SysUdimsDownloadData.vue
index d2747cd..790f565 100644
--- a/src/views/thrsys/SysUdimsDownloadData.vue
+++ b/src/views/thrsys/SysUdimsDownloadData.vue
@@ -6,7 +6,7 @@
-
+