|
|
@@ -12,6 +12,7 @@
|
|
|
:page.sync="page"
|
|
|
@size-change="sizeChange"
|
|
|
@current-change="currentChange"
|
|
|
+ @row-click="handleRowClick"
|
|
|
@resetColumn="resetColumn('crud', 'option', 'optionBack', 494)"
|
|
|
@saveColumn="saveColumn('crud', 'option', 'optionBack', 494)"
|
|
|
>
|
|
|
@@ -26,7 +27,7 @@
|
|
|
:controls="false"
|
|
|
placeholder="请输入 本次CNY"
|
|
|
size="mini"
|
|
|
- style="width: 100%;"
|
|
|
+ style="width: 100%"
|
|
|
:disabled="row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)"
|
|
|
></el-input-number>
|
|
|
<span v-else>{{ row.currentAmountCNY }}</span>
|
|
|
@@ -34,13 +35,13 @@
|
|
|
<template slot="reconciliationAmount" slot-scope="{ row }">
|
|
|
<el-popover trigger="click">
|
|
|
<avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
|
|
|
- <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmount }}</span>
|
|
|
+ <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmount }}</span>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
<template slot="reconciliationAmountUsd" slot-scope="{ row }">
|
|
|
<el-popover trigger="click">
|
|
|
<avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
|
|
|
- <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmountUsd }}</span>
|
|
|
+ <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmountUsd }}</span>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
<tempalte slot="currentAmountUSD" slot-scope="{ row }">
|
|
|
@@ -51,7 +52,7 @@
|
|
|
:controls="false"
|
|
|
placeholder="请输入 本次USD"
|
|
|
size="mini"
|
|
|
- style="width: 100%;"
|
|
|
+ style="width: 100%"
|
|
|
:disabled="row.currentCurCode != 'USD'"
|
|
|
></el-input-number>
|
|
|
<span v-else>{{ row.currentAmountUSD }}</span>
|
|
|
@@ -69,20 +70,20 @@ export default {
|
|
|
props: {
|
|
|
tableData: {
|
|
|
type: Array,
|
|
|
- default: []
|
|
|
+ default: [],
|
|
|
},
|
|
|
handleSelectionData: {
|
|
|
type: Array,
|
|
|
- default: []
|
|
|
+ default: [],
|
|
|
},
|
|
|
editSave: {
|
|
|
type: Boolean,
|
|
|
- default: false
|
|
|
+ default: false,
|
|
|
},
|
|
|
form: {
|
|
|
type: Object,
|
|
|
- default: {}
|
|
|
- }
|
|
|
+ default: {},
|
|
|
+ },
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -96,33 +97,33 @@ export default {
|
|
|
label: "来源单号",
|
|
|
prop: "srcNo",
|
|
|
width: "200",
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "来源类型",
|
|
|
prop: "srcType",
|
|
|
width: "80",
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "签收金额",
|
|
|
prop: "signedAmount",
|
|
|
width: "100",
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "签收人",
|
|
|
prop: "consigneeName",
|
|
|
width: "100",
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "签收时间",
|
|
|
prop: "signingTime",
|
|
|
width: "120",
|
|
|
- overHidden: true
|
|
|
- }
|
|
|
- ]
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ ],
|
|
|
},
|
|
|
curCodeData: [], // 本次币种
|
|
|
option: {},
|
|
|
@@ -140,6 +141,7 @@ export default {
|
|
|
refreshBtn: false,
|
|
|
index: true,
|
|
|
selection: true,
|
|
|
+ highlightCurrentRow:true,
|
|
|
align: "center",
|
|
|
column: [
|
|
|
{
|
|
|
@@ -150,14 +152,14 @@ export default {
|
|
|
dicData: [
|
|
|
{
|
|
|
label: "未开票",
|
|
|
- value: 0
|
|
|
+ value: 0,
|
|
|
},
|
|
|
{
|
|
|
label: "已开票",
|
|
|
- value: 1
|
|
|
- }
|
|
|
+ value: 1,
|
|
|
+ },
|
|
|
],
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "收/付",
|
|
|
@@ -167,159 +169,162 @@ export default {
|
|
|
dicData: [
|
|
|
{
|
|
|
label: "收",
|
|
|
- value: "D"
|
|
|
+ value: "D",
|
|
|
},
|
|
|
{
|
|
|
label: "付",
|
|
|
- value: "C"
|
|
|
- }
|
|
|
+ value: "C",
|
|
|
+ },
|
|
|
],
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "账单编号",
|
|
|
prop: "accBillNo",
|
|
|
width: 120,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "MB/L NO",
|
|
|
prop: "mblno",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "业务员",
|
|
|
prop: "srcCnName",
|
|
|
width: 80,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "操作人",
|
|
|
prop: "operatorName",
|
|
|
width: 80,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "本次CNY",
|
|
|
prop: "currentAmountCNY",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "本次USD",
|
|
|
prop: "currentAmountUSD",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "已签收CNY",
|
|
|
prop: "reconciliationAmount",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "已签收USD",
|
|
|
prop: "reconciliationAmountUsd",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "JOB NO",
|
|
|
prop: "billNo",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "BOOKINGNO",
|
|
|
prop: "bookingNo",
|
|
|
width: 120,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "费用名称",
|
|
|
prop: "feeCnName",
|
|
|
width: 80,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "客户名称",
|
|
|
prop: "corpCnName",
|
|
|
width: 120,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "账单金额",
|
|
|
prop: "amount",
|
|
|
width: 120,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "本次发票币种",
|
|
|
prop: "currentCurCode",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "本次发票汇率",
|
|
|
prop: "currentExrate",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "付费申请金额",
|
|
|
prop: "appliedAmount",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "发票申请金额",
|
|
|
prop: "appliedInvoiceAmount",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "已开票金额",
|
|
|
prop: "uninvoicedAmount",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "已结算金额",
|
|
|
prop: "stlTtlAmount",
|
|
|
width: 100,
|
|
|
- overHidden: true
|
|
|
+ overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "备注",
|
|
|
prop: "remarks",
|
|
|
width: 120,
|
|
|
- overHidden: true
|
|
|
- }
|
|
|
- ]
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ ],
|
|
|
},
|
|
|
page: {
|
|
|
currentPage: 1,
|
|
|
total: 0,
|
|
|
pageSize: 20,
|
|
|
- pageSizes: [20, 50, 100, 200, 500]
|
|
|
+ pageSizes: [20, 50, 100, 200, 500,'ALL'],
|
|
|
},
|
|
|
- pageData: []
|
|
|
+ pageData: [],
|
|
|
};
|
|
|
},
|
|
|
async created() {
|
|
|
this.option = await this.getColumnData(this.getColumnName(494), this.optionBack);
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleRowClick(row, event, column) {
|
|
|
+ this.$refs.crud.toggleRowSelection(row, true);
|
|
|
+ },
|
|
|
viewRLA(row, type) {
|
|
|
this.rlaData = [];
|
|
|
- getListAll({ billId: row.accBillId, srcType: type }).then(res => {
|
|
|
+ getListAll({ billId: row.accBillId, srcType: type }).then((res) => {
|
|
|
this.rlaData = res.data.data;
|
|
|
});
|
|
|
},
|
|
|
sizeChange(val) {
|
|
|
this.page.currentPage = 1;
|
|
|
- this.page.pageSize = val;
|
|
|
+ this.page.pageSize = val?val:this.tableData.length;
|
|
|
this.getList();
|
|
|
},
|
|
|
currentChange(val) {
|
|
|
@@ -332,6 +337,13 @@ export default {
|
|
|
const end = start + this.page.pageSize;
|
|
|
this.pageData = this.tableData.slice(start, end);
|
|
|
},
|
|
|
+ refreshData() {
|
|
|
+ if (this.tableData.length) {
|
|
|
+ this.page.currentPage = 1;
|
|
|
+ this.pageData = [];
|
|
|
+ this.getList();
|
|
|
+ }
|
|
|
+ },
|
|
|
armbChange(row) {
|
|
|
if (Number(row.amount - row.reconciliationAmount) > 0) {
|
|
|
if (Number(row.currentStlAmountRMB) < 0) {
|
|
|
@@ -400,7 +412,7 @@ export default {
|
|
|
},
|
|
|
// 获取币别数据
|
|
|
getRateListfun(cnName) {
|
|
|
- getRateList({ current: 1, size: 10, cnName }).then(res => {
|
|
|
+ getRateList({ current: 1, size: 10, cnName }).then((res) => {
|
|
|
this.curCodeData = res.data.data.records;
|
|
|
});
|
|
|
},
|
|
|
@@ -429,7 +441,7 @@ export default {
|
|
|
refsElTable.toggleRowSelection(this.tableData[index], true);
|
|
|
}
|
|
|
} else {
|
|
|
- let findRow = this.handleSelectionData.find(c => c.rowIndex == row.rowIndex); //找出当前选中行
|
|
|
+ let findRow = this.handleSelectionData.find((c) => c.rowIndex == row.rowIndex); //找出当前选中行
|
|
|
//如果只有一行且点击的也是这一行则取消选择 否则清空再选中当前点击行
|
|
|
if (findRow && this.handleSelectionData.length === 1) {
|
|
|
refsElTable.toggleRowSelection(row, false);
|
|
|
@@ -447,7 +459,7 @@ export default {
|
|
|
//给每一行添加不可枚举属性rowIndex来标识当前行
|
|
|
value: rowIndex, // 设置age的值,不设置的话默认为undefined
|
|
|
writable: true, // 表示属性的值true可以修改,false不可以被修改
|
|
|
- enumerable: false // 设置为false表示不能通过 for-in 循环返回
|
|
|
+ enumerable: false, // 设置为false表示不能通过 for-in 循环返回
|
|
|
// configurable: false, // configurable 设置为 false,意味着这个属性不能从对象上删除
|
|
|
});
|
|
|
},
|
|
|
@@ -469,22 +481,22 @@ export default {
|
|
|
if (n > mx) {
|
|
|
return {
|
|
|
top: mi,
|
|
|
- bottom: n
|
|
|
+ bottom: n,
|
|
|
};
|
|
|
} else if (n < mx && n > mi) {
|
|
|
return {
|
|
|
top: mi,
|
|
|
- bottom: n
|
|
|
+ bottom: n,
|
|
|
};
|
|
|
} else if (n < mi) {
|
|
|
return {
|
|
|
top: n,
|
|
|
- bottom: mx
|
|
|
+ bottom: mx,
|
|
|
};
|
|
|
} else if (n == mi || n == mx) {
|
|
|
return {
|
|
|
top: mi,
|
|
|
- bottom: mx
|
|
|
+ bottom: mx,
|
|
|
};
|
|
|
}
|
|
|
},
|
|
|
@@ -492,7 +504,7 @@ export default {
|
|
|
// 判断方式也是通过判断rowIndex对比
|
|
|
rowClassName({ row, rowIndex }) {
|
|
|
let rowName = "",
|
|
|
- findRow = this.handleSelectionData.find(c => c.rowIndex === row.rowIndex);
|
|
|
+ findRow = this.handleSelectionData.find((c) => c.rowIndex === row.rowIndex);
|
|
|
if (findRow) {
|
|
|
rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
|
|
|
}
|
|
|
@@ -525,7 +537,7 @@ export default {
|
|
|
this.$message.success("重置成功");
|
|
|
this.$refs[ref].$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
mounted() {
|
|
|
// 按住ctrl实现多选 设置监听keydown事件,以及keyup事件,
|
|
|
@@ -538,16 +550,16 @@ export default {
|
|
|
removeEventListener("keyup", this.keyUp);
|
|
|
},
|
|
|
watch: {
|
|
|
- tableData: {
|
|
|
- // 执行方法
|
|
|
- handler(oldValue, newValue) {
|
|
|
- this.page.currentPage = 1;
|
|
|
- this.pageData = [];
|
|
|
- this.getList();
|
|
|
- },
|
|
|
- deep: true, // 深度监听
|
|
|
- immediate: true // 第一次改变就执行
|
|
|
- }
|
|
|
+ // tableData: {
|
|
|
+ // // 执行方法
|
|
|
+ // handler(oldValue, newValue) {
|
|
|
+ // this.page.currentPage = 1;
|
|
|
+ // this.pageData = [];
|
|
|
+ // this.getList();
|
|
|
+ // },
|
|
|
+ // deep: true, // 深度监听
|
|
|
+ // immediate: true, // 第一次改变就执行
|
|
|
+ // },
|
|
|
},
|
|
|
computed: {
|
|
|
//实时得到最上行和最下行
|
|
|
@@ -562,8 +574,8 @@ export default {
|
|
|
return this.handleSelectionData.reduce((start, end) => {
|
|
|
return start.rowIndex < end.rowIndex ? start : end;
|
|
|
});
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
|
|
|