yumeng 2 lat temu
rodzic
commit
6360bfd773

+ 65 - 15
src/views/modules/policy-management/appPoolList.vue

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

Plik diff jest za duży
+ 1971 - 1908
src/views/modules/policy-management/appRecharge.vue


+ 20 - 11
src/views/modules/policy-management/applicationLog.vue

@@ -28,7 +28,7 @@
         /* margin-left: 2px; */
     }
 
-    ::v-deep .ant-steps-dot .ant-steps-item-icon   {
+    ::v-deep .ant-steps-dot .ant-steps-item-icon {
         width: 15px;
         height: 15px;
         margin-top: 5px;
@@ -106,6 +106,20 @@
                         />
                     </a-form-item>
 
+                    <a-form-item class="grid-form-item" label="审核角色:" :colon="false">
+                        <a-select
+                            v-model="configForm.auditRole"
+                            style="width: 200px; margin-left: 10px"
+                            :filterOption="filterOption"
+                            showSearch
+                            allowClear
+                            placeholder="请选择审核角色"
+                        >
+                            <a-select-option value="sale"> 销售</a-select-option>
+                            <a-select-option value="finance"> 财务</a-select-option>
+                        </a-select>
+                    </a-form-item>
+
                     <a-form-item label="状态:">
                         <a-select v-model="configForm.auditStatus" style="width: 100px" allow-clear>
                             <a-select-option
@@ -481,13 +495,7 @@
                         type="primary"
                         class="cancel-btn"
                         @click="handleAuditSure"
-                        :disabled="
-              queryByIdList.paymentType == 2
-                ? false
-                : queryByIdList.newFiles
-                ? false
-                : true
-            "
+                        :disabled="false"
                         style="margin: 0 10px"
                     >通过审核
                     </a-button
@@ -897,6 +905,7 @@
                     time: [],
                     auditStatus: undefined,
                     rebateType: undefined,
+                    auditRole: undefined,
                 },
                 tablePag: {
                     page: 1,
@@ -940,9 +949,7 @@
                 this.lookImageData = item;
             },
             getList() {
-                var params = {
-                    mediaType: this.policyOperationForm.paymentMedia,
-                };
+                var params = {};
                 this.getAction("/financePayment/application/getAdvertisers", params)
                     .then((res) => {
                         if (res.success) {
@@ -1246,6 +1253,7 @@
                     paymentMedia: this.configForm.paymentMedia,
                     auditStatus: this.configForm.auditStatus,
                     rebateType: this.configForm.rebateType,
+                    auditRole: this.configForm.auditRole,
                     startDate:
                         this.configForm.time && this.configForm.time.length == 2
                             ? moment(this.configForm.time[0]).format("YYYY-MM-DD")
@@ -1686,6 +1694,7 @@
                     time: [],
                     status: undefined,
                     type: undefined,
+                    auditRole: undefined,
                 };
                 this.tablePag = {
                     page: 1,