|
|
@@ -62,6 +62,12 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="是否开票" prop="invoiced">
|
|
|
+ <el-select v-model="queryModel.invoiced" size="mini" clearable>
|
|
|
+ <el-option label="是" :value="true"></el-option>
|
|
|
+ <el-option label="否" :value="false"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="收款账户" prop="collectionAccount">
|
|
|
<el-select v-model="queryModel.collectionAccount" size="mini" >
|
|
|
<el-option
|
|
|
@@ -184,24 +190,34 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="payTime" label="缴费时间" width="180"></el-table-column>
|
|
|
<el-table-column prop="payName" label="支付方式" ></el-table-column>
|
|
|
+ <el-table-column prop="invoiced" label="是否开票">
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <el-switch
|
|
|
+ v-model="row.invoiced"
|
|
|
+ active-color="#13ce66"
|
|
|
+ inactive-color="#ff4949"
|
|
|
+ @change="handleSwitchChange(row,'2')">
|
|
|
+ </el-switch>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="payee" label="收款方" ></el-table-column>
|
|
|
- <el-table-column prop="isOpenWechat" label="微信支付" fixed="right">
|
|
|
+ <el-table-column prop="isOpenWechat" label="微信支付">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-switch v-if="row.isMobilePayment"
|
|
|
v-model="row.isOpenWechat"
|
|
|
active-color="#13ce66"
|
|
|
inactive-color="#ff4949"
|
|
|
- @change="handlChange(row,'0')">
|
|
|
+ @change="handleSwitchChange(row,'0')">
|
|
|
</el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="isOpenAlipay" label="支付宝" fixed="right">
|
|
|
+ <el-table-column prop="isOpenAlipay" label="支付宝">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-switch v-if="row.isMobilePayment"
|
|
|
v-model="row.isOpenAlipay"
|
|
|
active-color="#13ce66"
|
|
|
inactive-color="#ff4949"
|
|
|
- @change="handlChange(row,'1')">
|
|
|
+ @change="handleSwitchChange(row,'1')">
|
|
|
</el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -279,6 +295,7 @@ export default {
|
|
|
pushTimeRange: "",
|
|
|
payTimeRange:"",
|
|
|
payStatus:"",
|
|
|
+ invoiced: null
|
|
|
},
|
|
|
treeData: [],
|
|
|
loading: false,
|
|
|
@@ -414,6 +431,9 @@ export default {
|
|
|
formData.append("payTimeRange", self.queryModel.payTimeRange);
|
|
|
formData.append("payStatus", self.queryModel.payStatus);
|
|
|
|
|
|
+ if(self.queryModel.invoiced!=null){
|
|
|
+ formData.append("invoiced", self.queryModel.invoiced);
|
|
|
+ }
|
|
|
|
|
|
billPushApi.pageList(formData)
|
|
|
.then(function(response) {
|
|
|
@@ -490,18 +510,18 @@ export default {
|
|
|
handleReset(name) {
|
|
|
this.$refs[name].resetFields();
|
|
|
},
|
|
|
- handChange(selVal){
|
|
|
+ // handleChange(selVal){
|
|
|
|
|
|
- this.queryModel.payService = "";
|
|
|
+ // this.queryModel.payService = "";
|
|
|
|
|
|
- var formData = new FormData();
|
|
|
- formData.append("companyId", selVal);
|
|
|
+ // var formData = new FormData();
|
|
|
+ // formData.append("companyId", selVal);
|
|
|
|
|
|
- billPushApi.payServiceList(formData).then((response)=>{
|
|
|
- var jsonData = response.data;
|
|
|
- this.payServiceList = jsonData.data;
|
|
|
- });
|
|
|
- },
|
|
|
+ // billPushApi.payServiceList(formData).then((response)=>{
|
|
|
+ // var jsonData = response.data;
|
|
|
+ // this.payServiceList = jsonData.data;
|
|
|
+ // });
|
|
|
+ // },
|
|
|
handleDetailList(record){
|
|
|
this.modalTitle2 = "账单推送详情";
|
|
|
this.operation = "detail";
|
|
|
@@ -611,26 +631,31 @@ export default {
|
|
|
this.businessKey = record.id;
|
|
|
this.showModal3 = true;
|
|
|
},
|
|
|
- handlChange(record,type){
|
|
|
+ handleSwitchChange(record,type){
|
|
|
var self = this;
|
|
|
|
|
|
var formData = new FormData();
|
|
|
self.loading = true;
|
|
|
|
|
|
formData.append("id", record.id);
|
|
|
+
|
|
|
if(type=="0"){
|
|
|
formData.append("isOpen", record.isOpenWechat);
|
|
|
}
|
|
|
- else{
|
|
|
+ else if(type=="1"){
|
|
|
formData.append("isOpen", record.isOpenAlipay);
|
|
|
}
|
|
|
+ else if(type=="2"){
|
|
|
+ formData.append("isOpen", record.invoiced);
|
|
|
+ }
|
|
|
+
|
|
|
formData.append("type", type);
|
|
|
|
|
|
billPushApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
|
|
|
var jsonData = response.data;
|
|
|
self.loading = false;
|
|
|
if (jsonData.result) {
|
|
|
- self.changePage(self.pageIndex);
|
|
|
+ //self.changePage(self.pageIndex);
|
|
|
}
|
|
|
else{
|
|
|
self.$message.error(jsonData.message + "");
|