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

修改营销中心

Browse Source
This commit is contained in:
bryan sun
2019-11-13 18:00:48 +08:00
parent ddd33c7bb7
commit 9ce1c49c74
8 changed files with 994 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,10 +9,18 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
<!-- <span style="margin-left: 10px">营销经理：</span>-->
<!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>-->
<span>客户名称：</span>
<el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
<el-option
v-for="item in customerNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>-->
<el-badge :value="value" :max="99" class="item">
<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
</el-badge>
@@ -62,9 +70,9 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="已完成进度" width="90">
<el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.执行进度名 }}
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="付款方式" width="80">
@@ -72,59 +80,59 @@
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同总金额（万元）" width="130">
<el-table-column align="center" label="合同总额（万元）" width="130">
<template slot-scope="scope">
{{ Number(scope.row.合同总金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="已到账金额（万元）" width="130">
<template slot-scope="scope">
{{ Number(scope.row.已支付).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="未到账金额（万元）" width="130">
<template slot-scope="scope">
<el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="付款进度" width="150">
<template slot-scope="scope">
<div style="width: 130px">
<el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />
</div>
</template>
</el-table-column>
<el-table-column align="center" label="营销经理" prop="姓名" width="100">
<el-table-column align="center" label="销售经理" prop="姓名" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系人" width="60">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.银行账号 }}
</template>
</el-table-column>
<el-table-column align="center" label="税号" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.税号 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="110">
<!-- <el-table-column align="center" label="已完成进度" width="90">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.执行进度名 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="已到账金额（万元）" width="130">-->
<!-- <template slot-scope="scope">-->
<!-- {{ Number(scope.row.已支付).toFixed(2) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="未到账金额（万元）" width="130">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="付款进度" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <div style="width: 130px">-->
<!-- <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系人" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.联系人 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.电话 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.银行账号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="税号" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.税号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="60">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
@@ -136,16 +144,16 @@
@click.stop="EditTableData(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
style="margin-left: 20px"
size="mini"
type="text"
icon="el-icon-delete"
@click.stop="dellist(scope.row)"/>
</div>
</el-tooltip>
<!-- <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
<!-- <div style="display: inline-block">-->
<!-- <el-button-->
<!-- style="margin-left: 20px"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click.stop="dellist(scope.row)"/>-->
<!-- </div>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>
@@ -233,16 +241,6 @@
{{ scope.row.已收金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="未收金额（万元）" width="118px">
<template slot-scope="scope">
<el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="转下阶段收款金额" width="120px">
<template slot-scope="scope">
{{ scope.row.转下阶段金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="收款阶段" width="169px">
<template slot-scope="scope">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
@@ -254,38 +252,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="截止时间" width="156px">
<template slot-scope="scope">
<span>后</span>
<el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
<span>天内完成</span>
</template>
</el-table-column>
<el-table-column align="center" label="状态" >
<template slot-scope="scope">
<el-popover
placement="top-start"
title="收款计划"
width="200"
trigger="hover">
<div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">
<h4>{{ scope.row.执行进度名 }} 未完成</h4>
</div>
<div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">
<h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
</div>
<div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">
<h4>{{ scope.row.执行进度名 }}阶段收款已完成</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="110">
<el-table-column label="操作" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
<div style="display: inline-block">
@@ -310,6 +277,47 @@
</el-tooltip>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="未收金额（万元）" width="118px">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="转下阶段收款金额" width="120px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.转下阶段金额 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="截止时间" width="156px">-->
<!-- <template slot-scope="scope">-->
<!-- <span>后</span>-->
<!-- <el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>-->
<!-- <span>天内完成</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="状态" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-popover-->
<!-- placement="top-start"-->
<!-- title="收款计划"-->
<!-- width="200"-->
<!-- trigger="hover">-->
<!-- <div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">-->
<!-- <h4>{{ scope.row.执行进度名 }} 未完成</h4>-->
<!-- </div>-->
<!-- <div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">-->
<!-- <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>-->
<!-- </div>-->
<!-- <div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">-->
<!-- <h4>{{ scope.row.执行进度名 }}阶段收款已完成</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>
</el-card>
<!--新增合同资金对话框-->
@@ -540,7 +548,7 @@
<script>
import elInput from 'element-ui/packages/input'
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'
import { getcustomername, 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: {
@@ -555,6 +563,8 @@ export default {
}
}
return {
customerNames: [],
customerName: '',
pickerOptions: {},
timetime: '',
name: '',
@@ -674,6 +684,7 @@ export default {
created() {
this.getTableData()
this.init()
this.getCustomerName()
},
methods: {
searchName() { // 模糊查询姓名
@@ -941,9 +952,22 @@ export default {
this.form.AlreadyPaid = row.未支付金额
this.maxMoney = parseFloat(row.未支付金额)
},
getCustomerName() {
this.customerName = ''
this.customerNames = []
getcustomername().then(response => {
console.log(response, 121212)
for (let i = 0; i < response.data.length; i++) {
this.customerNames.push({
value: response.data[i].客户名称,
label: response.data[i].客户名称
})
}
})
},
getTableData() {
this.listLoading = true
searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid).then(response => {
searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName).then(response => {
this.listLoading = false
const data = response.data.rows
for (let i = 0; i < data.length; i++) {