yumeng преди 2 години
родител
ревизия
95998e3490

+ 19 - 27
src/views/modules/policy-management/appPoolList.vue

@@ -290,6 +290,7 @@
                         >
                             <a-select-option :value="1">汇创</a-select-option>
                             <a-select-option :value="2">骄阳</a-select-option>
+                            <a-select-option :value="5">汇创&骄阳</a-select-option>
                             <a-select-option :value="3">江西五六七</a-select-option>
                             <a-select-option :value="4">北京五六七</a-select-option>
                         </a-select>
@@ -400,14 +401,7 @@
                             {{ item.name | paymentMediaName }}
                         </a-select-option>
                     </a-select>
-                    <p v-if="rebateData" style="margin-bottom: 0">
-                        返点类型:{{
-                        rebateData.rebateType == 1 ? "返货" : "返现"
-                        }}
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 返点比例:{{
-                        rebateData.rebateRate
-                        }}%
-                    </p>
+
                 </a-form-model-item>
 
 
@@ -429,8 +423,17 @@
                             {{ item.portName }}
                         </a-select-option>
                     </a-select>
+                    <p v-if="rebateData" style="margin-bottom: 0">
+                        返点类型:{{
+                        rebateData.rebateType == 1 ? "返货" : "返现"
+                        }}
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 返点比例:{{
+                        rebateData.rebateRate
+                        }}%
+                    </p>
                 </a-form-model-item>
 
+
                 <a-form-model-item label="可用金额" prop="totalAmount">
                     {{ totalAmount ? allMoney(totalAmount) : "-" }}
                 </a-form-model-item>
@@ -834,6 +837,8 @@
                                 return "江西五六七";
                             } else if (t == "4") {
                                 return "北京五六七";
+                            }else if (t == "5") {
+                                return "汇创&骄阳";
                             }
                         },
                     },
@@ -1187,7 +1192,6 @@
                         paymentPort: this.queryByIdList.paymentPort,
                         paymentMedia: this.queryByIdList.paymentMedia,
                     };
-                    this.getRebate(params);
                     this.getPaymentPortList(params);
                     this.getAccountList();
                     this.getAction("/financePayment/pool/queryPoolProjectList", params)
@@ -1216,7 +1220,7 @@
                     });
             },
 
-            getMoney(params) {
+            getMoney() {
                 var params = {
                     advertiserId: this.queryByIdList.advertiserId,
                     type: this.queryByIdList.paymentMedia,
@@ -1227,22 +1231,6 @@
                     .then((res) => {
                         if (res.success) {
                             this.totalAmount = res.result ? res.result.cashAmount : 0;
-                        } else {
-                            this.$message.warning(res.message);
-                        }
-                    })
-                    .finally(() => {
-                    });
-            },
-            getRebate(params) {
-                //   var params = {
-                //     advertiserId: this.queryByIdList.advertiserId,
-                //     type: this.queryByIdList.paymentMedia,
-                //     productId: this.queryByIdList.paymentMedia,
-                //   };
-                this.getAction("/financePayment/application/queryInfo", params)
-                    .then((res) => {
-                        if (res.success) {
                             this.rebateData = res.result;
                         } else {
                             this.$message.warning(res.message);
@@ -1302,6 +1290,8 @@
                 }
             },
             handleAddPleace() {
+                this.rebateData = undefined;
+                this.totalAmount = undefined;
                 this.auditPolicyStatus = true;
                 this.getNewAdvertiserList();
             },
@@ -1791,7 +1781,9 @@
                 this.$set(this.queryByIdList, "paymentMedia", list.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};
+                this.rebateData = undefined;
+                this.totalAmount = undefined;
             },
             // 查看的取消按钮
             handleCloseAuditPolicy() {

+ 27 - 36
src/views/modules/policy-management/appRecharge.vue

@@ -282,14 +282,6 @@
                             {{ item.name | paymentMediaName }}
                         </a-select-option>
                     </a-select>
-                    <p v-if="rebateData" style="margin-bottom: 0">
-                        返点类型:{{
-                        rebateData.rebateType == 1 ? "返货" : "返现"
-                        }}
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 返点比例:{{
-                        rebateData.rebateRate
-                        }}%
-                    </p>
                 </a-form-model-item>
 
                 <a-form-model-item label="选择端口" prop="paymentPort">
@@ -310,9 +302,16 @@
                             {{ item.portName }}
                         </a-select-option>
                     </a-select>
+                    <p v-if="rebateData" style="margin-bottom: 0">
+                        返点类型:{{
+                        rebateData.rebateType == 1 ? "返货" : "返现"
+                        }}
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 返点比例:{{
+                        rebateData.rebateRate
+                        }}%
+                    </p>
                 </a-form-model-item>
 
-
                 <a-form-model-item label="可用金额" prop="totalAmount">
                     {{ totalAmount ? allMoney(totalAmount) : "-" }}
                 </a-form-model-item>
@@ -547,16 +546,16 @@
                     <a-form-model-item label="客户名称" prop="advertiserName">
                         {{ queryByIdList.advertiserName }}
                     </a-form-model-item>
-                    <a-form-model-item label="产品名称" prop="productName">
-                        {{ queryByIdList.productName }}
-                    </a-form-model-item>
-                    <a-form-model-item label="项目名称" prop="projectName">
-                        {{ queryByIdList.projectName }}
-                    </a-form-model-item>
+<!--                    <a-form-model-item label="产品名称" prop="productName">-->
+<!--                        {{ queryByIdList.productName }}-->
+<!--                    </a-form-model-item>-->
+<!--                    <a-form-model-item label="项目名称" prop="projectName">-->
+<!--                        {{ queryByIdList.projectName }}-->
+<!--                    </a-form-model-item>-->
                     <a-form-model-item label="媒体" prop="paymentMedia">
                         {{ queryByIdList.paymentMedia | paymentMediaName }}
                     </a-form-model-item>
-                    <a-form-model-item label="端口" prop="portName">
+                    <a-form-model-item label="端口" prop="portName" v-if="queryByIdList.paymentMedia != '2'">
                         {{ queryByIdList.portName }}
                     </a-form-model-item>
                     <a-form-model-item label="类型" prop="rechargeType">
@@ -568,6 +567,9 @@
                         : "-"
                         }}
                     </a-form-model-item>
+                    <a-form-model-item label="备注" prop="portName" v-if="queryByIdList.remarks != '' && queryByIdList.remarks != null">
+                        {{ queryByIdList.remarks }}
+                    </a-form-model-item>
                     <div
                         style="
               max-height: 350px;
@@ -588,6 +590,11 @@
                                 v-if="item.agentName != '' && item.agentName != null"
                             >
                                 {{ item.agentName }}
+                            </a-form-model-item>  <a-form-model-item
+                                label="产品"
+                                prop="productName"
+                            >
+                                {{ item.productName }}
                             </a-form-model-item>
 
                             <a-form-model-item label="账户" prop="accountName">
@@ -606,10 +613,10 @@
                                 }}%
                             </a-form-model-item>
                             <a-form-model-item label="现金金额" prop="cashAmount">
