yumeng há 2 anos atrás
pai
commit
9f18329008

+ 18 - 33
src/views/modules/policy-management/appPoolList.vue

@@ -436,7 +436,7 @@
                 </a-form-model-item>
 
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否后补" prop="amends">
-                    <a-radio-group   v-model="amends">
+                    <a-radio-group v-model="amends">
                         <a-radio-button value="2">否</a-radio-button>
                         <a-radio-button value="1">是</a-radio-button>
 
@@ -663,7 +663,7 @@
                 this.handleDescRules(value, 5, 100, callback);
             };
             return {
-                amends:"2",
+                amends: "2",
                 list: [],
                 productList: [],
                 advertiserList: [],
@@ -766,7 +766,7 @@
                     cashAmount: [{required: true, message: "请填写现金金额", trigger: "blur"}],
                     paymentPort: [{required: true, message: "请选择端口", trigger: "change"}],
                     rechargeType: [{required: true, message: "请选择类型", trigger: "change"}],
-                   // projectId: [{required: true, message: "请选择项目", trigger: "change"}],
+                    // projectId: [{required: true, message: "请选择项目", trigger: "change"}],
                 },
                 queryByIdList: {
                     accountList: [],
@@ -1113,6 +1113,8 @@
                     .finally(() => {
                     });
             },
+
+
             getNewProductList(value) {
                 this.$set(this.queryByIdList, "productId", undefined);
                 this.$set(this.queryByIdList, "paymentMedia", undefined);
@@ -1182,12 +1184,12 @@
                         advertiserId: this.queryByIdList.advertiserId,
                         type: this.queryByIdList.paymentMedia,
                         productId: this.queryByIdList.productId,
-                        paymentPort : this.queryByIdList.paymentPort,
+                        paymentPort: this.queryByIdList.paymentPort,
                         paymentMedia: this.queryByIdList.paymentMedia,
                     };
-
                     this.getRebate(params);
                     this.getPaymentPortList(params);
