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

更新

Browse Source
This commit is contained in:
liushuai
2020-03-12 22:20:08 +08:00
parent 296df85e78
commit 1a3012d5a6
17 changed files with 406 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@
<el-table
v-loading="listLoading1"
:data="tableData1"
style="margin-top: 3px;width: 1355px"
style="margin-top: 3px;width: 650px"
height="600"
border
stripe
@@ -67,11 +67,11 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="进程" width="100">
<template slot-scope="scope">
{{ scope.row.执行进度名 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="进程" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.执行进度名 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="签订日期" width="86">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
@@ -82,26 +82,26 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="220" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系电话" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注" width="175" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="客户名称" prop="客户名称" width="220" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.客户名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.联系人 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系电话" width="110" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.电话 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="合同信息备注" width="175" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.合同信息备注 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="190px">
<template slot-scope="scope">
<el-button
@@ -143,11 +143,21 @@
border
stripe
size="mini">
<el-table-column align="center" label="履约保证金金额" style="padding:0px">
<el-table-column align="center" label="履约金总额(万元)" width="140px" style="padding:0px">
<template slot-scope="scope">
<el-tag type="primary" size="mini">{{ Number(scope.row.履约保证金总额).toFixed(2) }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="投标转履约金额(万元)" width="170px" style="padding:0px;">
<template slot-scope="scope">
<el-tag type="primary" size="mini">{{ Number(scope.row.履约保证金金额).toFixed(2) }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="追加履约金额(万元)" width="150px" style="padding:0px">
<template slot-scope="scope">
<el-tag type="primary" size="mini">{{ (Number(scope.row.履约保证金总额) - Number(scope.row.履约保证金金额)).toFixed(2) }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="保证金类型">
<template slot-scope="scope">
{{ scope.row.保证金类型 }}
@@ -163,6 +173,11 @@
后{{ scope.row.提前X天提醒我 }}天内收回
</template>
</el-table-column>
<el-table-column align="center" label="缴纳时间">
<template slot-scope="scope">
{{ scope.row.缴纳时间?scope.row.缴纳时间.split(' ')[0]: '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="是否收回">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否收回) === 1" slot="reference" size="mini" type="success" style="width: 66px">已收回</el-tag>
@@ -174,7 +189,7 @@
{{ Number(scope.row.收回金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="实际收回日期">
<el-table-column align="center" label="收回时间">
<template slot-scope="scope">
{{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? scope.row.实际收回日期 = '暂未收回' : scope.row.实际收回日期 }}
</template>
@@ -277,7 +292,7 @@
placeholder="请选择实际收回日期"/>
</el-form-item>
<el-form-item label="收回金额(万元)" prop="收回金额">
<el-input-number v-model="form.收回金额" :precision="2" :min="0" :step="1" :max="maxrecmoney" style="width: 150px" size="small"/>
<el-input-number v-model="form.收回金额" :precision="2" :min="0" :step="1" :max="maxrecmoney" disabled style="width: 150px" size="small"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -288,12 +303,12 @@
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="600px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="105px" class="demo-ruleForm">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="700px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="150px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="履约金(万元)" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :min="0" :step="1" style="width: 150px" size="small"/>
<el-form-item label="项目履约金(万元)" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :min="minmoney" :step="1" style="width: 150px" size="small" @change="jisuan"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -326,6 +341,32 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="投标金转入(万元)" prop="投标保证金金额">
<el-input-number v-model="form2.投标保证金金额" :precision="2" :min="0" :step="1" disabled style="width: 150px" size="small"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="追加履约金金额(万元)" prop="追加金额">
<el-input-number v-model="form2.追加金额" :precision="2" :step="1" disabled style="width: 150px" size="small"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="缴纳时间" prop="缴纳时间">
<el-date-picker
v-model="form2.timer"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"
style="width: 150px;height: 32px"
size="small"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondDialog('form2')">取消</el-button>
@@ -413,6 +454,7 @@ export default {
customerName_check: '',
customerName: '', // 客户名称
maxrecmoney: 0.00,
minmoney: 0.00,
form: {
实际收回日期: '',
收回金额: ''
@@ -421,7 +463,10 @@ export default {
保证金金额: '',
保证金类型: 1,
收回条件: 1,
截止时间: 15
截止时间: 15,
投标保证金金额: 0,
追加金额: 0,
timer: new Date()
},
rules: { // 表单验证规则
实际收回日期: [{ required: true, message: '请选择实际收回日期', trigger: 'change' }],
@@ -444,6 +489,23 @@ export default {
this.fetchTableData1()
},
methods: {
getNowFormatDate() {
console.log(this.form2.timer)
var year = this.form2.timer.getFullYear()
var month = this.form2.timer.getMonth() + 1
var day = this.form2.timer.getDate()
if (month >= 1 && month <= 9) {
month = '0' + month
}
if (day >= 1 && day <= 9) {
day = '0' + day
}
this.form2.timer = year + '-' + month + '-' + day
console.log(this.form2.timer)
},
jisuan() {
this.form2.追加金额 = this.form2.保证金金额 - this.form2.投标保证金金额
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
@@ -535,7 +597,7 @@ export default {
const data = response.data
for (let i = 0; i < data.rows.length; i++) {
data.rows[i].合同签订日期 = data.rows[i].合同签订日期.substring(0, data.rows[i].合同签订日期.length - 8)
parseInt(data.rows[i].履约保证金类型) !== 0 ? data.rows[i].是否禁用增加履约保证金 = true : data.rows[i].是否禁用增加履约保证金 = false
parseInt(data.rows[i].是否追加履约保证金) !== 0 ? data.rows[i].是否禁用增加履约保证金 = true : data.rows[i].是否禁用增加履约保证金 = false
parseInt(data.rows[i].履约保证金类型) !== 0 ? data.rows[i].是否禁用增加履约保函 = true : data.rows[i].是否禁用增加履约保函 = false
}
this.tableData1 = data.rows
@@ -557,51 +619,55 @@ export default {
},
// 履约保证金查询
fetchTableData2(row) {
console.log(row, 911)
this.projectId = row.项目流水号
typeOfPerformanceBond(this.projectId).then(response => {
const data = response.data[0].履约保证金类型
return data
}).then(data => {
if (data === 1) {
this.activeName = 'first'
this.listLoading2 = true
this.performanceBondDisabled = false
this.performanceGuaranteeDisabled = true
searchTableData2(this.projectId).then(response => {
this.listLoading2 = false
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
}
this.tableData2 = data
})
} else if (data === 2) {
this.activeName = 'second'
this.performanceBondDisabled = true
this.performanceGuaranteeDisabled = false
this.performanceGuaranteeShow = true
this.getFileList()
} else {
this.$message.warning('未缴纳履约保证金')
this.tableData2 = []
this.performanceGuaranteeShow = false
this.performanceBondDisabled = true
this.performanceGuaranteeDisabled = true
}
})
this.tableData2 = []
if (parseInt(row.是否追加履约保证金) !== 0) {
console.log(row, 911)
this.projectId = row.项目流水号
typeOfPerformanceBond(this.projectId).then(response => {
const data = response.data[0].履约保证金类型
return data
}).then(data => {
if (data === 1) {
this.activeName = 'first'
this.listLoading2 = true
this.performanceBondDisabled = false
this.performanceGuaranteeDisabled = true
searchTableData2(this.projectId).then(response => {
this.listLoading2 = false
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
}
this.tableData2 = data
})
} else if (data === 2) {
this.activeName = 'second'
this.performanceBondDisabled = true
this.performanceGuaranteeDisabled = false
this.performanceGuaranteeShow = true
this.getFileList()
} else {
this.$message.warning('未缴纳履约保证金')
this.tableData2 = []
this.performanceGuaranteeShow = false
this.performanceBondDisabled = true
this.performanceGuaranteeDisabled = true
}
})
}
},
takeBack(row) {
this.addForm('form')
this.performanceBondCode = row.履约保证金流水号
this.form.收回金额 = Number(row.收回金额).toFixed(2)
console.log((row.履约保证金金额).toFixed(2))
this.maxrecmoney = row.履约保证金金额
// this.form.收回金额 = Number(row.收回金额).toFixed(2)
this.form.收回金额 = row.履约保证金总额
// console.log((row.履约保证金金额).toFixed(2))
this.maxrecmoney = row.履约保证金总额
this.dialogTimeVisible = true
},
callOffTime() {
@@ -663,6 +729,11 @@ export default {
this.dialogFormVisible1 = true
this.projectId = row.项目流水号
this.tableData2 = []
this.form2.投标保证金金额 = row.履约保证金金额
// this.minmoney = Number(this.form2.投标保证金金额)
this.jisuan()
this.fetchTableData1()
this.getNowFormatDate()
},
callOffPerformanceBondDialog() {
this.dialogFormVisible1 = false
@@ -671,7 +742,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.flag === 1) {
addPerformanceBond(this.projectId, this.form2.保证金金额, this.form2.保证金类型, this.form2.收回条件, this.form2.截止时间).then(response => {
addPerformanceBond(this.projectId, this.form2.保证金金额, this.form2.保证金类型, this.form2.收回条件, this.form2.截止时间, this.form2.timer).then(response => {
if (response.data[0].result === '1') {
this.$message.success('操作成功')
this.fetchTableData1()
@@ -717,7 +788,7 @@ export default {
}
})
} else if (this.flag === 2) {
editPerformanceBond(this.projectId, this.form2.保证金金额, this.form2.保证金类型, this.form2.收回条件, this.form2.截止时间, this.performanceBondCode).then(response => {
editPerformanceBond(this.projectId, this.form2.保证金金额, this.form2.保证金类型, this.form2.收回条件, this.form2.截止时间, this.performanceBondCode, this.form2.timer).then(response => {
if (response.data[0].result === '1') {
this.$message.success('操作成功')
this.dialogFormVisible1 = false
@@ -768,10 +839,13 @@ export default {
openEditPerformanceBondDialog(row) {
this.dialogFormVisible1 = true
this.performanceBondCode = row.履约保证金流水号
this.form2.保证金金额 = row.履约保证金金额
this.form2.保证金金额 = row.履约保证金总额
this.form2.保证金类型 = row.保金类型
this.form2.投标保证金金额 = row.履约保证金金额
this.jisuan()
this.form2.收回条件 = parseInt(row.执行进度流水号)
this.title1 = '编辑履约保证金'
this.getNowFormatDate()
},
delPerformanceBond(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {

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

@@ -94,7 +94,7 @@
</el-table-column>
<el-table-column align="center" label="缴纳时间" width="87" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.交付日期 }}
{{ scope.row.交付日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column align="center" label="扣款金额(万元)" prop="扣款金额" width="120" show-overflow-tooltip>
@@ -159,7 +159,7 @@
<el-tooltip :open-delay="1000" class="item" effect="dark" content="收回" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用收回 || !scope.row.是否禁用增加安全保证金"
:disabled="scope.row.是否禁用收回 || !scope.row.是否禁用增加安全保证金 ||Number(scope.row.未收金额)<=0"
size="mini"
type="text"
icon="el-icon-money"
@@ -917,9 +917,9 @@ export default {
this.listLoadingProject = false
const data = response.data
for (let i = 0; i < data.rows.length; i++) {
data.rows[i].合同签订日期 = data.rows[i].合同签订日期.substring(0, data.rows[i].合同签订日期.length - 8)
// data.rows[i].合同签订日期 = data.rows[i].合同签订日期.substring(0, data.rows[i].合同签订日期.length - 8)
parseInt(data.rows[i].安全保证金类型) === 1 ? data.rows[i].是否禁用增加安全保证金 = true : data.rows[i].是否禁用增加安全保证金 = false
data.rows[i].交付日期 = data.rows[i].交付日期.substring(0, data.rows[i].交付日期.length - 8)
// data.rows[i].交付日期 = data.rows[i].交付日期.substring(0, data.rows[i].交付日期.length - 8)
}
this.projectTableData = data.rows