|
|
@@ -1227,7 +1227,6 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
label="审核日期"
|
|
|
- prop="timeExamine"
|
|
|
v-if="typevalue == 1 || typevalue == 3"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
@@ -1722,7 +1721,7 @@ import {
|
|
|
listCorps,
|
|
|
exporItems,
|
|
|
contrastExport,
|
|
|
- exportWarehousebillsitems,
|
|
|
+ exportWarehousebillsitems
|
|
|
} from "@/api/finance/contrast";
|
|
|
// import { listCorps } from "@/api/basicdata/corps";
|
|
|
import { listFees } from "@/api/basicdata/fees";
|
|
|
@@ -2988,53 +2987,76 @@ export default {
|
|
|
const { columns, data } = param;
|
|
|
const sums = [];
|
|
|
if (data.length > 0) {
|
|
|
- if (!data[0].fSrcdc) {
|
|
|
- columns.forEach((column, index) => {
|
|
|
- if (index === 0) {
|
|
|
- sums[index] = "合计";
|
|
|
- }
|
|
|
- if (
|
|
|
- column.label == "金额" ||
|
|
|
- column.label == "对账金额" ||
|
|
|
- column.label == "本次金额" ||
|
|
|
- column.label == "费用金额"
|
|
|
- ) {
|
|
|
- const values = data.map((item) => Number(item[column.property]));
|
|
|
- if (!values.every((value) => isNaN(value))) {
|
|
|
- sums[index] = values.reduce((prev, curr) => {
|
|
|
- const value = Number(curr);
|
|
|
- if (!isNaN(value)) {
|
|
|
- return prev + curr;
|
|
|
- } else {
|
|
|
- return prev;
|
|
|
- }
|
|
|
- }, 0);
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- } else {
|
|
|
- columns.forEach((column, index) => {
|
|
|
- if (index === 0) {
|
|
|
- sums[index] = "合计";
|
|
|
- }
|
|
|
- if (
|
|
|
- column.label == "金额" ||
|
|
|
- column.label == "对账金额" ||
|
|
|
- column.label == "本次金额" ||
|
|
|
- column.label == "费用金额"
|
|
|
- ) {
|
|
|
- let number = 0;
|
|
|
- data.forEach((item) => {
|
|
|
- if (item.fSrcdc == "D") {
|
|
|
- number = number + Number(item[column.property]);
|
|
|
+ columns.forEach((column, index) => {
|
|
|
+ if (index === 0) {
|
|
|
+ sums[index] = "合计";
|
|
|
+ }
|
|
|
+ if (
|
|
|
+ column.label == "金额" ||
|
|
|
+ column.label == "对账金额" ||
|
|
|
+ column.label == "本次金额" ||
|
|
|
+ column.label == "费用金额"
|
|
|
+ ) {
|
|
|
+ const values = data.map((item) => Number(item[column.property]));
|
|
|
+ if (!values.every((value) => isNaN(value))) {
|
|
|
+ sums[index] = values.reduce((prev, curr) => {
|
|
|
+ const value = Number(curr);
|
|
|
+ if (!isNaN(value)) {
|
|
|
+ return prev + curr;
|
|
|
} else {
|
|
|
- number = number - Number(item[column.property]);
|
|
|
+ return prev;
|
|
|
}
|
|
|
- });
|
|
|
- sums[index] = number;
|
|
|
+ }, 0);
|
|
|
}
|
|
|
- });
|
|
|
- }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // if (!data[0].fSrcdc) {
|
|
|
+ // columns.forEach((column, index) => {
|
|
|
+ // if (index === 0) {
|
|
|
+ // sums[index] = "合计";
|
|
|
+ // }
|
|
|
+ // if (
|
|
|
+ // column.label == "金额" ||
|
|
|
+ // column.label == "对账金额" ||
|
|
|
+ // column.label == "本次金额" ||
|
|
|
+ // column.label == "费用金额"
|
|
|
+ // ) {
|
|
|
+ // const values = data.map((item) => Number(item[column.property]));
|
|
|
+ // if (!values.every((value) => isNaN(value))) {
|
|
|
+ // sums[index] = values.reduce((prev, curr) => {
|
|
|
+ // const value = Number(curr);
|
|
|
+ // if (!isNaN(value)) {
|
|
|
+ // return prev + curr;
|
|
|
+ // } else {
|
|
|
+ // return prev;
|
|
|
+ // }
|
|
|
+ // }, 0);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // } else {
|
|
|
+ // columns.forEach((column, index) => {
|
|
|
+ // if (index === 0) {
|
|
|
+ // sums[index] = "合计";
|
|
|
+ // }
|
|
|
+ // if (
|
|
|
+ // column.label == "金额" ||
|
|
|
+ // column.label == "对账金额" ||
|
|
|
+ // column.label == "本次金额" ||
|
|
|
+ // column.label == "费用金额"
|
|
|
+ // ) {
|
|
|
+ // let number = 0;
|
|
|
+ // data.forEach((item) => {
|
|
|
+ // if (item.fSrcdc == "D") {
|
|
|
+ // number = number + Number(item[column.property]);
|
|
|
+ // } else {
|
|
|
+ // number = number - Number(item[column.property]);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // sums[index] = number;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
}
|
|
|
return sums;
|
|
|
},
|
|
|
@@ -3341,9 +3363,33 @@ export default {
|
|
|
if (!this.queryParams.fSystemType) {
|
|
|
return this.$message("请先选择业务类型");
|
|
|
}
|
|
|
+ if (!this.queryParams.fCorpid) {
|
|
|
+ return this.$message.error("请先选择结算单位");
|
|
|
+ }
|
|
|
this.queryParameter = {
|
|
|
fToCorpid: this.queryParams.fCorpid,
|
|
|
+ fReconciliation: 0,
|
|
|
+ fDc: 'D'
|
|
|
};
|
|
|
+ importFee(this.queryParameter).then((response) => {
|
|
|
+ this.feeList = response.rows;
|
|
|
+ if (this.feeList.length !== 0) {
|
|
|
+ this.$message.success("查询成功");
|
|
|
+ this.totAL = 0;
|
|
|
+ this.Ttime = 0;
|
|
|
+ for (let item in this.feeList) {
|
|
|
+ this.totAL += Number(this.feeList[item].fAmt);
|
|
|
+ this.Ttime += Number(this.feeList[item].fAmtdr);
|
|
|
+ this.$set(
|
|
|
+ this.feeList[item],
|
|
|
+ "fBsdate",
|
|
|
+ this.feeList[item].fBsdate.substring(0, 10)
|
|
|
+ );
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$message.error("暂无数据");
|
|
|
+ }
|
|
|
+ });
|
|
|
this.innerVisible = true;
|
|
|
this.feeList = [];
|
|
|
// this.TWareHouseFees = {
|
|
|
@@ -3500,6 +3546,9 @@ export default {
|
|
|
this.nothing.push(this.selection[item].fName);
|
|
|
if (this.DzfeeList.length === 0) {
|
|
|
this.DzfeeList = this.DzfeeList.concat(this.selection);
|
|
|
+ this.DzfeeList.forEach(data => {
|
|
|
+ data.fId = null
|
|
|
+ })
|
|
|
|
|
|
//去重提单号
|
|
|
this.empty = new Set(this.empty);
|
|
|
@@ -4116,13 +4165,13 @@ export default {
|
|
|
if (e.fChargedate) {
|
|
|
e.fChargedate = e.fChargedate.slice(0, 10);
|
|
|
}
|
|
|
- if (e.fSrcdc) {
|
|
|
- if (e.fSrcdc == "D") {
|
|
|
- e.fSrcdc = "收";
|
|
|
- } else {
|
|
|
- e.fSrcdc = "付";
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (e.fSrcdc) {
|
|
|
+ // if (e.fSrcdc == "D") {
|
|
|
+ // e.fSrcdc = "收";
|
|
|
+ // } else {
|
|
|
+ // e.fSrcdc = "付";
|
|
|
+ // }
|
|
|
+ // }
|
|
|
});
|
|
|
}
|
|
|
this.DzfeeList = response.data.feeDoList;
|
|
|
@@ -4236,13 +4285,13 @@ export default {
|
|
|
if (e.fChargedate) {
|
|
|
e.fChargedate = e.fChargedate.slice(0, 10);
|
|
|
}
|
|
|
- if (e.fSrcdc) {
|
|
|
- if (e.fSrcdc == "D") {
|
|
|
- e.fSrcdc = "收";
|
|
|
- } else {
|
|
|
- e.fSrcdc = "付";
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (e.fSrcdc) {
|
|
|
+ // if (e.fSrcdc == "D") {
|
|
|
+ // e.fSrcdc = "收";
|
|
|
+ // } else {
|
|
|
+ // e.fSrcdc = "付";
|
|
|
+ // }
|
|
|
+ // }
|
|
|
});
|
|
|
}
|
|
|
this.DzfeeList = response.data.feeDoList;
|
|
|
@@ -4535,7 +4584,7 @@ export default {
|
|
|
this.$refs["ruless"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (!this.queryParams.fId || this.queryParams.fId == null) {
|
|
|
- this.queryParams.fBillstatus = "1";
|
|
|
+ // this.queryParams.fBillstatus = "1";
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("tFee", JSON.stringify(this.queryParams));
|
|
|
formData.append("tFeeDo", JSON.stringify(this.DzfeeList));
|
lichao