meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同收款计划修改

Browse Source
This commit is contained in:
caoxinyu
2018-12-10 19:34:43 +08:00
parent a175dc8efd
commit 5b3b0cb1b9
2 changed files with 180 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/api/MarketingCenter/ContractCapitalManagement.js
View File

@@ -271,7 +271,7 @@ export function editTime(code, num2) {
data: {
type: '2',
name: '合同资金管理_批次付款表_修改计划时间',
param: '批次资金ID=' + code + '=int&计划付款时间=' + num2 + '=string'
param: '批次资金ID=' + code + '=int&执行进度ID=' + num2 + '=int'
}
})
}
@@ -352,3 +352,24 @@ export function SelectContractFunds(num1, pageCurrent, pageSize) {
}
})
}
export function executionProgressID() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '合同信息管理_执行进度_查询'
}
})
}
export function never(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '合同资金管理_催收账款_不再提醒',
param: '批次资金ID=' + num1 + '=int'
}
})
}

197
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -71,14 +71,14 @@
{{ scope.row.合同总金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="已支付金额（元）" width="150">
<el-table-column align="center" label="已到账金额（元）" width="150">
<template slot-scope="scope">
{{ scope.row.已支付 }}
</template>
</el-table-column>
<el-table-column align="center" label="未支付金额（元）" width="150">
<el-table-column align="center" label="未到账金额（元）" width="150">
<template slot-scope="scope">
<el-tag type="warning">{{ scope.row.未支付金额 }}</el-tag>
<el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="付款进度" width="150">
@@ -197,54 +197,67 @@
align="center"
label="付款批次"
type="index"
width="100"/>
<el-table-column align="center" label="应收金额（元）">
width="150"/>
<el-table-column align="center" label="应收金额（元）" width="180px">
<template slot-scope="scope">
{{ scope.row.应收金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="已收金额">
<el-table-column align="center" label="已收金额（元）" width="180px">
<template slot-scope="scope">
{{ scope.row.已收金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="未收金额">
<el-table-column align="center" label="未收金额（元）" width="180px">
<template slot-scope="scope">
<el-tag type="warning">{{ scope.row.未收金额 }}</el-tag>
<el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="转下阶段收款金额">
<el-table-column align="center" label="转下阶段收款金额" width="180px">
<template slot-scope="scope">
{{ scope.row.转下阶段金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="提前X天提醒">
<el-table-column align="center" label="收款阶段" width="180px">
<template slot-scope="scope">
<el-input v-model="scope.row.提前x天提醒" size="small" style="width:80px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="small" @change="changeTime(scope.row)">
<el-option
v-for="item in plannedTime"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="计划收款时间">
<el-table-column align="center" label="时间节点" width="180px">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.计划付款时间"
style="width:135px"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择本次付款时间"
@change="changeTime(scope.row)"/>
<span>后</span>
<el-input v-model="scope.row.提前x天提醒" size="small" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
<span>天</span>
</template>
</el-table-column>
<el-table-column align="center" label="状态">
<el-table-column align="center" label="状态" width="100px">
<template slot-scope="scope">
<el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" size="small">无计划</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" type="success" size="small">已完成</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" type="primary" size="small">未开始</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" type="warning" size="small">即将拖期</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" type="danger" size="small">已拖期</el-tag>
<el-popover
placement="top-start"
title="收款计划"
width="200"
trigger="hover">
<div v-show="!scope.row.计划付款时间" style="text-align: center">
<h4>{{ scope.row.执行进度名 }} 未完成</h4>
</div>
<div v-show="scope.row.计划付款时间">
<h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划日期还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
</div>
<el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">无计划</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="280">
<el-table-column label="操作" fixed="right" align="center" width="220">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收款"
@@ -429,49 +442,53 @@
</div>
</el-dialog>
<el-dialog :visible.sync="AccountsReceivableVisible">
<el-table :data="gridData" :row-style="tableRowClassName" height="260">
<el-table-column property="date" label="项目名称" width="200">
<el-dialog :visible.sync="AccountsReceivableVisible" width="60%">
<el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border>
<el-table-column property="date" label="项目名称" width="200" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column property="name" label="客户名称">
<el-table-column property="name" label="客户名称" align="center">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column property="address" label="联系人">
<el-table-column property="address" label="联系人" width="80px" align="center">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column property="date" label="联系电话">
<el-table-column property="date" label="联系电话" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column property="name" label="计划收款时间" width="130px">
<el-table-column property="name" label="计划收款时间" width="130px" align="center">
<template slot-scope="scope">
{{ scope.row.计划付款时间 }}
</template>
</el-table-column>
<el-table-column property="name" label="计划阶段">
<el-table-column property="name" label="阶段" width="60" align="center">
<template slot-scope="scope">
{{ scope.row.付款批次 }}
</template>
</el-table-column>
<el-table-column property="address" label="状态">
<el-table-column property="address" label="状态" width="70px" align="center">
<template slot-scope="scope">
{{ scope.row.状态 }}
</template>
</el-table-column>
<el-table-column property="date" label="操作">
<el-table-column property="date" label="操作" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="Detail(scope.row)">立即收款</el-button>
<el-button
size="mini"
type="danger"
@click="Never(scope.row)">不再提醒</el-button>
</template>
</el-table-column>
</el-table>
@@ -481,7 +498,7 @@
<script>
import elInput from 'element-ui/packages/input'
import { searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
import { never, executionProgressID, searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
export default {
components: {
@@ -496,6 +513,7 @@ export default {
}
}
return {
plannedTime: [],
entryName2: [],
count1: 0,
type: '',
@@ -618,6 +636,7 @@ export default {
this.getSelect(searchProjectNumber, ['项目名称', '项目流水号'], 'entryName')
this.getSelect(searchProjectNumber2, ['项目名称', '项目流水号'], 'entryName2')
this.getSelect(PaymentPhase, ['付款阶段', '付款阶段ID'], 'PaymentPhase')
this.getSelect(executionProgressID, ['执行进度名', '执行进度ID'], 'plannedTime')
AccountsReceivable().then(response => {
const data = response.data
for (let i = 0; i < data.length; i++) {
@@ -664,9 +683,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -691,7 +717,7 @@ export default {
},
changeTime(row) {
const timeid = row.批次资金id
const time = row.计划付款时间
const time = row.执行进度id
editTime(timeid, time).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
@@ -714,9 +740,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -880,9 +913,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -948,9 +988,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1012,9 +1059,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1119,9 +1173,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1194,9 +1255,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1257,9 +1325,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1331,9 +1406,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1389,9 +1471,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1460,9 +1549,16 @@ export default {
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '无计划'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].状态 = '已完成'
} else {
@@ -1489,6 +1585,29 @@ export default {
} else {
return ''
}
},
Never(row) {
never(row.批次资金ID).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
AccountsReceivable().then(response => {
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
if (data[i].状态 === '1') {
data[i].状态 = '即将拖期'
}
if (data[i].状态 === '2') {
data[i].状态 = '已拖期'
}
}
this.gridData = data
this.value = response.data.length
})
} else {
this.$message.error('信息更新失败')
}
})
}
}
}