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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
bryan sun
2019-12-03 10:47:15 +08:00
parent fa7f1d94ae a3f3b53020
commit 05254fef9c
2 changed files with 307 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
View File

@@ -51,6 +51,8 @@
:props="defaultProps"
:indent="80"
:expand-on-click-node="false"
:render-content="renderContent"
node-key="机床流水号"
class="selectTree"
default-expand-all
@node-click="onClick"/>
@@ -181,6 +183,9 @@ export default {
})
}
},
renderContent(h, { node, data, store }) {
return (<span class='treeNotes'>{node.label}</span>)
},
searchTable1(row) {
this.tableData1 = []
selectProcedure(row.工艺计划流水号).then(response => {
@@ -196,5 +201,11 @@ export default {
.el-tree-node__content>.el-tree-node__expand-icon{
display: inline !important;
}
.el-tree-node:focus > .el-tree-node__content {
background-color: #ccc !important;
}
}
.treeNotes {
background-color: green;
}
</style>

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

@@ -9,8 +9,6 @@
: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>客户名称：</span>
<el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
<el-option
@@ -20,306 +18,308 @@
: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-badge :value="value" :max="99" class="item">
<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
</el-badge>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:row-key="getRowKeys"
:expand-row-keys="expands"
:data="tableData1"
style="width: 100%;"
height="600px"
highlight-current-row
border
stripe
size="mini"
@expand-change="selectMachine"
@row-click="getTableData2">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<el-table-column label="发货单号" align="center" >
<template slot-scope="scope">
{{ scope.row.发货单号 }}
</template>
</el-table-column>
<el-table-column label="发货日期" align="center">
<template slot-scope="scope">
{{ scope.row.发货日期 }}
</template>
</el-table-column>
<el-table-column label="运输状态" align="center">
<template slot-scope="scope">
{{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
<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="80">
<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="销售经理" prop="姓名" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<!-- <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">
<el-button
:disabled="scope.row.是否禁用编辑"
type="text"
size="mini"
icon="el-icon-edit-outline"
@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>-->
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<el-table
v-loading="listLoading2"
:row-style="tableRowClassName1"
:row-key="getRowKeys1"
:expand-row-keys="expands1"
:data="tableData2"
style="width: 100%;max-height: 440px;text-align: center"
height="210"
highlight-current-row
border
stripe
size="mini"
@expand-change="selectMachine1">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<el-table-column
align="center"
label="序号"
type="index"
width="100"/>
<el-table-column label="本次收款金额" align="center">
<template slot-scope="scope">
{{ scope.row.本次收款金额 }}
</template>
</el-table-column>
<el-table-column label="本次收款时间" align="center">
<template slot-scope="scope">
{{ scope.row.本次收款时间 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleEdit2(scope.row);flag = 2"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-delete"
@click="handleDelete2(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column
align="center"
label="付款批次"
type="index"
width="70"/>
<el-table-column align="center" label="应收金额（万元）" width="118px">
<template slot-scope="scope">
{{ scope.row.应收金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="已收金额（万元）" width="118px">
<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)">
<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 label="操作" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用收款"
size="mini"
type="text"
icon="el-icon-money"
@click="handleEdit1(scope.row);flag=1"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="收款转移" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-sort"
@click="TransferPlan(scope.row)"/>
</div>
</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-col :span="14">
<el-table
v-loading="listLoading"
:row-key="getRowKeys"
:expand-row-keys="expands"
:data="tableData1"
style="width: 100%;"
height="600px"
highlight-current-row
border
stripe
size="mini"
@expand-change="selectMachine"
@row-click="getTableData2">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<el-table-column label="发货单号" align="center" >
<template slot-scope="scope">
{{ scope.row.发货单号 }}
</template>
</el-table-column>
<el-table-column label="发货日期" align="center">
<template slot-scope="scope">
{{ scope.row.发货日期 }}
</template>
</el-table-column>
<el-table-column label="运输状态" align="center">
<template slot-scope="scope">
{{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
<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="80">
<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="销售经理" prop="姓名" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<!-- <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">
<el-button
:disabled="scope.row.是否禁用编辑"
type="text"
size="mini"
icon="el-icon-edit-outline"
@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>-->
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="10">
<el-table
v-loading="listLoading2"
:row-style="tableRowClassName1"
:row-key="getRowKeys1"
:expand-row-keys="expands1"
:data="tableData2"
style="width: 100%;max-height: 440px;text-align: center"
height="210"
highlight-current-row
border
stripe
size="mini"
@expand-change="selectMachine1">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<el-table-column
align="center"
label="序号"
type="index"
width="100"/>
<el-table-column label="本次收款金额" align="center">
<template slot-scope="scope">
{{ scope.row.本次收款金额 }}
</template>
</el-table-column>
<el-table-column label="本次收款时间" align="center">
<template slot-scope="scope">
{{ scope.row.本次收款时间 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleEdit2(scope.row);flag = 2"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-delete"
@click="handleDelete2(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column
align="center"
label="付款批次"
type="index"
width="70"/>
<el-table-column align="center" label="应收金额（万元）" width="118px">
<template slot-scope="scope">
{{ scope.row.应收金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="已收金额（万元）" width="118px">
<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)">
<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 label="操作" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用收款"
size="mini"
type="text"
icon="el-icon-money"
@click="handleEdit1(scope.row);flag=1"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="收款转移" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-sort"
@click="TransferPlan(scope.row)"/>
</div>
</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-col>
</el-card>
<!--新增合同资金对话框-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
@@ -411,14 +411,6 @@
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" icon="el-icon-search" style="margin-left: 10px" type="success" @click="searchName">查询</el-button>
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
<!--v-for="item in Province"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<el-table :data="dataPeople" border stripe size="mini" style="width: 100%; text-align: center;margin-top: 15px" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >