处理clearable不起作用的冲突,删除我测试部分,保留曹鑫宇程序

This commit is contained in:
hedekun
2018-11-27 14:37:14 +08:00
112 changed files with 8878 additions and 1557 deletions

View File

@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">销售经理</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" readonly placeholder="请选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @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="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增收款计划</el-button>
<el-badge :value="value" :max="99" class="item">
@@ -42,11 +42,6 @@
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<!--<el-table-column label="发货状态" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
</template>
</el-table-column>
@@ -119,12 +114,6 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--icon="el-icon-tickets"-->
<!--:disabled="scope.row.是否禁用"-->
<!--@click.stop="handleEdit(scope.row, scope.$index)">付款</el-button>-->
<el-button
:disabled="scope.row.是否禁用编辑"
size="mini"
@@ -180,11 +169,6 @@
{{ scope.row.本次收款时间 }}
</template>
</el-table-column>
<!--<el-table-column label="是否开票" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.是否开票 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" fixed="right" align="center" width="250">
<template slot-scope="scope">
<el-button
@@ -246,12 +230,17 @@
</el-table-column>
<el-table-column align="center" label="状态">
<template slot-scope="scope">
<el-tag type="danger" style="width: 80px">{{ scope.row.状态 }}</el-tag>
<el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" size="small">无计划</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" type="success" size="small">已完成</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" type="primary" size="small">未开始</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" type="warning" size="small">即将拖期</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" type="danger" size="small">已拖期</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="280">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收款"
size="mini"
type="warning"
icon="el-icon-edit"
@@ -280,9 +269,9 @@
<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" placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" clearable filterable @change="searchProjectName">
<el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
<el-option
v-for="item in entryName"
v-for="item in entryName2"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -304,7 +293,7 @@
<el-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
<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" :disabled="true" clearable placeholder="请输入项目名称" style="width: 200px" size="small" filterable @change="searchProjectName">
<el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
<el-option
v-for="item in entryName"
:key="item.value"
@@ -418,7 +407,7 @@
<el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
</el-form-item>
<el-form-item label="计划阶段" prop="计划阶段" label-width="110px">
<el-select v-model="form4.计划阶段" clearable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small" filterable>
<el-select v-model="form4.计划阶段" clearable filterable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small">
<el-option
v-for="item in Planning"
:key="item.value"
@@ -485,7 +474,8 @@
<script>
import elInput from 'element-ui/packages/input'
import { SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
import { searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
export default {
components: {
elInput
@@ -499,7 +489,7 @@ export default {
}
}
return {
// disabled: false,
entryName2: [],
type: '',
a: 1,
b: 1,
@@ -611,7 +601,6 @@ export default {
}
},
created() {
// this.fetchData()
this.getTableData()
this.init()
},
@@ -619,6 +608,7 @@ export default {
init() {
this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
this.getSelect(searchProjectNumber, ['项目名称', '项目流水号'], 'entryName')
this.getSelect(searchProjectNumber2, ['项目名称', '项目流水号'], 'entryName2')
this.getSelect(PaymentPhase, ['付款阶段', '付款阶段ID'], 'PaymentPhase')
AccountsReceivable().then(response => {
const data = response.data
@@ -654,7 +644,9 @@ export default {
})
selectBatchFundingDetails(this.id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -662,6 +654,8 @@ export default {
this.listLoading2 = false
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -680,7 +674,6 @@ export default {
}
}
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
// data[i].已支付 === '0' ? data[i].是否禁用编辑 = false : data[i].是否禁用编辑 = true
}
this.tableData2 = data
this.total2 = response.data.total
@@ -711,6 +704,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -792,7 +787,9 @@ export default {
this.tableData4 = []
selectBatchFundingDetails(row.批次资金id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -812,19 +809,6 @@ export default {
}
}
},
// fetchData() {
// getTree().then(response => { // 获取人员信息树
// const data = response.data
// this.dataPeople = tree(data, 0)
// })
// },
// handleNodeClick(data) { // 树节点点击
// this.getData(getTablePeople, 'ListPeople', data.id)
// },
// handleChange(row) {
// this.peopleid = row.人员编号
// this.peoplename = row.姓名
// },
getName() {
this.dialogFormVisiblePeople = false
this.MarketingManagerValue = this.peoplename
@@ -877,6 +861,7 @@ export default {
this.listLoading2 = false
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
@@ -900,7 +885,6 @@ export default {
this.tableData2 = data
this.total2 = response.data.total
})
// this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.moneyID], ['tableData2', 'total2', 'listLoading2'])
},
handleSizeChange(val) {
this.PageCurrent = 1
@@ -945,6 +929,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1007,6 +993,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1088,11 +1076,6 @@ export default {
},
handleEdit1(row) {
this.addForm('form3')
// let sum = 0
// this.tableData2.map(item => {
// sum += parseFloat(item.本次付款)
// })
// this.max1 = this.contractTotal - (sum - row.本次付款)
this.title = '记录阶段收款'
this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
this.dialogFormVisible3 = true
@@ -1111,6 +1094,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1150,7 +1135,9 @@ export default {
})
selectBatchFundingDetails(this.id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -1182,6 +1169,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1207,7 +1196,9 @@ export default {
})
selectBatchFundingDetails(this.id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -1241,6 +1232,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1313,6 +1306,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1369,6 +1364,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1438,6 +1435,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, row.资金ID).then(response => {
const data = response.data.rows
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
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {