From 66990e1ae5b6b5ba2cf08efbec56d7e814e8e6f2 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 13 Jul 2022 14:50:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8D=95?=
=?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=B8=8E=E4=BB=93=E5=BA=93=E8=81=94?=
=?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/business/stockOrder.vue | 9 +-
src/views/business/stockOrderDelSearch.vue | 17 +++-
src/views/business/stockOrderEditor.vue | 8 +-
src/views/business/stockOrderNew.vue | 7 +-
.../business/stockOrderNewDistribution.vue | 18 +++-
src/views/business/stockOrderSearch.vue | 6 +-
src/views/business/stockOrderWaitCheck.vue | 5 +
src/views/inout/IOAddOrder.vue | 92 ++++++++++++-------
src/views/inout/IOCheckErrorOrder.vue | 6 +-
src/views/inout/IOCheckWaitOrder.vue | 5 +
src/views/inout/IOFinishOrder.vue | 5 +
src/views/inout/IONewOrder.vue | 8 +-
12 files changed, 143 insertions(+), 43 deletions(-)
diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue
index d0610f0..0debc94 100644
--- a/src/views/business/stockOrder.vue
+++ b/src/views/business/stockOrder.vue
@@ -42,6 +42,7 @@
-
+
@@ -763,6 +765,7 @@ export default {
},
getBusType() {
let query = {
+ code: this.query.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
@@ -818,6 +821,10 @@ export default {
.catch(() => {
});
},
+ subInvChange() {
+ this.getBusType();
+ },
+
submitUploadDetail() {
this.$refs["dataForm"].validate(valid => {
if (valid) {
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 938f5a8..f1e3fdd 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -42,6 +42,7 @@
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
+
supplementOrder(row) {
this.$confirm('是否确认补单?', '提示', {
confirmButtonText: '确定',
@@ -890,7 +896,16 @@ export default {
let orderQuery = {
billNo: row.billNo
}
- supplementOrder(orderQuery);
+ this.loading = true;
+ supplementOrder(orderQuery).then((response) => {
+ this.loading = false;
+ if (response.code == 20000) {
+ this.getList();
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ });
}).catch(() => {
this.$message({
type: 'info',
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index e50232e..7dbcc2d 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -41,6 +41,7 @@
-
+
@@ -876,6 +878,7 @@ export default {
},
getBusType() {
let query = {
+ code: this.query.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
@@ -981,6 +984,9 @@ export default {
.catch(() => {
});
},
+ subInvChange() {
+ this.getBusType();
+ },
},
components: {
draggable,
diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index 6963dfd..b1cb71b 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -43,6 +43,7 @@
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
},
components: {
@@ -1000,7 +1005,7 @@ export default {
/**
解决el-input输入框 type=number时，输入中文光标上移问题
*/
-.el-input__inner{
+.el-input__inner {
line-height: 1px !important;
}
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 3899849..2a1e300 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -197,6 +197,7 @@
{
@@ -1154,6 +1156,7 @@ export default {
},
getBusType() {
let query = {
+ code: this.formData.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
@@ -1161,6 +1164,11 @@ export default {
this.busTypes = response.data.list || [];
if (this.$isNotBlank(this.formData.billType)) {
this.curAction = this.getActionItem(this.formData.billType);
+ if (this.curAction != null) {
+ } else {
+ this.curAction = {corpType:0,genUnit: false,changeEnable:false,};
+ this.formData.billType = null;
+ }
}
})
.catch(() => {
@@ -1220,15 +1228,18 @@ export default {
actionChange(item) {
this.curAction = this.getActionItem(item);
this.formData.corpName = '';
- this.locInChange();
- this.findMethod();
+ // this.locInChange();
+ // this.findMethod();
},
locInChange() {
this.$forceUpdate();
- this.getBusType();
+ // this.getBusType();
this.invChange();
this.findStorageMethod();
},
+ subStorageChange() {
+ this.getBusType();
+ },
invChange() {
if (this.$isNotBlank(this.formData.invWarehouseCode))
@@ -1246,6 +1257,7 @@ export default {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code;
+ this.getBusType();
}
})
.catch(() => {
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index 643dd9e..5b728db 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -42,6 +42,7 @@
{
if (valid) {
diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue
index b0de5af..4b1be5f 100644
--- a/src/views/business/stockOrderWaitCheck.vue
+++ b/src/views/business/stockOrderWaitCheck.vue
@@ -42,6 +42,7 @@
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
submitUploadDetail() {
this.$refs["dataForm"].validate(valid => {
if (valid) {
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 5872a29..24c2929 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -187,7 +187,7 @@
+ :disabled="corpOrderIdDisabled" @change="subStorageChange">
{
- this.busTypes = response.data.list || [];
- if (this.formData.action != null) {
- this.curAction = this.getActionItem(this.formData.action);
- if (this.curAction != null) {
- this.formData.vailInv = this.curAction.vailInv;
- this.formData.codeFillCheck = this.curAction.codeFillCheck;
+ this.busTypes = response.data.list || [];
+ if (this.formData.action != null) {
+ this.curAction = this.getActionItem(this.formData.action);
+ if (this.curAction != null) {
+ this.formData.vailInv = this.curAction.vailInv;
+ this.formData.codeFillCheck = this.curAction.codeFillCheck;
+ }
+ } else {
+ this.curAction = {corpType: 0, genUnit: false, changeEnable: false,};
+ this.formData.action = null;
}
-
-
}
- })
+ )
.catch(() => {
});
},
-
+ subStorageChange() {
+ this.getBusType();
+ },
geActionName(action) {
this.busTypes.forEach((obj) => {
if (obj.action == action) {
return obj.name;
}
});
- },
+ }
+ ,
locCHange() {
if (this.$isNotBlank(this.formData.invWarehouseCode)) {
@@ -905,7 +911,8 @@ export default {
}
this.findStorageMethod();
this.findSubInvByInv(this.formData.locStorageCode);
- },
+ }
+ ,
findMethod(query) {
console.log(query);
this.fromOptions = [];
@@ -942,7 +949,8 @@ export default {
.catch(() => {
this.loading = false;
});
- },
+ }
+ ,
findStorageMethod() {
if (this.formData.locStorageCode == null)
@@ -957,7 +965,8 @@ export default {
})
.catch(() => {
});
- },
+ }
+ ,
findSubStorageMethod() {
let cQuery = {
@@ -970,7 +979,8 @@ export default {
})
.catch(() => {
});
- },
+ }
+ ,
findSubInvByInv(invCode) {
@@ -982,12 +992,14 @@ export default {
.then((response) => {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
- // this.formData.invWarehouseCode = this.subInvList[0].code;
+ this.formData.invWarehouseCode = this.subInvList[0].code;
+ this.getBusType();
}
})
.catch(() => {
});
- },
+ }
+ ,
getStorage(event) {
@@ -998,14 +1010,16 @@ export default {
})
.catch(() => {
});
- },
+ }
+ ,
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].advanceType;
}
}
- },
+ }
+ ,
getActionItem(action) {
console.log("-----")
for (let i = 0; i < this.busTypes.length; i++) {
@@ -1014,7 +1028,8 @@ export default {
return this.busTypes[i];
}
}
- },
+ }
+ ,
actionChange(item) {
this.curAction = this.getActionItem(item);
this.findMethod();
@@ -1024,19 +1039,22 @@ export default {
this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
- },
+ }
+ ,
- //绑定数据
+//绑定数据
bindRl(val) {
console.log("curRow.erpId = " + val.id);
this.curRow = val;
this.selectRlVisible = true;
- },
+ }
+ ,
handleUnitClick(row) {
console.log("curRow.erpId = " + row.id);
this.curRow = row;
this.dialogTableVisible = true;
- },
+ }
+ ,
selectSupUnit(row) {
let query = {
id: this.curRow.id,
@@ -1054,7 +1072,8 @@ export default {
}).catch(() => {
});
- },
+ }
+ ,
selectBindRl(row) {
@@ -1082,12 +1101,14 @@ export default {
}).catch(() => {
});
- },
+ }
+ ,
closeBindDialog(val) {
console.log("closeBindDialog" + val);
this.selectRlVisible = false;
this.dialogTableVisible = false;
- },
+ }
+ ,
rowStyle({row, rowIndex}) {
let rowBackground = {};
@@ -1097,12 +1118,14 @@ export default {
}
return rowBackground;
- },
+ }
+ ,
},
- filters: {},
+ filters: {}
+ ,
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
@@ -1134,7 +1157,8 @@ export default {
};
inputer.focus();
- },
+ }
+ ,
created() {
this.formData.code = '';
this.formData.actDate = new Date();
@@ -1183,8 +1207,10 @@ export default {
}
- },
-};
+ }
+ ,
+}
+;
diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue
index 4035b3e..129e775 100644
--- a/src/views/inout/IOCheckErrorOrder.vue
+++ b/src/views/inout/IOCheckErrorOrder.vue
@@ -48,6 +48,7 @@
-
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
},
filters: {
statusFilterType(status) {
diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue
index 6518151..fe377c1 100644
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@@ -48,6 +48,7 @@
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
},
filters: {
statusFilterType(status) {
diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue
index 52a7ee8..123094d 100644
--- a/src/views/inout/IOFinishOrder.vue
+++ b/src/views/inout/IOFinishOrder.vue
@@ -49,6 +49,7 @@
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
}
,
filters: {
diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue
index 8ad3bec..66c3ab9 100644
--- a/src/views/inout/IONewOrder.vue
+++ b/src/views/inout/IONewOrder.vue
@@ -43,7 +43,9 @@
+ size="mini"
+ @change="subInvChange"
+ >
{
});
},
+ subInvChange() {
+ this.getBusType();
+ },
init() {
axios.get("./config.json").then(res => {
// 基础地址