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:
liushuai
2019-12-03 18:01:32 +08:00
parent 266a82f423 f6908d87cc
commit ad1a5d749f
3 changed files with 358 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

@@ -23,15 +23,14 @@
<el-col style="width: 450px"> <el-col style="width: 450px">
<el-card> <el-card>
<el-table :data="tableData1" style="height: 670px" highlight-current-row border> <el-table :data="tableData1" style="height: 670px" highlight-current-row border>
<el-table-column type="index" label="序号" width="50"/> <el-table-column align="center" label="工序名" width="110">
<el-table-column align="center" label="工序名" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作者" width="120"> <el-table-column align="center" label="操作者" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.员工姓名 }} {{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="数量" show-overflow-tooltip min-width="90"> <el-table-column align="center" label="数量" show-overflow-tooltip min-width="90">
@@ -39,24 +38,31 @@
{{ scope.row.投产数量 }} {{ scope.row.投产数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工序状态" show-overflow-tooltip min-width="90">
<template slot-scope="scope">
{{ scope.row.工序状态 === 4 ? '已完成' : '未完成' }}
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width:600px"> <el-col style="width:1000px">
<el-card> <el-card>
<span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span> <span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span>
<div style="margin: 10px 0 0 50px;height: 300px;overflow: auto"> <div style="margin: 10px 0 0 20px;height: 650px;overflow: auto">
<el-tree <el-tree
:data="departmentData" :data="departmentData"
:props="defaultProps" :props="defaultProps"
:indent="80" :indent="50"
:expand-on-click-node="false" :expand-on-click-node="false"
:render-content="renderContent"
node-key="机床流水号"
class="selectTree" class="selectTree"
default-expand-all default-expand-all
@node-click="onClick"/> @node-click="onClick"/>
</div> </div>
</el-card> </el-card>
<el-card style="height: 350px"> <el-card v-if="false" style="height: 350px">
<el-table :data="tableData2" height="300" highlight-current-row border @row-click="searchTable1"> <el-table :data="tableData2" height="300" highlight-current-row border @row-click="searchTable1">
<el-table-column type="index" label="序号" width="50"/> <el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="图号及规格" width="220"> <el-table-column align="center" label="图号及规格" width="220">
@@ -157,8 +163,11 @@ export default {
firstLevel.children = [] firstLevel.children = []
for (let j = 0; j < response.data.length; j++) { for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({ firstLevel.children.push({
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称'), label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0外购'),
value: response.data[j].工艺计划流水号, value: response.data[j].工艺计划流水号,
考核状态: response.data[j].考核状态,
采购状态: response.data[j].采购状态,
零件类型: response.data[j].零件类型,
father: false father: false
}) })
} }
@@ -171,14 +180,40 @@ export default {
onClick(num) { onClick(num) {
this.tableData1 = [] this.tableData1 = []
this.tableData2 = [] this.tableData2 = []
if (num.father === true) { if (num.father === false) {
selectParts(1, num.value, 0, 0).then(response => { if (num.零件类型 === 1) {
this.tableData2 = response.data selectProcedure(num.value).then(response => {
}) this.tableData1 = response.data
})
}
}
// if (num.father === true) {
// selectParts(1, num.value, 0, 0).then(response => {
// this.tableData2 = response.data
// })
// } else {
// selectParts(0, 0, 1, num.value).then(response => {
// this.tableData2 = response.data
// })
// }
},
renderContent(h, { node, data, store }) {
if (node.data.father === false) {
if (node.data.零件类型 === 1) { // 自制
if (parseInt(node.data.考核状态) > 6) {
return (<span class='treeNotesComplate'>{node.label}</span>)
} else {
return (<span class='treeNotesUnComplate'>{node.label}</span>)
}
} else { // 外购
if (node.data.采购状态 === '已完成') {
return (<span class='treeNotesComplate'>{node.label}</span>)
} else {
return (<span class='treeNotesUnComplate'>{node.label}</span>)
}
}
} else { } else {
selectParts(0, 0, 1, num.value).then(response => { return (<span>{node.label}</span>)
this.tableData2 = response.data
})
} }
}, },
searchTable1(row) { searchTable1(row) {
@@ -196,5 +231,15 @@ export default {
.el-tree-node__content>.el-tree-node__expand-icon{ .el-tree-node__content>.el-tree-node__expand-icon{
display: inline !important; display: inline !important;
} }
.el-tree-node:focus > .el-tree-node__content {
background-color: #ccc !important;
}
}
.treeNotesComplate {
color: black;
background-color: #67C23A;
}
.treeNotesUnComplate {
color: black;
} }
</style> </style>

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

@@ -9,8 +9,6 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </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> <span>客户名称：</span>
<el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable> <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
<el-option <el-option
@@ -20,306 +18,308 @@
:value="item.value"/> :value="item.value"/>
</el-select> </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="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-badge :value="value" :max="99" class="item">
<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button> <el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
</el-badge> </el-badge>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-col :span="14">
v-loading="listLoading" <el-table
:row-key="getRowKeys" v-loading="listLoading"
:expand-row-keys="expands" :row-key="getRowKeys"
:data="tableData1" :expand-row-keys="expands"
style="width: 100%;" :data="tableData1"
height="600px" style="width: 100%;"
highlight-current-row height="600px"
border highlight-current-row
stripe border
size="mini" stripe
@expand-change="selectMachine" size="mini"
@row-click="getTableData2"> @expand-change="selectMachine"
<el-table-column type="expand" label="详情"> @row-click="getTableData2">
<template slot-scope="scope"> <el-table-column type="expand" label="详情">
<el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini"> <template slot-scope="scope">
<el-table-column label="发货单号" align="center" > <el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<template slot-scope="scope"> <el-table-column label="发货单号" align="center" >
{{ scope.row.发货单号 }} <template slot-scope="scope">
</template> {{ scope.row.发货单号 }}
</el-table-column> </template>
<el-table-column label="发货日期" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="发货日期" align="center">
{{ scope.row.发货日期 }} <template slot-scope="scope">
</template> {{ scope.row.发货日期 }}
</el-table-column> </template>
<el-table-column label="运输状态" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="运输状态" align="center">
{{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }} <template slot-scope="scope">
</template> {{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}
</el-table-column> </template>
</el-table> </el-table-column>
</template> </el-table>
</el-table-column> </template>
<el-table-column align="center" label="合同编号" prop="合同编号" width="140"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag> <template slot-scope="scope">
</template> <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</el-table-column> </template>
<el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
{{ scope.row.项目名称 }} <template slot-scope="scope">
</template> {{ scope.row.项目名称 }}
</el-table-column> </template>
<el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
{{ scope.row.客户名称 }} <template slot-scope="scope">
</template> {{ scope.row.客户名称 }}
</el-table-column> </template>
<el-table-column align="center" label="付款方式" width="80"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="付款方式" width="80">
{{ scope.row.付款方式 }} <template slot-scope="scope">
</template> {{ scope.row.付款方式 }}
</el-table-column> </template>
<el-table-column align="center" label="合同总额（万元）" width="130"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="合同总额（万元）" width="130">
{{ Number(scope.row.合同总金额).toFixed(2) }} <template slot-scope="scope">
</template> {{ Number(scope.row.合同总金额).toFixed(2) }}
</el-table-column> </template>
<el-table-column align="center" label="销售经理" prop="姓名" width="100"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="销售经理" prop="姓名" width="100">
{{ scope.row.姓名 }} <template slot-scope="scope">
</template> {{ scope.row.姓名 }}
</el-table-column> </template>
<!-- <el-table-column align="center" label="已完成进度" width="90">--> </el-table-column>
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="已完成进度" width="90">-->
<!-- {{ scope.row.执行进度名 }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ scope.row.执行进度名 }}-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="已到账金额（万元）" width="130">--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="已到账金额（万元）" width="130">-->
<!-- {{ Number(scope.row.已支付).toFixed(2) }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ Number(scope.row.已支付).toFixed(2) }}-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="未到账金额（万元）" width="130">--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="未到账金额（万元）" width="130">-->
<!-- <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="付款进度" width="150">--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="付款进度" width="150">-->
<!-- <div style="width: 130px">--> <!-- <template slot-scope="scope">-->
<!-- <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />--> <!-- <div style="width: 130px">-->
<!-- </div>--> <!-- <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />-->
<!-- </template>--> <!-- </div>-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="联系人" width="60">--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="联系人" width="60">-->
<!-- {{ scope.row.联系人 }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ scope.row.联系人 }}-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>-->
<!-- {{ scope.row.电话 }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ scope.row.电话 }}-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>-->
<!-- {{ scope.row.银行账号 }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ scope.row.银行账号 }}-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="税号" show-overflow-tooltip>--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="税号" show-overflow-tooltip>-->
<!-- {{ scope.row.税号 }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ scope.row.税号 }}-->
<!-- </el-table-column>--> <!-- </template>-->
<el-table-column label="操作" align="center" width="60"> <!-- </el-table-column>-->
<template slot-scope="scope"> <el-table-column label="操作" align="center" width="60">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <template slot-scope="scope">
<div style="display: inline-block"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<el-button <div style="display: inline-block">
:disabled="scope.row.是否禁用编辑" <el-button
type="text" :disabled="scope.row.是否禁用编辑"
size="mini" type="text"
icon="el-icon-edit-outline" size="mini"
@click.stop="EditTableData(scope.row)"/> icon="el-icon-edit-outline"
</div> @click.stop="EditTableData(scope.row)"/>
</el-tooltip> </div>
<!-- <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">--> </el-tooltip>
<!-- <div style="display: inline-block">--> <!-- <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
<!-- <el-button--> <!-- <div style="display: inline-block">-->
<!-- style="margin-left: 20px"--> <!-- <el-button-->
<!-- size="mini"--> <!-- style="margin-left: 20px"-->
<!-- type="text"--> <!-- size="mini"-->
<!-- icon="el-icon-delete"--> <!-- type="text"-->
<!-- @click.stop="dellist(scope.row)"/>--> <!-- icon="el-icon-delete"-->
<!-- </div>--> <!-- @click.stop="dellist(scope.row)"/>-->
<!-- </el-tooltip>--> <!-- </div>-->
</template> <!-- </el-tooltip>-->
</el-table-column> </template>
</el-table> </el-table-column>
<div class="block"> </el-table>
<el-pagination <div class="block">
:current-page="PageCurrent" <el-pagination
:page-sizes="[10, 20, 30, 40]" :current-page="PageCurrent"
:page-size="PageSize" :page-sizes="[10, 20, 30, 40]"
:total="total" :page-size="PageSize"
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange"/> @size-change="handleSizeChange"
</div> @current-change="handleCurrentChange"/>
</el-card> </div>
<el-card> </el-col>
<el-table <el-col :span="10">
v-loading="listLoading2" <el-table
:row-style="tableRowClassName1" v-loading="listLoading2"
:row-key="getRowKeys1" :row-style="tableRowClassName1"
:expand-row-keys="expands1" :row-key="getRowKeys1"
:data="tableData2" :expand-row-keys="expands1"
style="width: 100%;max-height: 440px;text-align: center" :data="tableData2"
height="210" style="width: 100%;max-height: 440px;text-align: center"
highlight-current-row height="210"
border highlight-current-row
stripe border
size="mini" stripe
@expand-change="selectMachine1"> size="mini"
<el-table-column type="expand" label="详情"> @expand-change="selectMachine1">
<template slot-scope="scope"> <el-table-column type="expand" label="详情">
<el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini"> <template slot-scope="scope">
<el-table-column <el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
align="center" <el-table-column
label="序号" align="center"
type="index" label="序号"
width="100"/> type="index"
<el-table-column label="本次收款金额" align="center"> width="100"/>
<template slot-scope="scope"> <el-table-column label="本次收款金额" align="center">
{{ scope.row.本次收款金额 }} <template slot-scope="scope">
</template> {{ scope.row.本次收款金额 }}
</el-table-column> </template>
<el-table-column label="本次收款时间" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="本次收款时间" align="center">
{{ scope.row.本次收款时间 }} <template slot-scope="scope">
</template> {{ scope.row.本次收款时间 }}
</el-table-column> </template>
<el-table-column label="操作" fixed="right" align="center" width="110"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" fixed="right" align="center" width="110">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <template slot-scope="scope">
<div style="display: inline-block"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<el-button <div style="display: inline-block">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit-outline" type="text"
@click="handleEdit2(scope.row);flag = 2"/> icon="el-icon-edit-outline"
</div> @click="handleEdit2(scope.row);flag = 2"/>
</el-tooltip> </div>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top"> </el-tooltip>
<div style="display: inline-block"> <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<el-button <div style="display: inline-block">
size="mini" <el-button
type="text" size="mini"
style="margin-left: 20px" type="text"
icon="el-icon-delete" style="margin-left: 20px"
@click="handleDelete2(scope.row)"/> icon="el-icon-delete"
</div> @click="handleDelete2(scope.row)"/>
</el-tooltip> </div>
</template> </el-tooltip>
</el-table-column> </template>
</el-table> </el-table-column>
</template> </el-table>
</el-table-column> </template>
<el-table-column </el-table-column>
align="center" <el-table-column
label="付款批次" align="center"
type="index" label="付款批次"
width="70"/> type="index"
<el-table-column align="center" label="应收金额（万元）" width="118px"> width="70"/>
<template slot-scope="scope"> <el-table-column align="center" label="应收金额（万元）" width="118px">
{{ scope.row.应收金额 }} <template slot-scope="scope">
</template> {{ scope.row.应收金额 }}
</el-table-column> </template>
<el-table-column align="center" label="已收金额（万元）" width="118px"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="已收金额（万元）" width="118px">
{{ scope.row.已收金额 }} <template slot-scope="scope">
</template> {{ scope.row.已收金额 }}
</el-table-column> </template>
<el-table-column align="center" label="收款阶段" width="169px"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="收款阶段" width="169px">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)"> <template slot-scope="scope">
<el-option <el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
v-for="item in plannedTime" <el-option
:key="item.value" v-for="item in plannedTime"
:label="item.label" :key="item.value"
:value="item.value"/> :label="item.label"
</el-select> :value="item.value"/>
</template> </el-select>
</el-table-column> </template>
<el-table-column label="操作" align="center" width="110"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" align="center" width="110">
<el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top"> <template slot-scope="scope">
<div style="display: inline-block"> <el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
<el-button <div style="display: inline-block">
:disabled="scope.row.是否禁用收款" <el-button
size="mini" :disabled="scope.row.是否禁用收款"
type="text" size="mini"
icon="el-icon-money" type="text"
@click="handleEdit1(scope.row);flag=1"/> icon="el-icon-money"
</div> @click="handleEdit1(scope.row);flag=1"/>
</el-tooltip> </div>
<el-tooltip :open-delay="1000" effect="dark" content="收款转移" placement="top"> </el-tooltip>
<div style="display: inline-block"> <el-tooltip :open-delay="1000" effect="dark" content="收款转移" placement="top">
<el-button <div style="display: inline-block">
:disabled="scope.row.是否禁用" <el-button
size="mini" :disabled="scope.row.是否禁用"
type="text" size="mini"
style="margin-left: 20px" type="text"
icon="el-icon-sort" style="margin-left: 20px"
@click="TransferPlan(scope.row)"/> icon="el-icon-sort"
</div> @click="TransferPlan(scope.row)"/>
</el-tooltip> </div>
</template> </el-tooltip>
</el-table-column> </template>
<!-- <el-table-column align="center" label="未收金额（万元）" width="118px">--> </el-table-column>
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="未收金额（万元）" width="118px">-->
<!-- <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="转下阶段收款金额" width="120px">--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="转下阶段收款金额" width="120px">-->
<!-- {{ scope.row.转下阶段金额 }}--> <!-- <template slot-scope="scope">-->
<!-- </template>--> <!-- {{ scope.row.转下阶段金额 }}-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="截止时间" width="156px">--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="截止时间" width="156px">-->
<!-- <span>后</span>--> <!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>--> <!-- <span>后</span>-->
<!-- <span>天内完成</span>--> <!-- <el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>-->
<!-- </template>--> <!-- <span>天内完成</span>-->
<!-- </el-table-column>--> <!-- </template>-->
<!-- <el-table-column align="center" label="状态" >--> <!-- </el-table-column>-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center" label="状态" >-->
<!-- <el-popover--> <!-- <template slot-scope="scope">-->
<!-- placement="top-start"--> <!-- <el-popover-->
<!-- title="收款计划"--> <!-- placement="top-start"-->
<!-- width="200"--> <!-- title="收款计划"-->
<!-- trigger="hover">--> <!-- width="200"-->
<!-- <div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">--> <!-- trigger="hover">-->
<!-- <h4>{{ scope.row.执行进度名 }} 未完成</h4>--> <!-- <div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">-->
<!-- </div>--> <!-- <h4>{{ scope.row.执行进度名 }} 未完成</h4>-->
<!-- <div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">--> <!-- </div>-->
<!-- <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>--> <!-- <div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">-->
<!-- </div>--> <!-- <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>-->
<!-- <div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">--> <!-- </div>-->
<!-- <h4>{{ scope.row.执行进度名 }}阶段收款已完成</h4>--> <!-- <div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">-->
<!-- </div>--> <!-- <h4>{{ scope.row.执行进度名 }}阶段收款已完成</h4>-->
<!-- <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>--> <!-- </div>-->
<!-- <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-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&&scope.row.状态==='未开始'" slot="reference" type="primary" 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="warning" 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="danger" 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-popover>--> <!-- <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>-->
<!-- </template>--> <!-- </el-popover>-->
<!-- </el-table-column>--> <!-- </template>-->
</el-table> <!-- </el-table-column>-->
</el-table>
</el-col>
</el-card> </el-card>
<!--新增合同资金对话框--> <!--新增合同资金对话框-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left"> <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
@@ -411,14 +411,6 @@
<span>姓名：</span> <span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/> <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> <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"> <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 :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" > <el-table-column label="销售经理" align="center" >