+                    this.getAccountList();
                     this.getAction("/financePayment/pool/queryPoolProjectList", params)
                         .then((res) => {
                             if (res.success) {
@@ -1252,28 +1254,11 @@
             getAccountList() {
                 this.queryByIdList.accountList = [];
                 var params = {
-                    table: "ctop_user_allocation,account_id,auth_name",
-                    groupBy: "account_id",
-                    paramters: [
-                        {
-                            paramter: "media_id",
-                            value: this.queryByIdList.paymentMedia,
-                        },
-                        //   {
-                        //     paramter: "advertiser_id",
-                        //     value: this.queryByIdList.advertiserId,
-                        //   },
-                        {
-                            paramter: "project_id",
-                            value: this.queryByIdList.projectId,
-                        },
-                        //   {
-                        //     paramter: "product_id",
-                        //     value: this.queryByIdList.productId,
-                        //   },
-                    ],
+                    advertiserId: this.queryByIdList.advertiserId,
+                    type: this.queryByIdList.paymentMedia,
+                    projectId: this.queryByIdList.projectId,
                 };
-                this.postDataAction("/financePayment/pool/querySheetIdAndNameList", params)
+                this.getAction("/financePayment/pool/queryPoolAccountList", params)
                     .then((res) => {
                         if (res.success) {
                             this.accountList = res.result;
@@ -1667,11 +1652,11 @@
                             userId: this.userInfo().id,
                             productId: this.policyOperationForm.productId.key,
                             advertiserId: this.policyOperationForm.advertiserId.key,
-                            displayAmount:this.policyOperationForm.displayAmount,
-                           /* displayAmount:
-                                this.policyOperationForm.paymentType == 2
-                                    ? this.policyOperationForm.displayAmount
-                                    : 0,*/
+                            displayAmount: this.policyOperationForm.displayAmount,
+                            /* displayAmount:
+                                 this.policyOperationForm.paymentType == 2
+                                     ? this.policyOperationForm.displayAmount
+                                     : 0,*/
                             temporaryAdvances: !!this.oldData
                                 ? this.oldData == 1 && this.policyOperationForm.paymentType == 2
                                     ? 1
@@ -1859,8 +1844,8 @@
                             applicanterId: this.userInfo().id,
                             userId: this.userInfo().id,
                             totalAmount: total,
-                            amends:amendsStr,
-                            paymentPort:this.rebateData.paymentPort,
+                            amends: amendsStr,
+                            paymentPort: this.rebateData.paymentPort,
                             financialReview: total > +that.totalAmount ? 1 : 0,
                             list: this.queryByIdList.accountList.map((item) => {
                                 return {

+ 33 - 31
src/views/modules/policy-management/appRecharge.vue

@@ -124,6 +124,20 @@
                             allow-clear
                         />
                     </a-form-item>
+                    <a-form-item class="grid-form-item" label="是否后补:" :colon="false">
+                        <a-select
+                            v-model="configForm.amends"
+                            style="width: 200px; margin-left: 10px"
+                            :filterOption="filterOption"
+                            showSearch
+                            allowClear
+                            placeholder="请选择是否后补"
+                        >
+                            <a-select-option value="1">是</a-select-option>
+                            <a-select-option value="2">否</a-select-option>
+                        </a-select>
+                    </a-form-item>
+
                     <a-form-item class="grid-form-item" label="申请时间:" :colon="false">
                         <a-range-picker
                             v-model="configForm.time"
@@ -336,15 +350,16 @@
                 </a-form-model-item>
                 <a-form-model-item
                     label="项目"
-                    prop="projectId"
-                    :rules="[
-            {
-              required: queryByIdList.rechargeType == 1,
-              message: '请选择项目',
-              trigger: 'change',
-            },
-          ]"
-                >
+                    prop="projectId">
+
+                    <!--                    :rules="[-->
+                    <!--                    {-->
+                    <!--                    required: queryByIdList.rechargeType == 1,-->
+                    <!--                    message: '请选择项目',-->
+                    <!--                    trigger: 'change',-->
+                    <!--                    },-->
+                    <!--                    ]"-->
+
                     <a-select
                         v-model="queryByIdList.projectId"
                         placeholder="请选择项目"
@@ -1108,6 +1123,7 @@
                     rebateType: this.configForm.rebateType,
                     auditStatus: this.configForm.auditStatus,
                     accountId: this.configForm.accountId,
+                    amends: this.configForm.amends,
                     startDate:
                         this.configForm.time && this.configForm.time.length == 2
                             ? moment(this.configForm.time[0]).format("YYYY-MM-DD")
@@ -1249,8 +1265,9 @@
                         paymentPort: this.queryByIdList.paymentPort,
                         paymentMedia: this.queryByIdList.paymentMedia,
                     };
-                  //  this.getMoney(params);
+                    //  this.getMoney(params);
                     this.getRebate(params);
+                    this.getAccountList();
                     this.getPaymentPortList(params);
                     this.getAction("/financePayment/pool/queryPoolProjectList", params)
                         .then((res) => {
@@ -1303,28 +1320,11 @@
             getAccountList() {
                 this.queryByIdList.accountList = [];
                 var params = {
-                    table: "ctop_user_allocation,account_id,auth_name",
-                    groupBy: "account_id",
-                    paramters: [
-                        {
-                            paramter: "media_id",
-                            value: this.queryByIdList.paymentMedia,
-                        },
-                        //   {
-                        //     paramter: "advertiser_id",
-                        //     value: this.queryByIdList.advertiserId,
-                        //   },
-                        {
-                            paramter: "project_id",
-                            value: this.queryByIdList.projectId,
-                        },
-                        //   {
-                        //     paramter: "product_id",
-                        //     value: this.queryByIdList.productId,
-                        //   },
-                    ],
+                    advertiserId: this.queryByIdList.advertiserId,
+                    type: this.queryByIdList.paymentMedia,
+                    projectId: this.queryByIdList.projectId,
                 };
-                this.postDataAction("/financePayment/pool/querySheetIdAndNameList", params)
+                this.getAction("/financePayment/pool/queryPoolAccountList", params)
                     .then((res) => {
                         if (res.success) {
                             this.accountList = res.result;
@@ -1514,6 +1514,7 @@
                     rebateType: this.configForm.rebateType,
                     auditStatus: this.configForm.auditStatus,
                     accountId: this.configForm.accountId,
+                    amends: this.configForm.amends,
                     startDate:
                         this.configForm.time && this.configForm.time.length == 2
                             ? moment(this.configForm.time[0]).format("YYYY-MM-DD")
@@ -2124,6 +2125,7 @@
                     status: undefined,
                     type: undefined,
                     accountId: undefined,
+                    amends: undefined,
                 };
                 this.tablePag = {
                     page: 1,

+ 16 - 7
src/views/modules/policy-management/applicationLog.vue

@@ -411,7 +411,16 @@
                         prop="files"
                         v-if="queryByIdList.files && queryByIdList.files != '-'"
                     >
-                        <a @click="lookImageClick(queryByIdList.files)">查看图片</a>
+                        <div>
+                            <img
+                                :src="item"
+                                alt=""
+                                v-for="(item, index) in JSON.parse(queryByIdList.files)"
+                                :key="index"
+                                style="width: 100px; height: auto; max-height: 100px"
+                                @click="lookImageClick(queryByIdList.files)"
+                            />
+                        </div>
                     </a-form-model-item>
                 </div>
                 <a-form-model-item
@@ -439,12 +448,10 @@
                 :visible="lookImageVisible"
                 :footer="null"
                 @cancel="lookImageVisible = false"
+                :width="1200"
             >
-                <a-carousel
-                    arrows
-                    v-if="lookImageData && lookImageData != '-'"
-                    style="max-height: 720px"
-                >
+                <a-carousel arrows v-if="lookImageData && lookImageData != '-'">
+                    <!--                    <a @click="lookImageClick(queryByIdList.files)">查看图片</a>-->
                     <div
                         v-for="(item, index) in JSON.parse(lookImageData)"
                         :key="index"
@@ -456,7 +463,7 @@
                   display: flex;
                   flex-direction: column;
                   align-items: center;
-                  width: 400px;
+                  width: 1200px;
                 "
                             >
                                 <img :src="item" style="width: 100%; max-height: 720px"/>
@@ -477,6 +484,8 @@
                     />
                 </a-carousel>
             </a-modal>
+
+
             <div
                 solt="footer"
                 style="display: flex; justify-content: end"