This commit is contained in:
liushuai
2020-03-10 18:20:36 +08:00
40 changed files with 1894 additions and 933 deletions

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 => {

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