|
@@ -311,20 +311,8 @@
|
|
|
:fixed="item.fixed"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
|
|
|
- <span v-if="item.label == 'fBillno'">{{scope.row.fBillno}}</span>
|
|
|
- <span v-if="item.label == 'fCtrlcorpid'">{{scope.row.fCtrlcorpid}}</span>
|
|
|
<span v-if="item.label == 'createTime'">{{scope.row.createTime?scope.row.createTime.slice(0,10):''}}</span>
|
|
|
- <span v-if="item.label == 'fAccbilldate'">{{scope.row.fAccbilldate}}</span>
|
|
|
- <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
|
|
|
- <span v-if="item.label == 'chargingMethod'">{{scope.row.chargingMethod}}</span>
|
|
|
- <span v-if="item.label == 'invoiceNo'">{{scope.row.invoiceNo}}</span>
|
|
|
- <span v-if="item.label == 'bank'">{{scope.row.bank}}</span>
|
|
|
- <span v-if="item.label == 'waterBillNo'">{{scope.row.waterBillNo}}</span>
|
|
|
- <span v-if="item.label == 'fAmtdr'">{{scope.row.fAmtdr}}</span>
|
|
|
- <span v-if="item.label == 'fAmtcr'">{{scope.row.fAmtcr}}</span>
|
|
|
- <span v-if="item.label == 'fRemarks'">{{scope.row.fRemarks}}</span>
|
|
|
- <span v-if="item.label == 'fBillstatus'">{{scope.row.fBillstatus}}</span>
|
|
|
+ <span v-else>{{ scope.row[item.label] }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -521,6 +509,17 @@
|
|
|
style="width: 200px"
|
|
|
:disabled="notChange"/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="账务金额">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fTotalamount"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ style="width: 200px"
|
|
|
+ :disabled="notChange"
|
|
|
+ placeholder="请输入账务金额"
|
|
|
+ v-input-limit="2"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
|
|
|
<el-form-item label="备注" prop="fRemarks">
|
|
|
<el-input
|
|
@@ -1536,7 +1535,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "6",
|
|
|
- label: "fMblno",
|
|
|
+ label: "tMblno",
|
|
|
name: "提单号",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
@@ -1585,13 +1584,20 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "13",
|
|
|
+ label: "fTotalamount",
|
|
|
+ name: "账务金额",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "14",
|
|
|
label: "fRemarks",
|
|
|
name: "备注",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
{
|
|
|
- surface: "14",
|
|
|
+ surface: "15",
|
|
|
label: "fBillstatus",
|
|
|
name: "状态",
|
|
|
checked: 0,
|
|
@@ -2213,7 +2219,7 @@ export default {
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
sums[index] = "合计";
|
|
|
- } else if (column.label == '应收合计' || column.label == '实收合计' || column.label == '金额' || column.label == '本次金额') {
|
|
|
+ } else if (column.label == '应收合计' || 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) => {
|
|
@@ -2778,6 +2784,13 @@ export default {
|
|
|
this.$refs["ruless"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.increase_s.length) {
|
|
|
+ let fMblnoList = []; // 定义存储列表的提单号
|
|
|
+ this.increase_s.map(e => {
|
|
|
+ const repeat = fMblnoList.some(item => item == e.fMblno)
|
|
|
+ if (!repeat) fMblnoList.push(e.fMblno)
|
|
|
+ })
|
|
|
+ this.queryParams.tMblno = fMblnoList.join(',');
|
|
|
+ if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
|
|
|
// this.queryParams.fBillstatus = '4'
|
|
|
let formDate = new window.FormData();
|
|
|
formDate.append("tFee", JSON.stringify(this.queryParams));
|
|
@@ -3459,6 +3472,13 @@ export default {
|
|
|
submitForm(res) {
|
|
|
this.$refs["ruless"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
+ let fMblnoList = []; // 定义存储列表的提单号
|
|
|
+ this.increase_s.map(e => {
|
|
|
+ const repeat = fMblnoList.some(item => item == e.fMblno)
|
|
|
+ if (!repeat) fMblnoList.push(e.fMblno)
|
|
|
+ })
|
|
|
+ this.queryParams.tMblno = fMblnoList.join(',');
|
|
|
+ if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
|
|
|
if (!this.queryParams.fId) {
|
|
|
// this.chargeList.fBillstatus = '1'
|
|
|
this.queryParams.fBillstatus = "1";
|