|
@@ -3955,6 +3955,11 @@ export default {
|
|
|
fMarks:this.form.fMarks,
|
|
|
fBusinessType:this.form.fBusinessType
|
|
|
});
|
|
|
+ this.fWbuOptions = []
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptions = response.rows;
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
addpayment() {
|
|
@@ -3980,6 +3985,11 @@ export default {
|
|
|
fMarks: this.form.fMarks,
|
|
|
fBusinessType: this.form.fBusinessType
|
|
|
});
|
|
|
+ this.fWbuOptions = []
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptions = response.rows;
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
queryUser() {
|
|
@@ -4135,6 +4145,7 @@ export default {
|
|
|
for (let whgen in this.dialogWhgenlegList) {
|
|
|
let feeId = this.dialogWhgenlegList[whgen].feeFId;
|
|
|
getFees(feeId).then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.fWbuOptions.push(response.data);
|
|
|
});
|
|
|
let qty = 1;
|
|
@@ -4179,7 +4190,11 @@ export default {
|
|
|
for (let zhgen in this.dialogWhgenlegList) {
|
|
|
let feeId = this.dialogWhgenlegList[zhgen].feeFId;
|
|
|
getFees(feeId).then((response) => {
|
|
|
- this.fWbuOptions.push(response.data);
|
|
|
+ this.fWbuOptions = []
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptions = response.rows;
|
|
|
+ });
|
|
|
});
|
|
|
let qty = 1;
|
|
|
if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 1) {
|
|
@@ -4428,6 +4443,10 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(status) {
|
|
|
+ let queryParams = {pageNum: 1, pageSize: 10};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptions = response.rows;
|
|
|
+ });
|
|
|
this.reset()
|
|
|
this.form = {
|
|
|
fItemsStatus: null,
|
|
@@ -4536,10 +4555,16 @@ export default {
|
|
|
this.open = true;
|
|
|
this.title = "修改仓入库";
|
|
|
this.warehousesssMethod()
|
|
|
+ this.fWbuOptions = []
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10};
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptions = response.rows;
|
|
|
+ });
|
|
|
});
|
|
|
queryUserVal().then((response)=>{
|
|
|
this.current = response.user.userName
|
|
|
})
|
|
|
+
|
|
|
},
|
|
|
// 库存总账多选框
|
|
|
whgenlegSelectionChange(selection) {
|
|
@@ -5304,34 +5329,57 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
- for(let item in this.warehouseDrList){
|
|
|
- if(!this.warehouseDrList[item].fCorpid){
|
|
|
- this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行客户名称")
|
|
|
- return false
|
|
|
+
|
|
|
+ for(let item in this.warehouseDrList) {
|
|
|
+ if (!this.warehouseDrList[item].fCorpid) {
|
|
|
+ if (item === 'fBusinessType') {
|
|
|
+ console.log(item)
|
|
|
+ } else {
|
|
|
+ console.log(this.warehouseDrList[item].fCorpid)
|
|
|
+ this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
- if(!this.warehouseDrList[item].fFeeid){
|
|
|
- this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行费用名称")
|
|
|
- return false
|
|
|
+ if (!this.warehouseDrList[item].fFeeid) {
|
|
|
+ if (item === 'fBusinessType') {
|
|
|
+ } else {
|
|
|
+ this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
- if(!this.warehouseDrList[item].fFeeUnitid){
|
|
|
- this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行计价单位")
|
|
|
- return false
|
|
|
+ if (!this.warehouseDrList[item].fFeeUnitid) {
|
|
|
+ if (item === 'fBusinessType') {
|
|
|
+ } else {
|
|
|
+ this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- for(let item in this.warehouseCrList){
|
|
|
- if(!this.warehouseCrList[item].fCorpid){
|
|
|
- this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行客户名称")
|
|
|
- return false
|
|
|
+ for(let item in this.warehouseCrList) {
|
|
|
+ if (!this.warehouseCrList[item].fCorpid) {
|
|
|
+ if (item === 'fBusinessType') {
|
|
|
+ } else {
|
|
|
+ this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
- if(!this.warehouseCrList[item].fFeeid){
|
|
|
- this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行费用名称")
|
|
|
- return false
|
|
|
+ if (!this.warehouseCrList[item].fFeeid) {
|
|
|
+ if (item === 'fBusinessType') {
|
|
|
+ } else {
|
|
|
+ this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
- if(!this.warehouseCrList[item].fFeeUnitid){
|
|
|
- this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行计价单位")
|
|
|
- return false
|
|
|
+
|
|
|
+ if (!this.warehouseCrList[item].fFeeUnitid) {
|
|
|
+ if (item === 'fBusinessType') {
|
|
|
+ } else {
|
|
|
+ this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (valid) {
|
|
|
this.form.fBillstatus = status
|
|
|
this.form.fNetweight = this.fNetweight
|