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

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.交付日期