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

fencang
anthonywj 3 years ago
parent eea34d6b73
commit 476826c921

@ -48,7 +48,8 @@
</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"
@ -1095,6 +1096,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -1259,6 +1261,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
}
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

@ -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"
@ -429,6 +431,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -702,6 +705,10 @@ export default {
}); });
}, },
subInvChange() {
this.getBusType();
}
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

@ -49,7 +49,8 @@
</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"
@ -936,6 +937,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -967,6 +969,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
}
} }
, ,
filters: { filters: {

@ -48,7 +48,8 @@
</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"
@ -981,6 +982,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -1025,6 +1027,10 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
}
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

@ -156,7 +156,8 @@
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
:disabled="corpOrderIdDisabled"> :disabled="corpOrderIdDisabled"
>
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
:key="item.code" :key="item.code"
@ -188,7 +189,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"
@ -865,6 +866,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -875,6 +877,9 @@ export default {
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;
} }
} }
@ -899,6 +904,10 @@ export default {
this.findStorageMethod(); this.findStorageMethod();
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
}, },
subStorageChange() {
this.getBusType();
},
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
@ -975,6 +984,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(() => {
@ -1128,7 +1138,6 @@ export default {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];
this.getBusType();
this.getStorage(this.formData.action); this.getStorage(this.formData.action);
this.findSubInvByInv(); this.findSubInvByInv();
this.findSubStorageMethod(); this.findSubStorageMethod();
@ -1167,6 +1176,8 @@ export default {
} }
} }
this.getBusType();
}, },
}; };

@ -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(() => {
@ -1161,6 +1163,7 @@ export default {
// }, // },
getBusType() { getBusType() {
let query = { let query = {
code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -1168,6 +1171,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(() => {
@ -1223,17 +1231,20 @@ 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();
}, },
invChange() {
subStorageChange() {
this.getBusType();
},
invChange() {
if (this.$isNotBlank(this.formData.invWarehouseCode)) if (this.$isNotBlank(this.formData.invWarehouseCode))
this.formData.invWarehouseCode = null; this.formData.invWarehouseCode = null;
this.findSubInvs(); this.findSubInvs();
@ -1249,6 +1260,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,7 +42,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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.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"
@ -262,7 +264,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">
@ -770,6 +773,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -825,6 +829,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
submitUploadDetail() { submitUploadDetail() {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {

@ -42,7 +42,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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true" <el-select v-model="query.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"
@ -791,6 +793,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -868,6 +871,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
supplementOrder(row) { supplementOrder(row) {
this.$confirm('是否确认补单?', '提示', { this.$confirm('是否确认补单?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -883,7 +889,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,7 +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"
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"
@ -453,7 +453,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="price"> <el-form-item prop="price">
<el-input v-model="detailFormData.price" auto-complete="off" :disabled="false" type="number"></el-input> <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="3">--> <!-- <el-col :span="3">-->
@ -872,6 +873,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -970,6 +972,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
}
}, },
components: { components: {
draggable, draggable,

@ -43,7 +43,8 @@
<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"
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"
@ -362,7 +363,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="false" type="number"></el-input> <el-input v-model="detailFormData.count" auto-complete="off" :disabled="false"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
@ -435,7 +437,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="batchNo"> <el-form-item prop="batchNo">
<el-input v-model="detailFormData.price" auto-complete="off" :disabled="false" type="number"></el-input> <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -872,6 +875,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -948,6 +952,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
}
}, },
components: { components: {

@ -42,7 +42,8 @@
</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"
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"
@ -347,7 +348,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">
@ -904,6 +906,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -955,6 +958,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
submitUploadDetail() { submitUploadDetail() {

@ -42,7 +42,8 @@
</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"
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"
@ -235,7 +236,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">
@ -760,6 +762,7 @@ export default {
}, },
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
@ -814,6 +817,9 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
submitUploadDetail() { submitUploadDetail() {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {

Loading…
Cancel
Save