|
@@ -30,6 +30,7 @@
|
|
|
<ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)">待付款</ws-button>
|
|
|
</div>
|
|
|
<ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
|
|
|
+ <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
|
|
|
</template>
|
|
|
<template slot="right">
|
|
|
<el-select class='warehouse_select' v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" style="margin: 0 10px">
|
|
@@ -108,6 +109,12 @@
|
|
|
<span v-else>{{ scope.row.status }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column class="table_td" prop="status" width="100" label="是否开票">
|
|
|
+ <template scope="scope">
|
|
|
+ <span v-if="scope.row.approveStatus">未开票</span>
|
|
|
+ <span v-else>已开票</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
|
|
|
|
|
|
<template scope="scope">
|
|
@@ -297,6 +304,7 @@ import download from '../../components/WsDownload/download'
|
|
|
customerInfo: false,
|
|
|
form: {},
|
|
|
formLabelWidth: '300px',
|
|
|
+ invoicing:'',
|
|
|
customerlist: {
|
|
|
payeeAddressUrls: [],
|
|
|
},
|
|
@@ -785,6 +793,7 @@ import download from '../../components/WsDownload/download'
|
|
|
searchType: searchParam,
|
|
|
warehouseName: this.warehouseName,
|
|
|
managementType: 1,
|
|
|
+ invoicing:this.invoicing,
|
|
|
compId: localStorage.getItem('ws-pf_compId')
|
|
|
})
|
|
|
.toPromise()
|
|
@@ -826,7 +835,11 @@ import download from '../../components/WsDownload/download'
|
|
|
})
|
|
|
},
|
|
|
screen(num) {
|
|
|
- this.searchType = num
|
|
|
+ if(num==0){
|
|
|
+ this.invoicing=num
|
|
|
+ }else{
|
|
|
+ this.searchType = num
|
|
|
+ }
|
|
|
this.getList()
|
|
|
},
|
|
|
find() {
|