This commit is contained in:
liushuai
2019-09-05 10:33:39 +08:00
parent 653abcfc59
commit afcda77786
19 changed files with 4558 additions and 81 deletions

View File

@@ -11,7 +11,7 @@
</el-select>
<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 = 10;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<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>
@@ -158,7 +158,7 @@
:expand-row-keys="expands1"
:data="tableData2"
style="width: 100%;max-height: 440px; margin-top: 15px; text-align: center"
height="350"
height="220"
highlight-current-row
border
size="mini"
@@ -286,15 +286,15 @@
<el-pagination
:current-page="PageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="PageSize2"
: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">
<el-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
<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">
@@ -420,6 +420,7 @@
<el-form-item label="本次收款时间" prop="付款时间" label-width="110px">
<el-date-picker
v-model="form3.付款时间"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -524,6 +525,8 @@ export default {
}
}
return {
pickerOptions: {},
timetime: '',
name: '',
plannedTime: [],
entryName2: [],
@@ -566,10 +569,10 @@ export default {
tableData2: [],
gridData: [],
PageCurrent: 1,
PageSize: 10,
PageSize: 30,
total: null,
PageCurrent2: 1,
PageSize2: 10,
PageSize2: 30,
total2: null,
dialogFormVisible1: false, // 付款对话框可见性
dialogFormVisible2: false, // 新增对话框可见性
@@ -652,6 +655,7 @@ export default {
this.name = ''
this.dataPeople = []
this.dialogFormVisiblePeople = true
this.searchName()
},
init() {
this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
@@ -924,6 +928,7 @@ export default {
})
},
getTableData2(row) {
this.timetime = row.合同签订日期
this.moneyID = row.资金id
this.max = parseFloat(row.未支付金额)
this.contractTotal = parseFloat(row.合同总金额)
@@ -932,6 +937,7 @@ export default {
this.id3 = ''
this.listLoading2 = false
const data = response.data.rows
console.log(data, 111)
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
@@ -946,6 +952,7 @@ export default {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].是否禁用收款 = true
data[i].状态 = '已完成'
} else {
if (data[i].状态 === '0') {
@@ -1173,9 +1180,17 @@ export default {
})
})
},
changeTime1() {
this.pickerOptions = Object.assign({}, this.pickerOptions, {
disabledDate: (time) => {
return time.getTime() < Date.parse(this.timetime)
}
})
},
handleEdit1(row) {
this.addForm('form3')
this.title = '记录阶段收款'
this.changeTime1()
this.title = '阶段记录收款'
this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
this.dialogFormVisible3 = true
this.id = row.批次资金id
@@ -1386,8 +1401,12 @@ export default {
// this.editTable(editTableData, [this.zijinID, this.form2.TotalContractAmount], 'form2', function() { this.getTableData(); this.dialogFormVisible4 = false })
},
TransferPlan(row) {
console.log(row)
this.id = row.批次资金id
this.max1 = parseFloat(row.未收金额)
this.form4.转移金额 = parseFloat(row.未收金额)
this.form4.计划阶段 = parseInt(row.付款批次) + 1
console.log(this.form4.转移金额, this.form4.计划阶段)
this.dialogFormVisible5 = true
this.Planning = []
this.addForm('form4')