|
@@ -49,12 +49,14 @@
|
|
|
<el-input style="width: 255px;" class="options_css" v-model="flowTo" placeholder="可按流向进行查找" clearable maxlength="500" type="input"
|
|
|
@keyup.enter.native="find()"></el-input>
|
|
|
|
|
|
- <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选"
|
|
|
+ <!-- <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选"
|
|
|
clearable @change="getList1" class="options_css">
|
|
|
<el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName"
|
|
|
:value="item.expenseName">
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
+ <el-input style="width: 280px;" class="options_css" v-model="expenseName" placeholder="可按费用名称进行查找" clearable maxlength="500" type="input"
|
|
|
+ @keyup.enter.native="find()"></el-input>
|
|
|
<!-- <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option
|
|
|
placeholder="按未分配金额筛选" clearable @change="getList1" class="options_css">
|
|
|
<el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount"
|
|
@@ -62,7 +64,7 @@
|
|
|
</el-option>
|
|
|
</el-select> -->
|
|
|
<el-select v-model="unallocatedAmount" filterable placeholder="" @change="unallocatedAmountChange"
|
|
|
- style="margin: 0 10px">
|
|
|
+ style="margin: 0 10px;width:200px">
|
|
|
<el-option key="全部金额" label="全部金额" value="" style="color: #8890b1" />
|
|
|
<el-option key="未分配金额大于0" label="未分配金额大于0" value="1" style="color: #8890b1" />
|
|
|
</el-select>
|
|
@@ -343,7 +345,7 @@ import {
|
|
|
getXialaList,
|
|
|
sponsorWithdraw,
|
|
|
exportFile,
|
|
|
- getcostNo,
|
|
|
+ // getcostNo,
|
|
|
editfujian
|
|
|
} from '@/model/profitable/index'
|
|
|
import {
|
|
@@ -377,12 +379,13 @@ export default {
|
|
|
deptCircularPage: {},
|
|
|
searchType: '',
|
|
|
searchKeyWord: '',
|
|
|
+ expenseName: '',//费用名称
|
|
|
costNo: [],//编号
|
|
|
purpose: [],//用途
|
|
|
// flowTo: [],//流向
|
|
|
flowTo: '',//流向
|
|
|
flowFlag:'',
|
|
|
- expenseName: [],//费用名称
|
|
|
+ // expenseName: [],//费用名称
|
|
|
// unallocatedAmount: [],//未分配金额(元)
|
|
|
unallocatedAmount:'',//未分配金额(元)
|
|
|
agent: [],//经办人
|
|
@@ -497,51 +500,51 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.warehousNameList = response
|
|
|
})
|
|
|
- //搜索框下拉数据
|
|
|
- getcostNo({
|
|
|
- compId: localStorage.getItem('ws-pf_compId'),
|
|
|
- // currentPage: 1,
|
|
|
- // pageSize: 9999,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.choiceObj = response
|
|
|
- })
|
|
|
+ // //搜索框下拉数据
|
|
|
+ // getcostNo({
|
|
|
+ // compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ // // currentPage: 1,
|
|
|
+ // // pageSize: 9999,
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.choiceObj = response
|
|
|
+ // })
|
|
|
//流向
|
|
|
- getXialaList({
|
|
|
- removeRepeatFlag: 1,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.flowToList = response
|
|
|
- for (let i = 0; i < this.flowToList.length; i++) {
|
|
|
- if (this.flowToList[i].expensesPurpose == 3) {
|
|
|
- this.flowToList[i].flowTo = this.flowToList[i].warehouseName
|
|
|
- } else if (this.flowToList[i].expensesPurpose == 1) {
|
|
|
- this.flowToList[i].flowTo = this.flowToList[i].contractNo
|
|
|
- } else if (this.flowToList[i].expensesPurpose == 5) {
|
|
|
- this.flowToList[i].flowTo = '中天昊元'
|
|
|
- } else if (this.flowToList[i].expensesPurpose == 2) {
|
|
|
- this.flowToList[i].flowTo = this.flowToList[i].contractNo
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
+ // getXialaList({
|
|
|
+ // removeRepeatFlag: 1,
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.flowToList = response
|
|
|
+ // for (let i = 0; i < this.flowToList.length; i++) {
|
|
|
+ // if (this.flowToList[i].expensesPurpose == 3) {
|
|
|
+ // this.flowToList[i].flowTo = this.flowToList[i].warehouseName
|
|
|
+ // } else if (this.flowToList[i].expensesPurpose == 1) {
|
|
|
+ // this.flowToList[i].flowTo = this.flowToList[i].contractNo
|
|
|
+ // } else if (this.flowToList[i].expensesPurpose == 5) {
|
|
|
+ // this.flowToList[i].flowTo = '中天昊元'
|
|
|
+ // } else if (this.flowToList[i].expensesPurpose == 2) {
|
|
|
+ // this.flowToList[i].flowTo = this.flowToList[i].contractNo
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
//费用名称
|
|
|
- getXialaList({
|
|
|
- removeRepeatFlag: 2,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.costNameList = response
|
|
|
- })
|
|
|
- //未分配金额
|
|
|
- getXialaList({
|
|
|
- removeRepeatFlag: 3,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.moneyList = response
|
|
|
- })
|
|
|
+ // getXialaList({
|
|
|
+ // removeRepeatFlag: 2,
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.costNameList = response
|
|
|
+ // })
|
|
|
+ // //未分配金额
|
|
|
+ // getXialaList({
|
|
|
+ // removeRepeatFlag: 3,
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.moneyList = response
|
|
|
+ // })
|
|
|
//经办人
|
|
|
getXialaList({
|
|
|
removeRepeatFlag: 4,
|
|
@@ -919,13 +922,14 @@ export default {
|
|
|
startDate: localStorage.getItem('startDate'),
|
|
|
endDate: localStorage.getItem('endDate'),
|
|
|
searchKeyWord: this.searchKeyWord,
|
|
|
+ expenseName:this.expenseName,
|
|
|
currentPage: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
searchType: this.searchType,
|
|
|
expensesPurpose: this.expensesPurpose,
|
|
|
costNo: this.costNo.length > 0 ? this.costNo.toString() : '',
|
|
|
purpose: this.purpose.length > 0 ? this.purpose.toString() : '',
|
|
|
- expenseName: this.expenseName.length > 0 ? this.expenseName.toString() : '',
|
|
|
+ // expenseName: this.expenseName.length > 0 ? this.expenseName.toString() : '',
|
|
|
unallocatedNumber: this.unallocatedAmount.length > 0 ? this.unallocatedAmount.toString() : '',
|
|
|
agent: this.agent.length > 0 ? this.agent.toString() : '',
|
|
|
flowTo: this.flowTo,
|