diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js index 03f4532582..9531bad7fd 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js @@ -10,6 +10,23 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 查询分页列表 + pageList: function(params) { + return request({ + url: '/base/v1/basevehicle/selectPayVehicleList', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 获取厂家销售通路 + actualList: function(data) { + return request({ + url: '/base/v1/basemanufacturerbank/payList', + method: 'get', + params: data + }) + }, // 保存修改记录 saveOrUpdate: function(params) { return request({ @@ -44,6 +61,7 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 代办任务同意办理 complete: function(params) { return request({ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js index 12d500cd8d..9d538d6ff1 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js @@ -8,6 +8,15 @@ export function typeValues(data) { }) } +// 品牌下拉 +export function brandDown(data) { + return request({ + url: '/base/v1/basevehiclebrand/namesDown', + method: 'get', + params: data + }) +} + // 获取分公司 export function getListOrg(data) { return request({ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/styles/el-form.scss b/anrui-buscenter/anrui-finmanage-ui/src/styles/el-form.scss index f47780e3b9..4c041f9416 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/styles/el-form.scss +++ b/anrui-buscenter/anrui-finmanage-ui/src/styles/el-form.scss @@ -13,7 +13,7 @@ .listconadd .title { text-align: center; font-size: 28px; - line-height: 90px; + //line-height: 90px; } .listaddtop { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue index 3b6416e906..b958a13c94 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue @@ -56,7 +56,8 @@ @@ -74,27 +75,27 @@ {{ scope.row.costTitleValue }} - + - - - - - - - + + + + + + + + + + + - + @@ -109,6 +110,9 @@ + + + @@ -120,6 +124,7 @@ import req from '@/api/anruifinmanagement/payment' import { typeValues, getPathSidByUserSid, selectByOrgSid } from '@/api/jichuxinxi/dictcommons' import paymentAdd from './paymentAdd' import paymentInfo from './paymentInfo' +import { getStorage } from '@/utils/auth' export default { name: 'fukuanshenqingguaili', @@ -132,6 +137,9 @@ export default { }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, btnList: [ { @@ -189,7 +197,7 @@ export default { userSid: '' }, current: 1, - size: 10, + size: 5, total: 0 }, rules: {} @@ -200,9 +208,39 @@ export default { this.init() }, mounted() { + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.init() + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, init() { getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((response) => { if (response.success) { @@ -302,7 +340,7 @@ export default { userSid: '' }, current: 1, - size: 10, + size: 5, total: 0 } this.getList() diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index 21dfc16240..9f77aa5001 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -1,120 +1,224 @@ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue index 3e5dbc78e6..659600e4de 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue @@ -8,63 +8,136 @@
付款申请
- + - -
申请日期
- {{ formobj.createTime }} + + 申请日期 - -
申请人
- {{ formobj.name }} + + {{ formobj.createTime }} + + + 申请人 + + + {{ formobj.name }}
- -
款项类别
- {{ formobj.costTypeValue }} + + 款项类别 + + + {{ formobj.costTypeValue }} + + + 款项名称 - -
款项名称
- {{ formobj.costTitleValue }} + + {{ formobj.costTitleValue }}
- -
业务编号
- {{ formobj.busSid }} + + 业务编号 - -
金额
- {{ formobj.cost }} + + {{ formobj.busSid }} + + + +
- -
付款单位名称
- {{ formobj.payCompany }} + + 付款单位名称 + + + {{ formobj.payCompany }} - -
收款单位名称
- {{ formobj.receiveCompany }} + + 收款单位名称 + + + {{ formobj.receiveCompany }}
- -
收款银行账号
- {{ formobj.receiveBank }} + + 付款备注 - -
收款银行账号
- {{ formobj.receiveBankAccount }} + + {{ formobj.remarks }}
- -
备注
- {{ formobj.remarks }} + + 是否涉及车辆 + + + {{ formobj.isVeh === '1' ? '是' : '否' }}
+
+
付款明细
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+
车辆列表
+
+ + + + + + + + + + + + +
@@ -78,7 +151,9 @@ export default { data() { return { formobj: {}, - ceshi: '1' + tableKey: 0, + vehicleKey: 1, + index: 0 } }, methods: { @@ -93,16 +168,61 @@ export default { this.formobj = row }) console.log('这里是详情回显', row) + }, + // 合计 + getSummaries(param) { + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计' + return + } + const values = data.map(item => Number(item[column.property])) + if (column.property === 'payAccount') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + this.formobj.payAccountAll = sums[index] += '' + } else if (column.property === 'money') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + this.formobj.money = sums[index] += '' + } else { + 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) + sums[index] += '' + this.amount = sums[index] += '' + } else { + sums[index] = '' + } + } + }) + return sums } } } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue new file mode 100644 index 0000000000..e233b62dd3 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue @@ -0,0 +1,341 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue index 648862aaa3..3cb0241ec7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue @@ -10,63 +10,136 @@
付款申请
- + - -
申请日期
- {{ formobj.createTime }} + + 申请日期 - -
申请人
- {{ formobj.name }} + + {{ formobj.createTime }} + + + 申请人 + + + {{ formobj.name }}
- -
款项类别
- {{ formobj.costTypeValue }} + + 款项类别 + + + {{ formobj.costTypeValue }} - -
款项名称
- {{ formobj.costTitleValue }} + + 款项名称 + + + {{ formobj.costTitleValue }}
- -
业务编号
- {{ formobj.busSid }} + + 业务编号 + + + {{ formobj.busSid }} + + - -
金额
- {{ formobj.cost }} +
- -
付款单位名称
- {{ formobj.payCompany }} + + 付款单位名称 - -
收款单位名称
- {{ formobj.receiveCompany }} + + {{ formobj.payCompany }} + + + 收款单位名称 + + + {{ formobj.receiveCompany }}
- -
收款银行账号
- {{ formobj.receiveBank }} + + 付款备注 - -
收款银行账号
- {{ formobj.receiveBankAccount }} + + {{ formobj.remarks }}
- -
备注
- {{ formobj.remarks }} + + 是否涉及车辆 + + + {{ formobj.isVeh === '1' ? '是' : '否' }}
+
+
付款明细
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+
车辆列表
+
+ + + + + + + + + + + + +
@@ -103,6 +176,9 @@ export default { data() { return { formobj: {}, + tableKey: 0, + vehicleKey: 1, + index: 0, dialogList: { comment: '' }, @@ -166,6 +242,57 @@ export default { this.formobj = {} }) }, + // 合计 + getSummaries(param) { + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计' + return + } + const values = data.map(item => Number(item[column.property])) + if (column.property === 'payAccount') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + this.formobj.payAccountAll = sums[index] += '' + } else if (column.property === 'money') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + this.formobj.money = sums[index] += '' + } else { + 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) + sums[index] += '' + this.amount = sums[index] += '' + } else { + sums[index] = '' + } + } + }) + return sums + }, // 同意 openAgree(val) { this.operation = val @@ -298,12 +425,6 @@ export default { text-align: center; padding: 30px 0 20px 0; } -.spanOneWidth { - width: 110px !important; -} -.addinputwOne { - margin-left: 105px !important; -} .rowClass { border-top: 1px solid #e0e3eb; } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue index f3a5a0436d..61d9c42ccf 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue @@ -1,119 +1,223 @@ +