-                                {{ allMoney(item.cashAmount) }}
+                                {{ item.cashAmount }}
                             </a-form-model-item>
                             <a-form-model-item label="到账金额" prop="receivedAmount">
-                                {{ allMoney(item.receivedAmount) }}
+                                {{ item.receivedAmount }}
                             </a-form-model-item>
                         </div>
                     </div>
@@ -1265,8 +1272,6 @@
                         paymentPort: this.queryByIdList.paymentPort,
                         paymentMedia: this.queryByIdList.paymentMedia,
                     };
-                    //  this.getMoney(params);
-                    this.getRebate(params);
                     this.getAccountList();
                     this.getPaymentPortList(params);
                     this.getAction("/financePayment/pool/queryPoolProjectList", params)
@@ -1293,22 +1298,6 @@
                     .then((res) => {
                         if (res.success) {
                             this.totalAmount = res.result ? res.result.cashAmount : 0;
-                        } else {
-                            this.$message.warning(res.message);
-                        }
-                    })
-                    .finally(() => {
-                    });
-            },
-            getRebate(params) {
-                //   var params = {
-                //     advertiserId: this.queryByIdList.advertiserId,
-                //     type: this.queryByIdList.paymentMedia,
-                //     productId: this.queryByIdList.paymentMedia,
-                //   };
-                this.getAction("/financePayment/application/queryInfo", params)
-                    .then((res) => {
-                        if (res.success) {
                             this.rebateData = res.result;
                         } else {
                             this.$message.warning(res.message);
@@ -1368,6 +1357,8 @@
                 }
             },
             handleAddPleace() {
+                this.rebateData = undefined;
+                this.totalAmount = undefined;
                 this.auditPolicyStatus = true;
                 this.addType = "add";
                 this.getNewAdvertiserList();

+ 3 - 0
src/views/modules/policy-management/applicationLog.vue

@@ -329,6 +329,7 @@
                         >
                             <a-select-option :value="1">汇创</a-select-option>
                             <a-select-option :value="2">骄阳</a-select-option>
+                            <a-select-option :value="5">汇创&骄阳</a-select-option>
                             <a-select-option :value="3">江西五六七</a-select-option>
                             <a-select-option :value="4">北京五六七</a-select-option>
                         </a-select>
@@ -805,6 +806,8 @@
                                 return "江西五六七";
                             } else if (t == "4") {
                                 return "北京五六七";
+                            } else if (t == "5") {
+                                return "汇创&骄阳";
                             }
                         },
                     },