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

new

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -4,10 +4,17 @@
<el-card>
<!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
<!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
<<<<<<< HEAD
<span>招标企业：</span>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px" placeholder="请输入招标企业"/>
<span style="margin-left: 10px">保金类型：</span>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 150px">
=======
<span style="margin-left: 10px">招标企业：</span>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:140px" placeholder="请输入招标企业"/>
<span style="margin-left: 20px">保金类型：</span>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in TypeOfGoldDeposit"
:key="item.value"
@@ -15,7 +22,11 @@
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">投标人：</span>
<<<<<<< HEAD
<el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
=======
<el-input v-model="Bidder" clearable size="small" style="width:100px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span style="margin-left: 10px">开始日期：</span>
<el-date-picker
v-model="startTime"
@@ -41,6 +52,7 @@
<el-table
v-loading="tableData1Loading"
:data="tableData1"
<<<<<<< HEAD
style="width: 100%; margin-top: 3px"
height="770"
highlight-current-row=""
@@ -48,6 +60,13 @@
stripe
size="mini">
<el-table-column align="center" label="投标结果" width="200">
=======
style="width: 100%"
height="600"
border
size="mini">
<el-table-column align="center" label="投标结果" width="190">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
<el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -55,7 +74,11 @@
</el-radio-group>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="公布日期" width="90">
=======
<el-table-column align="center" label="公布日期" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
</template>
@@ -70,7 +93,11 @@
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="100">
=======
<el-table-column align="center" label="联系电话" width="120">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系电话 }}
</template>
@@ -140,6 +167,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-tooltip effect="dark" content="收回" placement="top">
@@ -189,6 +217,38 @@
</el-table-column>
</el-table>
<div class="block">
=======
<el-table-column label="操作" fixed="right" align="center" width="400">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="success"
icon="el-icon-edit"
@click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
<el-button
:disabled="scope.row.是否禁用履约"
size="mini"
type="info"
icon="el-icon-edit"
@click.stop="ComplianceGold(scope.row)">履约</el-button>
<el-button
:disabled="scope.row.是否禁用编辑"
size="mini"
type="primary"
icon="el-icon-edit"
@click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
<el-button
:disabled="scope.row.是否禁用删除"
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="delBidBond(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
@@ -213,7 +273,11 @@
@node-click="handleNodeClick"
/>
</div>
<<<<<<< HEAD
<el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange" >
=======
<el-table :data="ListPeople" highlight-current-row height="400" size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
@@ -241,7 +305,11 @@
</el-dialog>
<!--收回投标保证金-->
<<<<<<< HEAD
<el-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="20%">
=======
<el-dialog :visible.sync="dialogFormVisible1" title="收回" center style="min-height: 300px" width="20%">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="实际收回日期" prop="收回日期">
<el-date-picker
@@ -301,7 +369,11 @@
</el-col>
<el-col :span="12">
<el-form-item label="投标人" prop="投标人">
<<<<<<< HEAD
<el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2;searchPer()" @clear="clear()"/>
=======
<el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-form-item>
</el-col>
</el-row>
@@ -684,7 +756,11 @@ export default {
},
addBidBond() {
this.addForm('form2')
<<<<<<< HEAD
this.title = '新增投标保证金'
=======
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible2 = true
},
addTableData1() {
@@ -701,7 +777,11 @@ export default {
},
editBidBond(row) {
this.editForm(row, 'form2')
<<<<<<< HEAD
this.title = '编辑投标保证金'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible2 = true
this.form2.招标企业 = row.招标企业
this.form2.联系人 = row.联系人

121
src/views/MarketingCenter/CRM/index.vue
View File

@@ -2,7 +2,11 @@
<div class="app-container">
<el-card>
<span>客户名称：</span>
<<<<<<< HEAD
<el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px" size="small" clearable>
=======
<el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin-right: 10px" size="small" clearable>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in CustomerName"
:key="item.value"
@@ -21,11 +25,20 @@
<!--:value="item.value">-->
<!--</el-option>-->
<!--</el-select>-->
<<<<<<< HEAD
<el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
</el-card>
<el-card>
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
=======
<el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
</el-card>
<el-card>
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
<span style="float: right">销售经理</span>
<el-table v-loading="loading3" :data="tableData3" height="192" size="mini" style="width: 100%;margin-top: 10px" border>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<!--<el-table-column label="责权省份" align="center" min-width="80">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.省份 }}-->
@@ -51,6 +64,7 @@
{{ scope.row.出生日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" align="center" width="100px" fixed="right">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -72,18 +86,37 @@
@click="handleDeleteMarketingManager(scope.$index, scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
</el-card>
<el-row>
<<<<<<< HEAD
<el-col :span="3">
=======
<el-col :span="5">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-card>
<el-table
v-loading="loading1"
ref="multipleTable"
:data="tableData1"
stripe
<<<<<<< HEAD
highlight-current-row
tooltip-effect="dark"
style="width: 100%; margin-top: 3px;"
@@ -91,11 +124,23 @@
size="mini"
border>
<el-table-column align="center" label="序号" width="65">
=======
tooltip-effect="dark"
style="width: 100%"
height="690"
size="mini"
border>
<el-table-column align="center" label="序号" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 30;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="地区" width="auto">
=======
<el-table-column align="center" label="地区">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.省份 }}
</template>
@@ -103,36 +148,65 @@
</el-table>
</el-card>
</el-col>
<<<<<<< HEAD
<el-col :span="21">
<el-card>
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
<el-table-column label="客户名称" align="center" min-width="180" show-overflow-tooltip>
=======
<el-col :span="19">
<el-card>
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<span style="float: right">客户信息</span>
<el-table v-loading="loading2" :data="tableData2" height="620" size="mini" style="width: 100%;margin-top: 10px" border>
<el-table-column label="客户名称" align="center" min-width="340">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="联系人" align="center" min-width="80" show-overflow-tooltip>
=======
<el-table-column label="联系人" align="center" min-width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="联系电话" align="center" min-width="100" show-overflow-tooltip>
=======
<el-table-column label="联系电话" align="center" min-width="300">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="开票电话" align="center" min-width="100">
=======
<el-table-column label="开票电话" align="center" min-width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.传真 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="联系地址" align="center" min-width="150" show-overflow-tooltip>
=======
<el-table-column label="联系地址" align="center" min-width="350">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.地址 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="电子邮箱" align="center" min-width="150">
=======
<el-table-column label="电子邮箱" align="center" min-width="250">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电子邮箱 }}
</template>
@@ -142,12 +216,20 @@
{{ scope.row.税号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>
=======
<el-table-column label="开户行" align="center" min-width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.开户行 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="银行账号" align="center" min-width="140">
=======
<el-table-column label="银行账号" align="center" min-width="260">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.银行账号 }}
</template>
@@ -157,11 +239,16 @@
{{ scope.row.价值评估 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="备注" align="center" show-overflow-tooltip>
=======
<el-table-column label="备注" align="center" min-width="350">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" align="center" min-width="100px" fixed="right">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -183,6 +270,20 @@
@click="handleDelete(scope.$index, scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" align="center" min-width="200px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleEdit(scope.row);flag1 = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -224,7 +325,11 @@
@node-click="handleNodeClick"
/>
</div>
<<<<<<< HEAD
<el-table :data="ListPeople" height="400" stripe style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
=======
<el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
@@ -530,7 +635,11 @@ export default {
},
addMarketingManager() {
this.dialogFormVisible1 = true
<<<<<<< HEAD
this.title1 = '新增营销经理'
=======
this.title1 = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.addForm('form1')
},
callOff1() {
@@ -603,7 +712,11 @@ export default {
},
handleEditMarketingManager(row) {
this.dialogFormVisible1 = true
<<<<<<< HEAD
this.title1 = '编辑营销经理'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.form1.营销经理 = row.姓名
this.peopleid = row.营销经理流水号
this.a = row.营销经理地区流水号
@@ -614,7 +727,11 @@ export default {
this.$message.warning('请选择一个省份')
} else {
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title2 = '新增客户'
=======
this.title2 = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
selectAdressOfID(this.AdressID).then(response => {
this.form2.省份 = response.data[0].省份
@@ -625,7 +742,11 @@ export default {
},
handleEdit(row) {
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title2 = '编辑客户'
=======
this.title2 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.form2.省份 = row.省份
this.form2.客户名称 = row.客户名称
this.form2.联系电话 = row.电话

129
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -2,7 +2,11 @@
<div>
<el-card>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin: 3px" size="small">
=======
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
@@ -12,7 +16,11 @@
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<span style="margin-left: 10px">销售经理：</span>
<<<<<<< HEAD
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
=======
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span style="margin-left: 10px">开始日期：</span>
<el-date-picker
v-model="startTime"
@@ -39,6 +47,7 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
highlight-current-row
<<<<<<< HEAD
style="width: 100%; margin-top: 3px"
height="600"
border
@@ -49,6 +58,17 @@
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData2" border stripe style="width: 400px; text-align: center" size="mini">
=======
style="width: 100%"
height="300"
border
size="mini"
@row-click="fetchTableData"
@expand-change="selectMachine">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 350px; text-align: center" size="mini">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="设备型号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -62,14 +82,22 @@
</el-table>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同编号" width="130">
=======
<el-table-column align="center" label="合同编号" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<template>
<el-tag slot="reference" type="small">{{ scope.row.合同编号 }}</el-tag>
</template>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
=======
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -104,33 +132,57 @@
{{ scope.row.安装调试节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="销售经理" width="90">
=======
<el-table-column align="center" label="销售经理" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="230" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称" width="230">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系人" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同信息备注" width="auto">
=======
<el-table-column align="center" label="合同信息备注" width="142">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
</el-table>
<<<<<<< HEAD
<div class="block">
=======
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
@@ -144,17 +196,28 @@
<!--营销经理选择-->
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
<<<<<<< HEAD
<span>责权省份: </span>
<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" size="small" @change="changeProvince">
=======
<span>责权省份</span>
<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in Province"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<div style="margin-top: 5px">
<el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
<el-table-column label="营销经理" align="center" >
=======
<div style="margin-top: 15px">
<el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -173,6 +236,7 @@
</el-dialog>
<el-card class="box-card">
<div class="block" style="border: 1px solid rgb(220, 223, 230)">
<<<<<<< HEAD
<el-carousel :autoplay="true" trigger="click" height="100px">
<el-carousel-item>
<el-button type="text" style="margin: 3px;padding: 0px;" @click="goToContractCapitalManagement">收款情况</el-button>
@@ -183,6 +247,17 @@
height="100"
border
stripe
=======
<el-carousel :autoplay="true" trigger="click" height="350px">
<el-carousel-item>
<el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToContractCapitalManagement">收款情况</el-button>
<el-table
v-loading="listLoadingContractCapitalManagement"
:data="tableDataContractCapitalManagement"
style="width: 99%;margin-left: 10px;margin-right: 10px"
height="300"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini">
<el-table-column align="center" label="付款方式" width="100">
<template slot-scope="scope">
@@ -244,6 +319,7 @@
</el-table>
</el-carousel-item>
<el-carousel-item>
<<<<<<< HEAD
<el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceRecord">开票情况</el-button>
<el-table
v-loading="listLoadingInvoiceRecord"
@@ -252,13 +328,26 @@
height="100"
border
stripe
=======
<el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceRecord">开票情况</el-button>
<el-table
v-loading="listLoadingInvoiceRecord"
:data="tableDataInvoiceRecord"
style="width: 99%;margin-left: 10px;margin-right: 10px"
height="300"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini">
<el-table-column
align="center"
label="序号"
type="index"
width="50"/>
<<<<<<< HEAD
<el-table-column align="center" label="发票抬头" width="200">
=======
<el-table-column align="center" label="发票抬头" width="180">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -306,16 +395,26 @@
</el-table>
</el-carousel-item>
<el-carousel-item>
<<<<<<< HEAD
<el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
=======
<el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="tableDataLoadingDeliveryManagement"
id="tb"
:data="tableDataDeliveryManagement"
highlight-current-row
<<<<<<< HEAD
style="width: 99%"
height="100"
border
stripe
=======
style="width: 99%;margin-left: 10px;margin-right: 10px"
height="300"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini"
>
<el-table-column align="center" label="发货单号">
@@ -366,6 +465,7 @@
</el-table>
</el-carousel-item>
<el-carousel-item>
<<<<<<< HEAD
<el-button type="text" style="margin: 3px;padding: 0px;" @click="goToBidBond">投标保证金</el-button>
<el-table
v-loading="tableData1LoadingBidBond"
@@ -374,6 +474,15 @@
height="100"
border
stripe
=======
<el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToBidBond">投标保证金</el-button>
<el-table
v-loading="tableData1LoadingBidBond"
:data="tableDataBidBond"
style="width: 99%;margin-left: 10px;margin-right: 10px"
height="300"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini">
<el-table-column align="center" label="投标结果" width="190">
<template slot-scope="scope">
@@ -471,15 +580,25 @@
</el-table>
</el-carousel-item>
<el-carousel-item>
<<<<<<< HEAD
<el-button type="text" style="margin: 3px;padding: 0px;" @click="goToPerformanceBond">履约保证金</el-button>
=======
<el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToPerformanceBond">履约保证金</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="listLoadingPerformanceBond"
v-show="showPerformanceBond"
:data="tableDataPerformanceBond"
<<<<<<< HEAD
style="width: 99%"
height="100"
border
stripe
=======
style="width: 99%;margin-left: 10px;margin-right: 10px"
height="300"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini">
<el-table-column align="center" label="履约保证金金额">
<template slot-scope="scope">
@@ -544,6 +663,7 @@
</div>
</el-carousel-item>
<el-carousel-item>
<<<<<<< HEAD
<el-button type="text" style="margin: 3px;padding: 0px;" @click="goToSafetyMargin">安全保证金</el-button>
<el-table
v-loading="listLoadingSafetyMargin"
@@ -552,6 +672,15 @@
height="100"
border
stripe
=======
<el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToSafetyMargin">安全保证金</el-button>
<el-table
v-loading="listLoadingSafetyMargin"
:data="tableDataSafetyMargin"
style="width: 99%;margin-left: 10px;margin-right: 10px"
height="300"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini">
<el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope">

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

@@ -2,19 +2,32 @@
<div class="app-container">
<el-card>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px " size="small" clearable>
=======
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
<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>
=======
<span style="margin-left: 10px">销售经理：</span>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
<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" type="text" @click="AccountsReceivable">查看收款信息</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-badge>
</el-card>
<el-card>
@@ -23,6 +36,7 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
:data="tableData1"
<<<<<<< HEAD
style="width: 100%;"
height="500px"
highlight-current-row
@@ -35,6 +49,19 @@
<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" >
=======
style="width: 100%;max-height: 440px;"
height="280"
highlight-current-row
border
size="mini"
@expand-change="selectMachine"
@row-click="getTableData2">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData3" border style="width: 600px; text-align: center" size="mini">
<el-table-column label="发货单号" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.发货单号 }}
</template>
@@ -52,78 +79,138 @@
</el-table>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同编号" 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="项目名称" width="80" show-overflow-tooltip>
=======
<el-table-column align="center" label="合同编号" width="150">
<template slot-scope="scope">
<el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="已完成进度" width="90">
=======
<el-table-column align="center" label="已完成进度" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.执行进度名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="付款方式" width="80">
=======
<el-table-column align="center" label="付款方式" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同总金额（万元）" width="130">
=======
<el-table-column align="center" label="合同总金额（万元）" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同总金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="已到账金额（万元）" width="130">
=======
<el-table-column align="center" label="已到账金额（万元）" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.已支付 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="未到账金额（万元）" width="130">
<template slot-scope="scope">
<el-tag size="mini" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
=======
<el-table-column align="center" label="未到账金额（万元）" width="150">
<template slot-scope="scope">
<el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
<el-table-column align="center" label="付款进度" width="150">
<template slot-scope="scope">
<div style="width: 130px">
<<<<<<< HEAD
<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="70">
=======
<el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" status="success" />
</div>
</template>
</el-table-column>
<el-table-column align="center" label="营销经理" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称" width="260">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="60">
=======
<el-table-column align="center" label="联系人" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>
=======
<el-table-column align="center" label="银行账号" width="230">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.银行账号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="税号" show-overflow-tooltip>
=======
<el-table-column align="center" label="税号" width="230">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.税号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="140">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -150,6 +237,25 @@
</el-table-column>
</el-table>
<div class="block">
=======
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用编辑"
size="mini"
type="warning"
icon="el-icon-edit"
@click.stop="EditTableData(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="dellist(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
@@ -167,6 +273,7 @@
:row-key="getRowKeys1"
:expand-row-keys="expands1"
:data="tableData2"
<<<<<<< HEAD
style="width: 100%;max-height: 440px;text-align: center"
height="210"
highlight-current-row
@@ -177,6 +284,17 @@
<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">
=======
style="width: 100%;max-height: 440px; margin-top: 15px; text-align: center"
height="220"
highlight-current-row
border
size="mini"
@expand-change="selectMachine1">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData4" border style="width: 600px; text-align: center" size="mini">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
align="center"
label="序号"
@@ -194,6 +312,7 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="250">
<template slot-scope="scope">
<<<<<<< HEAD
<el-tooltip effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
@@ -213,6 +332,18 @@
@click="handleDelete2(scope.row)"/>
</div>
</el-tooltip>
=======
<el-button
size="mini"
type="warning"
icon="el-icon-delete"
@click="handleEdit2(scope.row);flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete2(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -233,19 +364,33 @@
{{ scope.row.已收金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="未收金额（万元）" width="200px">
=======
<el-table-column align="center" label="未收金额（万元）" width="180px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="转下阶段收款金额" width="200px">
=======
<el-table-column align="center" label="转下阶段收款金额" width="180px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.转下阶段金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="收款阶段" width="200px">
<template slot-scope="scope">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
=======
<el-table-column align="center" label="收款阶段" width="180px">
<template slot-scope="scope">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="small" @change="changeTime(scope.row)">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in plannedTime"
:key="item.value"
@@ -254,6 +399,7 @@
</el-select>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="截止时间" width="200px">
<template slot-scope="scope">
<span>后</span>
@@ -262,6 +408,16 @@
</template>
</el-table-column>
<el-table-column align="center" label="状态" >
=======
<el-table-column align="center" label="截止时间" width="180px">
<template slot-scope="scope">
<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="状态" width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-popover
placement="top-start"
@@ -285,6 +441,7 @@
</el-popover>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="140">
<template slot-scope="scope">
<el-tooltip effect="dark" content="收款" placement="top">
@@ -314,6 +471,38 @@
</el-card>
<!--新增合同资金对话框-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
=======
<el-table-column label="操作" fixed="right" align="center" width="220">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收款"
size="mini"
type="warning"
icon="el-icon-edit"
@click="handleEdit1(scope.row);flag=1">收款</el-button>
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="danger"
icon="el-icon-sort"
@click="TransferPlan(scope.row)">收款转移</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize2"
:total="total2"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<!--新增合同资金对话框-->
<el-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
@@ -337,7 +526,11 @@
</div>
</el-dialog>
<!--编辑合同资金对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
=======
<el-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
@@ -361,7 +554,11 @@
</div>
</el-dialog>
<!--付款对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
=======
<el-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form" :model="form" :rules="rules1" label-position="left">
<el-form-item label="项目名称" prop="EntryName" label-width="100px">
<el-input v-model="form.EntryName" :disabled="true" size="small" placeholder="请输入项目名称"/>
@@ -399,10 +596,17 @@
</div>
</el-dialog>
<!--营销经理选择-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<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>
=======
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" @click="searchName">查询</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
@@ -412,7 +616,11 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<<<<<<< HEAD
<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 style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -431,7 +639,11 @@
</div>
</el-dialog>
<!--编辑批次资金-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
=======
<el-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form3" :model="form3" :rules="rules2" label-position="left">
<el-form-item label="本次收款金额" prop="本次付款" label-width="110px">
<el-input-number v-model="form3.本次付款" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 232px" placeholder="请输入本次付款金额" @change="changeMoney"/>
@@ -452,7 +664,11 @@
</div>
</el-dialog>
<!--转移收款-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
=======
<el-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form4" :model="form4" :rules="rules3" label-position="left">
<el-form-item label="转移金额" prop="转移金额" label-width="110px">
<el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
@@ -473,14 +689,24 @@
</div>
</el-dialog>
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" width="60%" >
<el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border stripe>
<el-table-column property="date" label="项目名称" align="center" show-overflow-tooltip>
=======
<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">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column property="name" label="客户名称" align="center" show-overflow-tooltip>
=======
<el-table-column property="name" label="客户名称" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -490,7 +716,11 @@
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column property="date" label="联系电话" align="center" width="200px" show-overflow-tooltip>
=======
<el-table-column property="date" label="联系电话" align="center" width="120px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
@@ -510,6 +740,7 @@
{{ scope.row.状态 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column property="date" label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="立即收款" placement="top">
@@ -531,6 +762,18 @@
@click="Never(scope.row)"/>
</div>
</el-tooltip>
=======
<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>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -833,7 +1076,11 @@ export default {
},
handleEdit2(row) {
this.editForm(row, 'form3')
<<<<<<< HEAD
this.title = '编辑阶段收款'
=======
this.title = '修改阶段收款'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.max1 = parseFloat(this.max2) + parseFloat(row.本次收款金额)
this.dialogFormVisible3 = true
this.form3.本次付款 = row.本次收款金额
@@ -1220,7 +1467,11 @@ export default {
handleEdit1(row) {
this.addForm('form3')
this.changeTime1()
<<<<<<< HEAD
this.title = '收款'
=======
this.title = '阶段记录收款'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
this.dialogFormVisible3 = true
this.id = row.批次资金id
@@ -1685,22 +1936,33 @@ export default {
</script>
<style scoped>
<<<<<<< HEAD
/*.el-card {*/
/* !*margin-top: 15px;*!*/
/*}*/
=======
.el-card {
margin-top: 15px;
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
.el-date-editor{
width:237px;
}
.item {
float: right;
<<<<<<< HEAD
margin: 3px;
=======
margin-top: 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
margin-right: 40px;
}
.el-table td, .el-table th.is-leaf,
.el-radio__inner,
.el-input__inner{
border: 1px solid black!important;
<<<<<<< HEAD
width: 150px;
white-space: nowrap;
overflow: hidden;
@@ -1724,5 +1986,7 @@ export default {
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
</style>

225
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -1,9 +1,16 @@
<template>
<div class="app-container">
<<<<<<< HEAD
<el-card style="background: rgb(233,240,250)">
<div>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px;">
=======
<el-card>
<div>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
@@ -12,10 +19,17 @@
</el-select>
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<<<<<<< HEAD
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
</div>
<div style="margin-top: 10px">
=======
<span style="margin-left: 10px">销售经理：</span>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
</div>
<div style="margin-top: 20px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span style="margin-top: 20px">开始日期：</span>
<el-date-picker
v-model="startTime"
@@ -27,7 +41,11 @@
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
<<<<<<< HEAD
style="width: 200px;margin-bottom: 3px;"
=======
style="width: 200px;"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -42,6 +60,7 @@
:data="tableData1"
:row-key="getRowKeys"
:expand-row-keys="expands"
<<<<<<< HEAD
highlight-current-row
style="width: 100%;margin: 3px 0px"
height="500"
@@ -54,11 +73,27 @@
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" size="mini" border stripe style="width: 482px; text-align: center">
<el-table-column label="设备型号" align="center" width="140">
=======
style="width: 100%"
height="460"
border
size="mini"
@row-click="fetchExecutionProgressdata"
@expand-change="selectMachine">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 571px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="130">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="设备名称" align="center" width="160" show-overflow-tooltip>
=======
<el-table-column label="设备名称" align="center" width="160">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -68,6 +103,7 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" width="100" align="center">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -96,85 +132,166 @@
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="130">
=======
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-edit"
@click="editMachine(scope.row);flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="deleteMachine(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<template>
<el-popover
placement="right"
<<<<<<< HEAD
width="200"
trigger="hover">
<div v-show="!scope.row.招标企业" style="text-align: center">
<h4 style="margin: 5px 0">未缴纳投标保证金</h4>
=======
title="投标保证金情况"
width="300"
trigger="hover">
<div v-show="!scope.row.招标企业" style="text-align: center">
<h4>未缴纳投标保证金</h4>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</div>
<div v-show="scope.row.招标企业">
<h4>招标企业： {{ scope.row.招标企业 }}</h4>
<h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
<h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
</div>
<<<<<<< HEAD
<el-tag slot="reference" size="small">{{ scope.row.合同编号 }}</el-tag>
=======
<el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-popover>
</template>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="190" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称" width="260">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目名称" width="140" show-overflow-tooltip>
=======
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="付款方式" width="70">
=======
<el-table-column align="center" label="付款方式" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同签订日期" width="100">
=======
<el-table-column align="center" label="合同签订日期" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="图纸会签节点" width="100">
=======
<el-table-column align="center" label="图纸会签节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.图纸会签节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="设备预验收节点" width="110">
=======
<el-table-column align="center" label="设备预验收节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.设备预验收节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="发货节点" width="85">
=======
<el-table-column align="center" label="发货节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.发货节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="安装调试节点" width="100">
=======
<el-table-column align="center" label="安装调试节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.安装调试节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="销售经理" width="85">
=======
<el-table-column align="center" label="销售经理" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系人" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同信息备注" >
=======
<el-table-column align="center" label="合同信息备注" width="250">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-button
@@ -206,12 +323,38 @@
</el-table-column>
</el-table>
<div class="block" >
=======
<el-table-column label="操作" fixed="right" align="center" width="300">
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-plus"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click.stop="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize"
:total="total"
<<<<<<< HEAD
style="margin-bottom: 3px;"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
@@ -219,7 +362,11 @@
</el-card>
<el-card v-show="ExecutionProgressShow">
<div>
<<<<<<< HEAD
<h4 style="display: inline-block;margin: 3px;">项目进度</h4>
=======
<h4 style="display: inline-block">项目进度</h4>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div style="display: inline-block; float:right">
<span>已完成进度：</span>
<el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
@@ -246,7 +393,11 @@
</div>
</el-card>
<el-card v-show="uploader" style="min-height: 145px;">
<<<<<<< HEAD
<h4 style="margin: 3px;">纪要文件</h4>
=======
<h4>纪要文件</h4>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div style="float: right;">
<el-upload
:action="action"
@@ -256,7 +407,11 @@
:file-list="fileList"
class="upload-demo"
multiple>
<<<<<<< HEAD
<el-button size="small" type="primary" plain icon="el-icon-upload2">点击上传</el-button>
=======
<el-button size="small" type="primary">点击上传</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-upload>
</div>
<div v-for="(file, key) in hadFile" :key="key">
@@ -277,7 +432,11 @@
</div>
</el-card>
<!--新增合同信息对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
=======
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -302,7 +461,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<<<<<<< HEAD
<el-form-item label="营销经理" prop="MarketingManagerValue">
=======
<el-form-item label="销售经理" prop="MarketingManagerValue">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
</el-form-item>
</el-col>
@@ -391,7 +554,11 @@
</el-dialog>
<!--新增机床对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
=======
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
<el-form-item label="设备型号" prop="设备型号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
@@ -410,10 +577,17 @@
</el-dialog>
<!--营销经理选择-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>
=======
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" @click="searchName">查询</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
@@ -423,7 +597,11 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<<<<<<< HEAD
<el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
=======
<el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -443,7 +621,11 @@
</el-dialog>
<!--投标保证金选择-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
=======
<el-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>招标企业：</span>
<el-input v-model="enterprise" size="small" style="width:200px" clearable/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
@@ -454,7 +636,10 @@
style="width: 100%"
height="400"
border
<<<<<<< HEAD
stripe
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini"
@row-click="biddingNum">
<el-table-column align="center" label="招标企业" width="300">
@@ -509,7 +694,11 @@
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<<<<<<< HEAD
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 330px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
=======
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" size="mini" @row-click="handleCustomerChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="省份" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.省份 }}
@@ -536,7 +725,10 @@
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize1"
:total="total1"
<<<<<<< HEAD
style="margin-top: 10px"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
@@ -547,7 +739,11 @@
</el-dialog>
<!--改变节点时间对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
=======
<el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px">
<el-form-item label="进度完成日期" prop="进度完成日期">
<el-date-picker
@@ -922,7 +1118,11 @@ export default {
this.addForm('form')
this.dialogFormVisible1 = true
this.temp = 1
<<<<<<< HEAD
this.title = '新增合同'
=======
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.disabled = false
this.biddingNumber = ''
this.tableDataBidding = []
@@ -962,7 +1162,11 @@ export default {
},
handleEdit(row) {
this.editForm(row, 'form')
<<<<<<< HEAD
this.title = '编辑合同'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.form.contractSigningDate = row.合同签订日期
this.form.contractNumber = row.合同编号
@@ -1120,13 +1324,21 @@ export default {
addMachine(row) {
this.projectNum = row.项目流水号
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '新增机床'
=======
this.title1 = '新增'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.addForm('form1')
},
editMachine(row) {
this.editForm(row, 'form1')
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '编辑机床'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.c = row.机床流水号
this.form1.设备型号 = row.机床图号
this.form1.设备名称 = row.机床名称
@@ -1278,9 +1490,15 @@ export default {
}
}
</script>
<<<<<<< HEAD
<style scoped>
.el-table--scrollable-y .el-table__body-wrapper {overflow: hidden !important}
.el-table--scrollable-x .el-table__body-wrapper {overflow: hidden !important}
=======
<style scoped>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
.el-date-editor{
width:200px;
}
@@ -1312,7 +1530,11 @@ export default {
}
.delete:hover{
background: -webkit-linear-gradient(top,#0ba9e3,#0099d3);
<<<<<<< HEAD
color: #ff0511;
=======
color: #fff;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
a{
text-decoration: none;
@@ -1338,6 +1560,7 @@ a{
border: 1px solid black!important;
}
</style>
<<<<<<< HEAD
<style lang="scss">
.subTableHeader {
th {
@@ -1354,3 +1577,5 @@ a{
}
}
</style>
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

80
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -3,13 +3,18 @@
<el-card>
<div>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px">
=======
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
</div>
@@ -18,14 +23,31 @@
<el-date-picker
v-model="startTime"
style="width: 200px;"
=======
<span style="">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
</div>
<div style="margin-top: 20px">
<span style="margin-top: 20px">开始日期：</span>
<el-date-picker
v-model="startTime"
style="width: 205px;"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<<<<<<< HEAD
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 200px;"
=======
<span style="">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 205px;"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -41,12 +63,20 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
style="width: 100%"
<<<<<<< HEAD
height="700"
border
stripe
size="mini"
@expand-change="selectMachine">
<el-table-column type="expand" label="详情">
=======
height="500"
border
size="mini"
@expand-change="selectMachine">
<el-table-column type="expand">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 612px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="150">
@@ -81,29 +111,49 @@
</el-table>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同编号" width="150">
=======
<el-table-column align="center" label="合同编号">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<template>
<el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
</template>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目名称" width="150">
=======
<el-table-column align="center" label="项目名称">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目下达日期" width="150">
=======
<el-table-column align="center" label="项目下达日期">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同信息备注" width="150">
=======
<el-table-column align="center" label="合同信息备注" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" align="center" width="350">
=======
<el-table-column label="操作" fixed="right" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-button
size="mini"
@@ -148,7 +198,10 @@
<el-date-picker
v-model="form.contractSigningDate"
style="width: 200px"
<<<<<<< HEAD
format="yyyy-MM-dd"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -175,9 +228,12 @@
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
<<<<<<< HEAD
<el-form-item v-show="flag != 2" label="项目名称" prop="项目名称">
<el-input v-model="form1.项目名称" size="small" style="width:200px"/>
</el-form-item>
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form-item label="设备型号" prop="设备型号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
</el-form-item>
@@ -198,7 +254,10 @@
<script>
import elInput from 'element-ui/packages/input'
<<<<<<< HEAD
import { getNowTime } from '@/utils/tool'
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
import { initProject, searchTable1, selectMachine, addList, editchar, delList, submitMachine, editMachine, delMachine } from '@/api/MarketingCenter/CreateProject'
export default {
components: {
@@ -241,7 +300,10 @@ export default {
dialogFormVisible2: false,
title1: '',
form1: {
<<<<<<< HEAD
项目名称: '',
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
设备型号: '',
设备名称: '',
机床数量: 1
@@ -306,9 +368,14 @@ export default {
ADD() {
this.addForm('form')
this.dialogFormVisible1 = true
<<<<<<< HEAD
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
this.title = '新增项目'
=======
this.temp = 1
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
// 提交添加或者修改
submit(formName) {
@@ -342,7 +409,11 @@ export default {
},
handleEdit(row) {
this.editForm(row, 'form')
<<<<<<< HEAD
this.title = '编辑项目'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.form.contractSigningDate = row.合同签订日期
this.form.contractNumber = row.合同编号
@@ -368,9 +439,14 @@ export default {
addMachine(row) {
this.projectNum = row.项目流水号
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '新增机床'
this.addForm('form1')
this.form1.项目名称 = row.项目名称
=======
this.title1 = '新增'
this.addForm('form1')
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
submitMachine() {
function a() {
@@ -397,7 +473,11 @@ export default {
this.flag = 2
this.editForm(row, 'form1')
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '编辑机床'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.c = row.机床流水号
this.form1.设备型号 = row.机床图号
this.form1.设备名称 = row.机床名称

56
src/views/MarketingCenter/DeliveryApplication/index.vue
View File

@@ -3,7 +3,11 @@
<el-card class="box-card">
<div>
<el-row>
<<<<<<< HEAD
<el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
=======
<el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">增加</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" @click="function_InvoiceEdit">编辑</el-button>
<el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" @click="function_InvoiceSave">保存</el-button>
<el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" @click="function_InvoiceExamine">核准</el-button>
@@ -40,7 +44,11 @@
<!--<el-button icon="el-icon-refresh" size="mini" @click="function_Refresh">刷新</el-button>-->
</div>
<<<<<<< HEAD
<el-divider class="fengexian" content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show"> 展开</el-button></el-divider>
=======
<el-divider content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show"> 展开</el-button></el-divider>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div v-show="show" style="margin-top: 20px" class="transition-box">
<el-collapse-transition>
<div class="text item">
@@ -69,7 +77,11 @@
size="mini"/>
</el-col>
</el-row>
<<<<<<< HEAD
<el-row style="margin-top: 5px">
=======
<el-row style="margin-top: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-col :span="24">
<span style="width:80px;display:inline-block;">车辆牌号：</span>
<el-input
@@ -94,7 +106,11 @@
size="mini"/>
</el-col>
</el-row>
<<<<<<< HEAD
<el-row style="margin-top: 5px">
=======
<el-row style="margin-top: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-col :span="24">
<span style="width:80px;display:inline-block;">制单人：</span>
<el-input
@@ -119,7 +135,11 @@
size="mini"/>
</el-col>
</el-row>
<<<<<<< HEAD
<el-row style="margin-top: 5px">
=======
<el-row style="margin-top: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-col :span="24">
<span style="width:80px;display:inline-block;">制单日期：</span>
<el-date-picker
@@ -139,7 +159,11 @@
placeholder="结束日期"/>
</el-col>
</el-row>
<<<<<<< HEAD
<el-row style="margin-top: 5px">
=======
<el-row style="margin-top: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-col :span="24">
<span style="width:80px;display:inline-block;">核准日期：</span>
<el-date-picker
@@ -159,7 +183,11 @@
placeholder="结束日期"/>
</el-col>
</el-row>
<<<<<<< HEAD
<el-row style="margin-top: 5px">
=======
<el-row style="margin-top: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-col :span="24">
<span style="width:80px;display:inline-block;">发货日期：</span>
<el-date-picker
@@ -284,7 +312,11 @@
:data="tableData"
highlight-current-row
style="width: 100%"
<<<<<<< HEAD
height="560"
=======
height="300"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
border
size="mini">
<el-table-column align="center" label="货品类别" width="80">
@@ -333,7 +365,11 @@
:disabled="disabledDetailsDelete"
size="mini"
type="text"
<<<<<<< HEAD
icon="el-icon-delete"
=======
icon="el-icon-delete-solid"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click.native.prevent="deleteRow(scope.$index, tableData)"
>删除</el-button>
</template>
@@ -462,7 +498,10 @@
style="width: 100%"
height="200"
border
<<<<<<< HEAD
stripe
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini"
@selection-change="handleSelectionChangeMachine">
<el-table-column
@@ -578,7 +617,11 @@
{{ scope.row.发货人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="制单时间" show-overflow-tooltip>
=======
<el-table-column align="center" label="制单时间">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.操作日期 }}
</template>
@@ -1202,15 +1245,22 @@ export default {
</style>
<style scoped>
<<<<<<< HEAD
.el-divider{
margin: 5px;
}
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
.text {
font-size: 14px;
}
.item {
<<<<<<< HEAD
margin-bottom: 5px;
=======
margin-bottom: 18px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.clearfix:before,
@@ -1221,4 +1271,10 @@ export default {
.clearfix:after {
clear: both
}
<<<<<<< HEAD
=======
.el-card{
margin-top: 2px;
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</style>

134
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -3,14 +3,22 @@
<!--查询条件-->
<el-card>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
=======
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">营销经理：</span>
=======
<span style="margin-left: 10px">销售经理：</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
<span style="margin-left: 10px">开始日期：</span>
<el-date-picker
@@ -36,6 +44,7 @@
v-loading="listLoading1"
:data="tableData1"
highlight-current-row
<<<<<<< HEAD
style="width: 100%;margin-top: 3px"
height="460"
border
@@ -48,16 +57,37 @@
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
=======
style="width: 100%"
height="300"
border
size="mini"
@row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" width="200">
<template slot-scope="scope">
<el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="付款方式" width="100">
=======
<el-table-column align="center" label="付款方式" width="120">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同签订日期" width="100">
=======
<el-table-column align="center" label="合同签订日期" width="120">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
@@ -67,6 +97,7 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同总金额（含税）" width="130">
<template slot-scope="scope">
<el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
@@ -77,11 +108,27 @@
<template slot-scope="scope">
<el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
<el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ scope.row.已支付 }} </el-tag>
=======
<el-table-column align="center" label="合同总金额（含税）" width="150">
<template slot-scope="scope">
<el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="small" style="width: 80px" type="warning">无收款计划</el-tag>
<el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.合同总金额 }} </el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="已到账金额" width="150">
<template slot-scope="scope">
<el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="small" style="width: 80px" type="warning">无收款计划</el-tag>
<el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.已支付 }} </el-tag>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
<el-table-column align="center" label="税率" width="100">
<template slot-scope="scope">
<<<<<<< HEAD
<el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
=======
<el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注">
@@ -93,20 +140,31 @@
<template slot-scope="scope">
<el-button
size="mini"
<<<<<<< HEAD
type="text"
=======
type="primary"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
icon="el-icon-circle-plus-outline"
@click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">新增记录</el-button>
</template>
</el-table-column>
</el-table>
<<<<<<< HEAD
<div class="block">
=======
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
<<<<<<< HEAD
style="margin: 3px"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
@@ -118,18 +176,28 @@
:data="tableData2"
:summary-method="getSummaries"
show-summary
<<<<<<< HEAD
style="width: 100%;margin-top: 3px"
height="300"
highlight-current-row
border
stripe
=======
style="width: 100%"
height="320"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini">
<el-table-column
align="center"
label="序号"
type="index"
width="50"/>
<<<<<<< HEAD
<el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>
=======
<el-table-column align="center" label="发票抬头" width="180">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -159,12 +227,20 @@
{{ scope.row.银行账号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="开票金额（含税）" width="120">
=======
<el-table-column align="center" label="开票金额（含税）" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="开票时间" width="100">
=======
<el-table-column align="center" label="开票时间" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
@@ -174,6 +250,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -195,6 +272,20 @@
@click.stop="delInvoiceRecordingDialog(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-edit"
@click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="delInvoiceRecordingDialog(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -204,7 +295,11 @@
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<<<<<<< HEAD
<el-button size="small" type="success" style="margin-left: 10px;" icon="el-icon-search" @click="searchName">查询</el-button>
=======
<el-button size="small" type="success" @click="searchName">查询</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
@@ -213,8 +308,13 @@
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<<<<<<< HEAD
<div style="margin-top: 5px">
<el-table :data="dataPeople" border size="mini" stripe style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
=======
<div style="margin-top: 15px">
<el-table :data="dataPeople" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -301,16 +401,27 @@
</div>
</el-dialog>
<!--客户选择-->
<<<<<<< HEAD
<el-dialog :visible.sync="dialogCustomerFormVisible" title="选择客户" center width="600px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" border stripe size="mini" highlight-current-row height="400" show-overflow-tooltip style="height: 330px; margin-top: 5px" @row-click="handleCustomerChange">
=======
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="省份" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.省份 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="客户名称" align="center" show-overflow-tooltip>
=======
<el-table-column label="客户名称" align="center" >
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -331,7 +442,10 @@
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize1"
:total="total1"
<<<<<<< HEAD
style="margin-top: 10px"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
@@ -430,9 +544,13 @@ export default {
},
openName() {
this.name = ''
<<<<<<< HEAD
SelectMarketingManager(this.name).then(response => {
this.dataPeople = response.data
})
=======
this.dataPeople = []
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisiblePeople = true
},
// 初始化条件
@@ -572,12 +690,19 @@ export default {
this.timetime = row.合同签订日期
this.changeTime()
this.addForm('form')
<<<<<<< HEAD
this.title = '增加开票记录'
=======
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
},
// 打开选择
CustomerChange() {
<<<<<<< HEAD
this.fetchCustomerData()
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogCustomerFormVisible = true
},
offCustomerChange() {
@@ -651,7 +776,11 @@ export default {
},
openEditInvoiceRecordingDialog(row) {
this.editForm(row, 'form')
<<<<<<< HEAD
this.title = '编辑开票记录'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.CustomerCode = row.客户流水号
this.form.客户名称 = row.客户名称
@@ -699,10 +828,15 @@ export default {
}
</script>
<<<<<<< HEAD
<style lang="scss">
/*.tableInput{*/
/* .el-textarea__inner, .el-radio__inner, .el-input__inner{*/
/* border: 1px solid #F56C6C !important*/
/* }*/
/*}*/
=======
<style scoped>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</style>

92
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -2,7 +2,11 @@
<div>
<el-card>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
=======
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
@@ -32,6 +36,7 @@
<el-table
v-loading="listLoading1"
:data="tableData1"
<<<<<<< HEAD
style="width: 100%;margin-top: 3px;"
height="600"
border
@@ -45,6 +50,20 @@
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
=======
style="width: 100%"
height="400"
border
size="mini"
highlight-current-row
@row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" width="200">
<template slot-scope="scope">
<el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -54,27 +73,47 @@
{{ scope.row.执行进度名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同签订日期" width="100">
=======
<el-table-column align="center" label="合同签订日期">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="销售经理" width="90">
=======
<el-table-column align="center" label="销售经理" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="80" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系人" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
@@ -84,24 +123,40 @@
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="300px">
=======
<el-table-column label="操作" fixed="right" align="center" width="260px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用增加履约保证金"
size="mini"
<<<<<<< HEAD
type="text"
=======
type="primary"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
icon="el-icon-circle-plus-outline"
@click.stop="openPerformanceBondDialog(scope.row); flag = 1">履约保证金</el-button>
<el-button
:disabled="scope.row.是否禁用增加履约保函"
size="mini"
<<<<<<< HEAD
type="text"
=======
type="primary"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
icon="el-icon-circle-plus-outline"
@click.stop="addPerformanceGuarantee(scope.row)">履约保函</el-button>
</template>
</el-table-column>
</el-table>
<<<<<<< HEAD
<div class="block" style="margin-top: 3px;">
=======
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
@@ -114,14 +169,23 @@
</el-card>
<el-card>
<template>
<<<<<<< HEAD
<el-tabs v-model="activeName" type="card" style="margin: 0px">
=======
<el-tabs v-model="activeName" type="card">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-tab-pane :disabled="performanceBondDisabled" label="履约保证金" name="first">
<el-table
v-loading="listLoading2"
:data="tableData2"
highlight-current-row
<<<<<<< HEAD
style="width: 100%;margin-top: 3px;"
height="130"
=======
style="width: 100%"
height="100"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
border
size="mini">
<el-table-column align="center" label="履约保证金金额">
@@ -179,6 +243,7 @@
</el-popover>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="200px">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="收回" placement="top">
@@ -213,13 +278,36 @@
@click.stop="delPerformanceBond(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" fixed="right" align="center" width="260px">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收回"
size="mini"
type="success"
@click.stop="takeBack(scope.row)">收回</el-button>
<el-button
:disabled="scope.row.是否禁用编辑"
size="mini"
type="warning"
@click.stop="openEditPerformanceBondDialog(scope.row); flag = 2">编辑</el-button>
<el-button
:disabled="scope.row.是否禁用删除"
size="mini"
type="danger"
@click.stop="delPerformanceBond(scope.row)">删除</el-button >
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
<div v-show="performanceGuaranteeShow">
<<<<<<< HEAD
<el-button type="danger" icon="el-icon-delete" plain size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
=======
<el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
<el-upload
:on-preview="handlePictureCardPreview"
@@ -528,7 +616,11 @@ export default {
},
openPerformanceBondDialog(row) {
this.addForm('form2')
<<<<<<< HEAD
this.title1 = '新增履约保证金'
=======
this.title1 = '增加履约保证金'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.projectId = row.项目流水号
this.tableData2 = []

185
src/views/MarketingCenter/SafetyMargin/index.vue
View File

@@ -3,7 +3,11 @@
<!--顶栏结构-->
<el-card>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin:3px;">
=======
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin-left: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
@@ -33,6 +37,7 @@
<el-table
v-loading="listLoadingProject"
:data="projectTableData"
<<<<<<< HEAD
style="width: 100%;margin-top: 3px;"
height="650"
border
@@ -46,6 +51,20 @@
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="160" show-overflow-tooltip>
=======
style="width: 100%"
height="400"
border
size="mini"
highlight-current-row
@row-click="fetchTableData1">
<el-table-column align="center" label="合同编号" width="200">
<template slot-scope="scope">
<el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -55,49 +74,85 @@
{{ scope.row.执行进度名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同签订日期" width="130">
=======
<el-table-column align="center" label="合同签订日期">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="销售经理" width="100">
=======
<el-table-column align="center" label="销售经理" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="250" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="100" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系人" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同信息备注" >
=======
<el-table-column align="center" label="合同信息备注">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150px">
=======
<el-table-column label="操作" fixed="right" align="center" width="125px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用增加安全保证金"
size="mini"
<<<<<<< HEAD
type="text"
=======
type="primary"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
icon="el-icon-circle-plus-outline"
@click.stop="addSafetyMargin(scope.row);flag1 = 1">安全保证金
</el-button>
</template>
</el-table-column>
</el-table>
<<<<<<< HEAD
<div class="block" style="margin-top: 3px;">
=======
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrentProject"
:page-sizes="[10, 20, 30, 40]"
@@ -111,13 +166,22 @@
<!--安全保证金表格-->
<el-card>
<<<<<<< HEAD
=======
<span style="float: right; margin-bottom: 15px">安全保证金记录</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table
v-loading="tableData1Loading"
:data="tableData1"
style="width: 100%"
<<<<<<< HEAD
highlight-current-row
border
stripe
=======
height="79"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini"
@row-click="fetchTableData2">
<!--<el-table-column align="center" label="项目名称" width="300">-->
@@ -209,6 +273,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="收回" placement="top">
@@ -254,6 +319,34 @@
@click.stop="delSafetyMargin(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" fixed="right" align="center" width="370">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收回"
size="mini"
type="success"
icon="el-icon-edit"
@click.stop="TakeBack(scope.row);flag1 = 5">收回</el-button>
<el-button
:disabled="scope.row.是否禁用扣款"
size="mini"
type="info"
icon="el-icon-edit"
@click.stop="Withdrawing(scope.row);flag1 = 3">扣款</el-button>
<el-button
:disabled="scope.row.是否禁用编辑"
size="mini"
type="primary"
icon="el-icon-edit"
@click.stop="editSafetyMargin(scope.row);flag1 = 2">编辑</el-button>
<el-button
:disabled="scope.row.是否禁用删除"
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="delSafetyMargin(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -268,9 +361,72 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<<<<<<< HEAD
<!--新增编辑保证金信息对话框-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
=======
<!--扣款记录表格-->
<el-card>
<span style="float: right; margin-bottom: 15px">扣款记录</span>
<el-table
v-loading="tableData2Loading"
:data="tableData2"
style="width: 100%;margin-top: 15px"
height="230"
border
size="mini">
<el-table-column align="center" label="扣款金额">
<template slot-scope="scope">
{{ scope.row.扣款金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="被扣款人">
<template slot-scope="scope">
{{ scope.row.被扣款人 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣款原因">
<template slot-scope="scope">
{{ scope.row.扣款原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣款日期">
<template slot-scope="scope">
{{ scope.row.扣款日期 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
:disabled="disabled"
size="mini"
type="primary"
icon="el-icon-edit"
@click.stop="editWithdrawing(scope.row);flag1 = 4">编辑</el-button>
<el-button
:disabled="disabled"
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="delWithdrawing(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize2"
:total="total2"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<!--新增编辑保证金信息对话框-->
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form" :model="form" :rules="rules1" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -335,7 +491,11 @@
</el-dialog>
<!--扣款记录增加-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="800px">
=======
<el-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="800px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -388,7 +548,11 @@
</el-dialog>
<!--扣款记录编辑-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="编辑" center style="min-height: 300px" width="800px">
=======
<el-dialog :visible.sync="dialogFormVisible3" title="编辑" center style="min-height: 300px" width="800px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -436,7 +600,11 @@
</el-dialog>
<!--收回安全保证金-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="20%">
=======
<el-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="20%">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="120px" class="demo-ruleForm">
<el-form-item label="项目名称" prop="项目名称">
<el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:200px" disabled/>
@@ -460,6 +628,7 @@
<el-button type="primary" @click="submit1('form4')">确 定</el-button>
</div>
</el-dialog>
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="扣款" center style="min-height: 300px" width="800px">
<!--扣款记录表格-->
@@ -522,6 +691,8 @@
</div>
</el-card>
</el-dialog>
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</div>
</template>
@@ -588,7 +759,10 @@ export default {
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false,
<<<<<<< HEAD
dialogFormVisible5: false,
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
form: {
备注: '',
项目名称: '',
@@ -729,7 +903,10 @@ export default {
this.SurplusAmount = row.应收回金额
this.projectName = row.项目名称
this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.code], ['tableData2', 'total2', 'tableData2Loading'])
<<<<<<< HEAD
this.dialogFormVisible5 = true
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
handleSizeChange(val) {
this.PageCurrent = 1
@@ -754,7 +931,11 @@ export default {
this.fetchTableData2()
},
addSafetyMargin(row) {
<<<<<<< HEAD
this.title = '新增安全保证金'
=======
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.timetime = row.合同签订日期
this.changeTime()
this.dialogFormVisible1 = true
@@ -763,7 +944,11 @@ export default {
},
editSafetyMargin(row) {
this.editForm(row, 'form')
<<<<<<< HEAD
this.title = '编辑安全保证金'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.form.保证金金额 = row.保证金金额
this.form.交付日期 = row.交付日期