bug修改,单据类型与仓库联动问题

fengcang
anthonyywj2 3 years ago
parent 37c5637c08
commit 66990e1ae5

@ -42,6 +42,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -255,7 +256,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
@ -763,6 +765,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -818,6 +821,10 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
submitUploadDetail() { submitUploadDetail() {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {

@ -42,6 +42,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -798,6 +799,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -875,6 +877,10 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
supplementOrder(row) { supplementOrder(row) {
this.$confirm('是否确认补单?', '提示', { this.$confirm('是否确认补单?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -890,7 +896,16 @@ export default {
let orderQuery = { let orderQuery = {
billNo: row.billNo 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(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',

@ -41,6 +41,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -369,7 +370,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
@ -876,6 +878,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -981,6 +984,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
}, },
components: { components: {
draggable, draggable,

@ -43,6 +43,7 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -877,6 +878,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -953,6 +955,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
}, },
components: { components: {
@ -1000,7 +1005,7 @@ export default {
/** /**
解决el-input输入框 type=number时输入中文光标上移问题 解决el-input输入框 type=number时输入中文光标上移问题
*/ */
.el-input__inner{ .el-input__inner {
line-height: 1px !important; line-height: 1px !important;
} }

@ -197,6 +197,7 @@
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="codeArray.length>0" :disabled="codeArray.length>0"
@change="subStorageChange"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -689,6 +690,7 @@ export default {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { 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(() => { .catch(() => {
@ -1154,6 +1156,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -1161,6 +1164,11 @@ export default {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
if (this.$isNotBlank(this.formData.billType)) { if (this.$isNotBlank(this.formData.billType)) {
this.curAction = this.getActionItem(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(() => { .catch(() => {
@ -1220,15 +1228,18 @@ export default {
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.formData.corpName = ''; this.formData.corpName = '';
this.locInChange(); // this.locInChange();
this.findMethod(); // this.findMethod();
}, },
locInChange() { locInChange() {
this.$forceUpdate(); this.$forceUpdate();
this.getBusType(); // this.getBusType();
this.invChange(); this.invChange();
this.findStorageMethod(); this.findStorageMethod();
}, },
subStorageChange() {
this.getBusType();
},
invChange() { invChange() {
if (this.$isNotBlank(this.formData.invWarehouseCode)) if (this.$isNotBlank(this.formData.invWarehouseCode))
@ -1246,6 +1257,7 @@ export default {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { 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(() => { .catch(() => {

@ -42,6 +42,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -904,6 +905,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -956,7 +958,9 @@ export default {
}); });
}, },
subInvChange() {
this.getBusType();
},
submitUploadDetail() { submitUploadDetail() {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {

@ -42,6 +42,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -762,6 +763,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -816,6 +818,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
submitUploadDetail() { submitUploadDetail() {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {

@ -187,7 +187,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="corpOrderIdDisabled"> :disabled="corpOrderIdDisabled" @change="subStorageChange">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
:key="item.name" :key="item.name"
@ -872,32 +872,38 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
if (this.formData.action != null) { if (this.formData.action != null) {
this.curAction = this.getActionItem(this.formData.action); this.curAction = this.getActionItem(this.formData.action);
if (this.curAction != null) { if (this.curAction != null) {
this.formData.vailInv = this.curAction.vailInv; this.formData.vailInv = this.curAction.vailInv;
this.formData.codeFillCheck = this.curAction.codeFillCheck; this.formData.codeFillCheck = this.curAction.codeFillCheck;
}
} else {
this.curAction = {corpType: 0, genUnit: false, changeEnable: false,};
this.formData.action = null;
} }
} }
}) )
.catch(() => { .catch(() => {
}); });
}, },
subStorageChange() {
this.getBusType();
},
geActionName(action) { geActionName(action) {
this.busTypes.forEach((obj) => { this.busTypes.forEach((obj) => {
if (obj.action == action) { if (obj.action == action) {
return obj.name; return obj.name;
} }
}); });
}, }
,
locCHange() { locCHange() {
if (this.$isNotBlank(this.formData.invWarehouseCode)) { if (this.$isNotBlank(this.formData.invWarehouseCode)) {
@ -905,7 +911,8 @@ export default {
} }
this.findStorageMethod(); this.findStorageMethod();
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
}, }
,
findMethod(query) { findMethod(query) {
console.log(query); console.log(query);
this.fromOptions = []; this.fromOptions = [];
@ -942,7 +949,8 @@ export default {
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, }
,
findStorageMethod() { findStorageMethod() {
if (this.formData.locStorageCode == null) if (this.formData.locStorageCode == null)
@ -957,7 +965,8 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
}, }
,
findSubStorageMethod() { findSubStorageMethod() {
let cQuery = { let cQuery = {
@ -970,7 +979,8 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
}, }
,
findSubInvByInv(invCode) { findSubInvByInv(invCode) {
@ -982,12 +992,14 @@ export default {
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { 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(() => { .catch(() => {
}); });
}, }
,
getStorage(event) { getStorage(event) {
@ -998,14 +1010,16 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
}, }
,
getActionName(action) { getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) { if (this.busTypes[i].action === action) {
return this.busTypes[i].advanceType; return this.busTypes[i].advanceType;
} }
} }
}, }
,
getActionItem(action) { getActionItem(action) {
console.log("-----") console.log("-----")
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
@ -1014,7 +1028,8 @@ export default {
return this.busTypes[i]; return this.busTypes[i];
} }
} }
}, }
,
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.findMethod(); this.findMethod();
@ -1024,19 +1039,22 @@ export default {
this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill); this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck); this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
}, }
,
// //
bindRl(val) { bindRl(val) {
console.log("curRow.erpId = " + val.id); console.log("curRow.erpId = " + val.id);
this.curRow = val; this.curRow = val;
this.selectRlVisible = true; this.selectRlVisible = true;
}, }
,
handleUnitClick(row) { handleUnitClick(row) {
console.log("curRow.erpId = " + row.id); console.log("curRow.erpId = " + row.id);
this.curRow = row; this.curRow = row;
this.dialogTableVisible = true; this.dialogTableVisible = true;
}, }
,
selectSupUnit(row) { selectSupUnit(row) {
let query = { let query = {
id: this.curRow.id, id: this.curRow.id,
@ -1054,7 +1072,8 @@ export default {
}).catch(() => { }).catch(() => {
}); });
}, }
,
selectBindRl(row) { selectBindRl(row) {
@ -1082,12 +1101,14 @@ export default {
}).catch(() => { }).catch(() => {
}); });
}, }
,
closeBindDialog(val) { closeBindDialog(val) {
console.log("closeBindDialog" + val); console.log("closeBindDialog" + val);
this.selectRlVisible = false; this.selectRlVisible = false;
this.dialogTableVisible = false; this.dialogTableVisible = false;
}, }
,
rowStyle({row, rowIndex}) { rowStyle({row, rowIndex}) {
let rowBackground = {}; let rowBackground = {};
@ -1097,12 +1118,14 @@ export default {
} }
return rowBackground; return rowBackground;
}, }
,
}, },
filters: {}, filters: {}
,
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();
@ -1134,7 +1157,8 @@ export default {
}; };
inputer.focus(); inputer.focus();
}, }
,
created() { created() {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
@ -1183,8 +1207,10 @@ export default {
} }
}, }
}; ,
}
;
</script> </script>

@ -48,6 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -254,7 +255,6 @@
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
@ -1033,6 +1033,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -1112,6 +1113,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

@ -48,6 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -828,6 +829,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -872,6 +874,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

@ -49,6 +49,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
@change="subInvChange"
size="mini"> size="mini">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -881,6 +882,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -912,6 +914,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
} }
, ,
filters: { filters: {

@ -43,7 +43,9 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini"> size="mini"
@change="subInvChange"
>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
:key="item.name" :key="item.name"
@ -415,6 +417,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -671,6 +674,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
init() { init() {
axios.get("./config.json").then(res => { axios.get("./config.json").then(res => {
// //

Loading…
Cancel
Save