|
@@ -46,7 +46,7 @@
|
|
<a-button>快递信息</a-button>
|
|
<a-button>快递信息</a-button>
|
|
</span> -->
|
|
</span> -->
|
|
<span class="add-acount-policy-btn">
|
|
<span class="add-acount-policy-btn">
|
|
- <a-button @click="handleAdd" type="primary">新增</a-button>
|
|
|
|
|
|
+ <!-- <a-button @click="handleAdd" type="primary">新增</a-button>-->
|
|
</span>
|
|
</span>
|
|
<span class="add-acount-policy-btn">
|
|
<span class="add-acount-policy-btn">
|
|
<a-button @click="handleAddPleace" type="primary">充值申请</a-button>
|
|
<a-button @click="handleAddPleace" type="primary">充值申请</a-button>
|
|
@@ -264,7 +264,6 @@
|
|
<a-form-model-item
|
|
<a-form-model-item
|
|
label="帐显金额"
|
|
label="帐显金额"
|
|
prop="displayAmount"
|
|
prop="displayAmount"
|
|
- v-if="policyOperationForm.paymentType == 2"
|
|
|
|
>
|
|
>
|
|
<a-input-number
|
|
<a-input-number
|
|
v-model="policyOperationForm.displayAmount"
|
|
v-model="policyOperationForm.displayAmount"
|
|
@@ -410,6 +409,28 @@
|
|
}}%
|
|
}}%
|
|
</p>
|
|
</p>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ <a-form-model-item label="选择端口" prop="paymentPort">
|
|
|
|
+ <a-select
|
|
|
|
+ v-model="queryByIdList.paymentPort"
|
|
|
|
+ placeholder="请选择端口"
|
|
|
|
+ showSearch
|
|
|
|
+ optionFilterProp="children"
|
|
|
|
+ :filterOption="filterOption"
|
|
|
|
+ allow-clear
|
|
|
|
+ @change="getMoney"
|
|
|
|
+ >
|
|
|
|
+ <a-select-option
|
|
|
|
+ :value="item.paymentPort"
|
|
|
|
+ v-for="(item, index) of paymentPortList"
|
|
|
|
+ :key="index"
|
|
|
|
+ >
|
|
|
|
+ {{ item.portName }}
|
|
|
|
+ </a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+
|
|
<a-form-model-item label="可用金额" prop="totalAmount">
|
|
<a-form-model-item label="可用金额" prop="totalAmount">
|
|
{{ totalAmount ? allMoney(totalAmount) : "-" }}
|
|
{{ totalAmount ? allMoney(totalAmount) : "-" }}
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
@@ -649,6 +670,7 @@
|
|
productNewList: [],
|
|
productNewList: [],
|
|
projectList: [],
|
|
projectList: [],
|
|
mediaList: [],
|
|
mediaList: [],
|
|
|
|
+ paymentPortList: [],
|
|
accountList: [],
|
|
accountList: [],
|
|
totalAmount: undefined,
|
|
totalAmount: undefined,
|
|
rebateData: undefined,
|
|
rebateData: undefined,
|
|
@@ -1041,8 +1063,11 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
editMoney(value, type) {
|
|
editMoney(value, type) {
|
|
- console.log(value);
|
|
|
|
- if (type == 1 && !!this.policyOperationForm.rebateRate) {
|
|
|
|
|
|
+ if (
|
|
|
|
+ type == 1 &&
|
|
|
|
+ (!!this.policyOperationForm.rebateRate ||
|
|
|
|
+ this.policyOperationForm.rebateRate == 0)
|
|
|
|
+ ) {
|
|
this.$set(
|
|
this.$set(
|
|
this.policyOperationForm,
|
|
this.policyOperationForm,
|
|
"cashAmount",
|
|
"cashAmount",
|
|
@@ -1050,7 +1075,11 @@
|
|
? (value / (1 + this.policyOperationForm.rebateRate / 100)).toFixed(2)
|
|
? (value / (1 + this.policyOperationForm.rebateRate / 100)).toFixed(2)
|
|
: (value * (1 - this.policyOperationForm.rebateRate / 100)).toFixed(2)
|
|
: (value * (1 - this.policyOperationForm.rebateRate / 100)).toFixed(2)
|
|
);
|
|
);
|
|
- } else if (type == 2 && !!this.policyOperationForm.rebateRate) {
|
|
|
|
|
|
+ } else if (
|
|
|
|
+ type == 2 &&
|
|
|
|
+ (!!this.policyOperationForm.rebateRate ||
|
|
|
|
+ this.policyOperationForm.rebateRate == 0)
|
|
|
|
+ ) {
|
|
this.$set(
|
|
this.$set(
|
|
this.policyOperationForm,
|
|
this.policyOperationForm,
|
|
"displayAmount",
|
|
"displayAmount",
|
|
@@ -1088,6 +1117,7 @@
|
|
this.$set(this.queryByIdList, "productId", undefined);
|
|
this.$set(this.queryByIdList, "productId", undefined);
|
|
this.$set(this.queryByIdList, "paymentMedia", undefined);
|
|
this.$set(this.queryByIdList, "paymentMedia", undefined);
|
|
this.$set(this.queryByIdList, "projectId", undefined);
|
|
this.$set(this.queryByIdList, "projectId", undefined);
|
|
|
|
+ this.$set(this.queryByIdList, "paymentPort", undefined);
|
|
this.queryByIdList.accountList = [];
|
|
this.queryByIdList.accountList = [];
|
|
if (!!value) {
|
|
if (!!value) {
|
|
var params = {
|
|
var params = {
|
|
@@ -1115,6 +1145,7 @@
|
|
getMediaList(value) {
|
|
getMediaList(value) {
|
|
this.$set(this.queryByIdList, "paymentMedia", undefined);
|
|
this.$set(this.queryByIdList, "paymentMedia", undefined);
|
|
this.$set(this.queryByIdList, "projectId", undefined);
|
|
this.$set(this.queryByIdList, "projectId", undefined);
|
|
|
|
+ this.$set(this.queryByIdList, "paymentPort", undefined);
|
|
this.queryByIdList.accountList = [];
|
|
this.queryByIdList.accountList = [];
|
|
var params = {
|
|
var params = {
|
|
table: "finance_payment_pool,product_id,payment_media",
|
|
table: "finance_payment_pool,product_id,payment_media",
|
|
@@ -1144,15 +1175,19 @@
|
|
|
|
|
|
getProjectList(value) {
|
|
getProjectList(value) {
|
|
this.$set(this.queryByIdList, "projectId", undefined);
|
|
this.$set(this.queryByIdList, "projectId", undefined);
|
|
|
|
+ this.$set(this.queryByIdList, "paymentPort", undefined);
|
|
this.queryByIdList.accountList = [];
|
|
this.queryByIdList.accountList = [];
|
|
if (!!value) {
|
|
if (!!value) {
|
|
var params = {
|
|
var params = {
|
|
advertiserId: this.queryByIdList.advertiserId,
|
|
advertiserId: this.queryByIdList.advertiserId,
|
|
type: this.queryByIdList.paymentMedia,
|
|
type: this.queryByIdList.paymentMedia,
|
|
productId: this.queryByIdList.productId,
|
|
productId: this.queryByIdList.productId,
|
|
|
|
+ paymentPort : this.queryByIdList.paymentPort,
|
|
|
|
+ paymentMedia: this.queryByIdList.paymentMedia,
|
|
};
|
|
};
|
|
- this.getMoney(params);
|
|
|
|
|
|
+
|
|
this.getRebate(params);
|
|
this.getRebate(params);
|
|
|
|
+ this.getPaymentPortList(params);
|
|
this.getAction("/financePayment/pool/queryPoolProjectList", params)
|
|
this.getAction("/financePayment/pool/queryPoolProjectList", params)
|
|
.then((res) => {
|
|
.then((res) => {
|
|
if (res.success) {
|
|
if (res.success) {
|
|
@@ -1166,12 +1201,26 @@
|
|
} else {
|
|
} else {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ getPaymentPortList(params) {
|
|
|
|
+ this.getAction("/financePayment/pool/queryPaymentPort", params)
|
|
|
|
+ .then((res) => {
|
|
|
|
+ if (res.success) {
|
|
|
|
+ this.paymentPortList = res.result;
|
|
|
|
+ } else {
|
|
|
|
+ this.$message.warning(res.message);
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ .finally(() => {
|
|
|
|
+ });
|
|
|
|
+ },
|
|
|
|
+
|
|
getMoney(params) {
|
|
getMoney(params) {
|
|
- // var params = {
|
|
|
|
- // advertiserId: this.queryByIdList.advertiserId,
|
|
|
|
- // type: this.queryByIdList.paymentMedia,
|
|
|
|
- // productId: this.queryByIdList.paymentMedia,
|
|
|
|
- // };
|
|
|
|
|
|
+ var params = {
|
|
|
|
+ advertiserId: this.queryByIdList.advertiserId,
|
|
|
|
+ type: this.queryByIdList.paymentMedia,
|
|
|
|
+ productId: this.queryByIdList.productId,
|
|
|
|
+ paymentPort: this.queryByIdList.paymentPort,
|
|
|
|
+ };
|
|
this.getAction("/financePayment/pool/queryPool", params)
|
|
this.getAction("/financePayment/pool/queryPool", params)
|
|
.then((res) => {
|
|
.then((res) => {
|
|
if (res.success) {
|
|
if (res.success) {
|
|
@@ -1618,10 +1667,11 @@
|
|
userId: this.userInfo().id,
|
|
userId: this.userInfo().id,
|
|
productId: this.policyOperationForm.productId.key,
|
|
productId: this.policyOperationForm.productId.key,
|
|
advertiserId: this.policyOperationForm.advertiserId.key,
|
|
advertiserId: this.policyOperationForm.advertiserId.key,
|
|
- displayAmount:
|
|
|
|
|
|
+ displayAmount:this.policyOperationForm.displayAmount,
|
|
|
|
+ /* displayAmount:
|
|
this.policyOperationForm.paymentType == 2
|
|
this.policyOperationForm.paymentType == 2
|
|
? this.policyOperationForm.displayAmount
|
|
? this.policyOperationForm.displayAmount
|
|
- : 0,
|
|
|
|
|
|
+ : 0,*/
|
|
temporaryAdvances: !!this.oldData
|
|
temporaryAdvances: !!this.oldData
|
|
? this.oldData == 1 && this.policyOperationForm.paymentType == 2
|
|
? this.oldData == 1 && this.policyOperationForm.paymentType == 2
|
|
? 1
|
|
? 1
|
|
@@ -1755,7 +1805,7 @@
|
|
this.getMediaList(this.queryByIdList.productId);
|
|
this.getMediaList(this.queryByIdList.productId);
|
|
this.$set(this.queryByIdList, "paymentMedia", list.paymentMedia);
|
|
this.$set(this.queryByIdList, "paymentMedia", list.paymentMedia);
|
|
this.getProjectList(this.queryByIdList.paymentMedia);
|
|
this.getProjectList(this.queryByIdList.paymentMedia);
|
|
-
|
|
|
|
|
|
+ this.$set(this.queryByIdList, "paymentPort", undefined);
|
|
this.rebateData = {rebateType: list.rebateType, rebateRate: list.rebateRate};
|
|
this.rebateData = {rebateType: list.rebateType, rebateRate: list.rebateRate};
|
|
},
|
|
},
|
|
// 查看的取消按钮
|
|
// 查看的取消按钮
|
|
@@ -1810,6 +1860,7 @@
|
|
userId: this.userInfo().id,
|
|
userId: this.userInfo().id,
|
|
totalAmount: total,
|
|
totalAmount: total,
|
|
amends:amendsStr,
|
|
amends:amendsStr,
|
|
|
|
+ paymentPort:this.rebateData.paymentPort,
|
|
financialReview: total > +that.totalAmount ? 1 : 0,
|
|
financialReview: total > +that.totalAmount ? 1 : 0,
|
|
list: this.queryByIdList.accountList.map((item) => {
|
|
list: this.queryByIdList.accountList.map((item) => {
|
|
return {
|
|
return {
|
|
@@ -1819,7 +1870,6 @@
|
|
};
|
|
};
|
|
}),
|
|
}),
|
|
};
|
|
};
|
|
- console.log(paramsData, that.totalAmount);
|
|
|
|
this.confirmLoading = true;
|
|
this.confirmLoading = true;
|
|
if (this.addType === "add") {
|
|
if (this.addType === "add") {
|
|
this.handleAddSureBtn(paramsData, "/financePayment/rechargeApplication/add");
|
|
this.handleAddSureBtn(paramsData, "/financePayment/rechargeApplication/add");
|