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

刘璐珈

Browse Source
This commit is contained in:
Vergil
2020-03-09 17:18:31 +08:00
parent 8d4607b5ca
commit c2d4e64c35
21 changed files with 998 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@
</el-table-column>
<el-table-column align="center" label="已收回(万元)" width="80">
<template slot-scope="scope">
<span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ Number(scope.row.应收回金额).toFixed(2) }}</span>
<span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</span>
<span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
</template>
</el-table-column>
@@ -167,7 +167,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top" style="margin-left: 0px">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用||Number(scope.row.未收金额) ===0"
:disabled="scope.row.是否禁用"
size="mini"
type="text"
icon="el-icon-money"
@@ -390,10 +390,11 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
prop="投标结果公布日期"
placeholder="请选择结果公布日期"/>
</el-form-item>
<el-form-item label="中标服务费(万元)" prop="中标服务费">
<el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :min="0.00" style="width: 200px" size="small"/>
<el-form-item v-if="!tenderResultDisabled" label="中标服务费(万元)" prop="中标服务费">
<el-input-number v-model="Timeform.中标服务费" :precision="2" :min="0.00" style="width: 200px" size="small"/>
<!--:max="tenderResultMax"-->
</el-form-item>
</el-form>
@@ -419,7 +420,7 @@
</el-col>
</el-row>
<el-row>
<el-form-item label="转履约金额(万元)" prop="保证金金额">
<el-form-item label="保证金金额(万元)" prop="保证金金额">
<el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" :max="PerformanceBondform.保证金金额max" style="width: 200px" size="small"/>
</el-form-item>
</el-row>
@@ -565,7 +566,7 @@ export default {
回收金额: 0
},
Timeform: {
投标结果公布日期: '',
投标结果公布日期: getNowShotTime(),
中标服务费: ''
},
PerformanceBondform: {
@@ -609,7 +610,7 @@ export default {
保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }, { required: true, trigger: 'change', validator: validateValue }],
保证金类型: [{ required: true, message: '请输入保证金类型', trigger: 'change' }],
投标人: [{ required: true, message: '请输入投标人', trigger: 'change' }],
投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
// 投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
计划收回日期: [{ required: true, message: '请选择计划收回日期', trigger: 'change' }],
提前X天提醒我: [{ required: true, message: '提前X天提醒我', trigger: 'blur' }]
}
@@ -917,6 +918,7 @@ export default {
if (row.投标结果 === '1') {
this.radio = '1'
this.dialogTimeVisible = true
// this.Timeform.投标结果公布日期 = getNowShotTime()
this.tenderResultDisabled = false
} else if (row.投标结果 === '2') {
this.radio = '2'
@@ -928,14 +930,18 @@ export default {
this.dialogTimeVisible = false
this.fetchTableData1()
},
submitTime() {
winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => {
if (response.data[0].result === '1') {
this.fetchTableData1()
this.dialogTimeVisible = false
this.$message.success('操作成功')
} else {
this.$message.error('操作失败')
submitTime(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => {
if (response.data[0].result === '1') {
this.fetchTableData1()
this.dialogTimeVisible = false
this.$message.success('操作成功')
} else {
this.$message.error('操作失败')
}
})
}
})
},

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

@@ -186,7 +186,7 @@
<el-table-column align="right" label="收款金额(万元)" width="120" prop="收款金额">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.收款金额" :min="0" style="width:100px" clearable size="mini"/>
<el-input-number v-model="scope.row.收款金额" :min="0" :max="maxnomoney" style="width:100px" clearable size="mini"/>
</template>
<span v-else>{{ Number(scope.row.收款金额).toFixed(2) }}</span>
</template>
@@ -301,7 +301,9 @@ export default {
num: '',
contractTotal: '',
dialogFormVisiblePeople: false,
AccountsReceivableVisible: false
AccountsReceivableVisible: false,
maxnomoney: 0,
row2: ''
}
},
created() {
@@ -325,8 +327,8 @@ export default {
}
if (val.length !== 0) {
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同金额(万元)', '已收(万元)', '未收(万元)', '营销经理']
const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额(万元)', '已收(万元)', '未收(万元)', '营销经理']
const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
const list = val.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
@@ -464,17 +466,19 @@ export default {
})
},
addMoney(row) {
this.maxnomoney = Number(row.未收金额)
this.tableData2 = []
this.moneyID = row.资金id
addMoney(row.资金id).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('收款成功')
searchTable2(row.资金id).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
收款金额: response.data[i].金额,
收款金额: Number(response.data[i].金额).toFixed(2),
收款时间: response.data[i].入账时间,
资金明细ID: response.data[i].资金明细ID,
原收款金额: response.data[i].金额,
原收款金额: Number(response.data[i].金额).toFixed(2),
edit: false
})
}
@@ -506,6 +510,7 @@ export default {
}
})
this.getTableData()
// this.getTableData2(this.row2)
} else {
this.$message.error('删除失败')
}
@@ -569,6 +574,8 @@ export default {
})
},
getTableData2(row) {
console.log(Number(row.未收金额))
this.maxnomoney = Number(row.未收金额)
this.tableData2 = []
this.moneyID = row.资金id
searchTable2(this.moneyID).then(response => {

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

@@ -489,6 +489,7 @@
<script>
import elInput from 'element-ui/packages/input'
import { getNowShotTime } from '@/utils/tool'
import { addMarketingManager, SelectMarketingManager1, SelectPartment, searchTimeAll, searchTime, selectBidBond, changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
import { upload, download } from '@/utils/request'
export default {
@@ -627,7 +628,7 @@ export default {
form: {
MarketingManagerValue: '',
EntryName: '', // 项目名称
contractSigningDate: '',
contractSigningDate: getNowShotTime(),
drawingJointSignNode: '', // 图纸会签节点
EquipmentPreAcceptanceNode: '', // 设备预验收节点
ConsignmentNode: '', // 发货节点
@@ -679,6 +680,7 @@ export default {
this.fetchData()
this.fetchTableData1()
this.fetchCustomerData()
console.log(this.$toTop(), 222)
},
methods: {
// 2020 02 18 刘路加 增加
@@ -1012,7 +1014,7 @@ export default {
this.form.付款方式 = parseInt(row.付款方式代码)
this.biddingNumber = row.招标保证金流水号
this.form.bidding = Number(row.保证金金额).toFixed(2)
this.form.contractAmount = row.合同总金额
this.form.contractAmount = Number(row.合同总金额).toFixed(2)
this.disabled = true
this.temp = 2
this.isTrue = false