Browse Source

前端修改

yumeng 2 years ago
parent
commit
b8d226b476

+ 24 - 2
src/views/modules/policy-management/appPoolList.vue

@@ -413,14 +413,33 @@
                 <a-form-model-item label="可用金额" prop="totalAmount">
                     {{ totalAmount ? allMoney(totalAmount) : "-" }}
                 </a-form-model-item>
+
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否后补" prop="amends">
+                    <a-radio-group   v-model="amends">
+                        <a-radio-button value="2">否</a-radio-button>
+                        <a-radio-button value="1">是</a-radio-button>
+
+                    </a-radio-group>
+                </a-form-item>
+
+
+                <a-form-model-item label="备注" prop="remarks">
+                    <a-textarea
+                        v-model="queryByIdList.remarks"
+                        placeholder="请输入备注"
+                        allow-clear
+                        @change="handleRemarksChange"
+                    />
+                </a-form-model-item>
+
                 <a-form-model-item label="类型" prop="rechargeType">
                     <a-select
                         v-model="queryByIdList.rechargeType"
                         placeholder="请选择类型"
                         allow-clear
                     >
-                        <a-select-option :value="1">充值</a-select-option>
-                        <a-select-option :value="2">自运营充值</a-select-option>
+                        <a-select-option :value="1">自运营充值</a-select-option>
+                        <a-select-option :value="2">运营充值</a-select-option>
                     </a-select>
                 </a-form-model-item>
                 <a-form-model-item label="项目" prop="projectId">
@@ -623,6 +642,7 @@
                 this.handleDescRules(value, 5, 100, callback);
             };
             return {
+                amends:"2",
                 list: [],
                 productList: [],
                 advertiserList: [],
@@ -1783,11 +1803,13 @@
                             .reduce((o, n) => {
                                 return +o + +n;
                             }, 0);
+                        var amendsStr = this.amends;
                         const paramsData = {
                             ...this.queryByIdList,
                             applicanterId: this.userInfo().id,
                             userId: this.userInfo().id,
                             totalAmount: total,
+                            amends:amendsStr,
                             financialReview: total > +that.totalAmount ? 1 : 0,
                             list: this.queryByIdList.accountList.map((item) => {
                                 return {

+ 107 - 6
src/views/modules/policy-management/appRecharge.vue

@@ -144,8 +144,7 @@
                     <!-- record.status == '1' ||  -->
           <a
               @click="handleLook(record, 'upload')"
-              v-if="record.auditStatus == '4' && roleCode == 'meidaManager'"
-          >附件上传</a
+              v-if="record.auditStatus == '4' && roleCode == 'meidaManager'">附件上传</a
           ><a-divider type="vertical" v-if="record.auditStatus == '2'"/>
                     <!-- record.status == '1' ||  -->
           <a @click="handleCopy(record)" v-if="record.auditStatus == '2'">复制</a>
@@ -254,14 +253,33 @@
                 <a-form-model-item label="可用金额" prop="totalAmount">
                     {{ totalAmount ? allMoney(totalAmount) : "-" }}
                 </a-form-model-item>
+
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否后补" prop="amends">
+                    <a-radio-group v-model="amends">
+                        <a-radio-button value="2">否</a-radio-button>
+                        <a-radio-button value="1">是</a-radio-button>
+
+                    </a-radio-group>
+                </a-form-item>
+
+
+                <a-form-model-item label="备注" prop="remarks">
+                    <a-textarea
+                        v-model="queryByIdList.remarks"
+                        placeholder="请输入备注"
+                        allow-clear
+                        @change="handleRemarksChange"
+                    />
+                </a-form-model-item>
+
                 <a-form-model-item label="类型" prop="rechargeType">
                     <a-select
                         v-model="queryByIdList.rechargeType"
                         placeholder="请选择类型"
                         allow-clear
                     >
-                        <a-select-option :value="1">充值</a-select-option>
-                        <a-select-option :value="2">自运营充值</a-select-option>
+                        <a-select-option :value="1">自运营充值</a-select-option>
+                        <a-select-option :value="2">运营充值</a-select-option>
                     </a-select>
                 </a-form-model-item>
                 <a-form-model-item
@@ -477,8 +495,8 @@
                         {{
                         queryByIdList.rechargeType
                         ? queryByIdList.rechargeType == "1"
-                        ? "充值"
-                        : "运营充值"
+                        ? "自运营充值"
+                        : "运营充值"
                         : "-"
                         }}
                     </a-form-model-item>
@@ -517,6 +535,7 @@
                     </div>
                 </div>
                 <a-form-model-item
+                    v-if="  queryByIdList.auditStatus != 3"
                     label="图片上传"
                     prop="files"
                     :rules="{
@@ -534,8 +553,63 @@
                         uploadType="image"
                     />
                 </a-form-model-item>
+
+                <a-form-model-item
+                    label="查看图片"
+                    prop="files"
+                    v-if="queryByIdList.auditStatus == 3"
+                >
+                    <a @click="lookImageClick(queryByIdList.files)">查看图片</a>
+                </a-form-model-item>
             </a-form-model>
 
+            <a-modal
+                v-if="lookImageVisible"
+                title="查看图片"
+                :visible="lookImageVisible"
+                :footer="null"
+                @cancel="lookImageVisible = false"
+            >
+                <a-carousel
+                    arrows
+                    v-if="lookImageData && lookImageData != '-'"
+
+                >
+                    <div
+                        v-for="(item, index) in JSON.parse(lookImageData)"
+                        :key="index"
+                        class="content"
+                    >
+                        <div style="display: flex !important; justify-content: space-around">
+                            <div
+                                style="
+                  display: flex;
+                  flex-direction: column;
+                  align-items: center;
+                  width: 400px;
+                "
+                            >
+                                <img :src="item" style="width: 100%; max-height: 720px"/>
+                            </div>
+                        </div>
+                    </div>
+                    <a-icon
+                        type="left-circle"
+                        slot="prevArrow"
+                        slot-scope
+                        style="left: 10px; z-index: 100; font-size: 30px; color: black"
+                    />
+                    <a-icon
+                        type="right-circle"
+                        slot="nextArrow"
+                        slot-scope
+                        style="right: 10px; z-index: 100; font-size: 30px; color: black"
+                    />
+                </a-carousel>
+            </a-modal>
+
+
+
             <div
                 solt="footer"
                 style="display: flex; justify-content: end"
@@ -644,6 +718,7 @@
                 this.handleDescRules(value, 5, 100, callback);
             };
             return {
+                amends: "2",
                 roleCode: localStorage.getItem("roleCode"),
                 approvalContent: undefined,
                 showAction: true,
@@ -762,6 +837,22 @@
                         dataIndex: "advertiserName",
                         width: 250,
                     },
+
+                    {
+                        title: "是否后补",
+                        dataIndex: "amends",
+                        align: "center",
+                        width: 100,
+                        customRender(t) {
+                            if (t == "1") {
+                                return "是";
+                            } else if (t == "2") {
+                                return "否";
+                            }
+                        },
+                    },
+
+
                     {
                         title: "产品名称",
                         align: "center",
@@ -813,6 +904,13 @@
                     //     }
                     //   },
                     // },
+
+                    {
+                        title: "充值备注",
+                        dataIndex: "remarks",
+                        align: "center",
+                        width: 100,
+                    },
                     {
                         title: "返点",
                         dataIndex: "rebateRate",
@@ -1722,6 +1820,7 @@
                             .reduce((o, n) => {
                                 return +o + +n;
                             }, 0);
+                        var amendsStr = this.amends;
                         let names = this.queryByIdList.accountList.map((item) => item["accountId"]);
                         let nameSet = new Set(names);
 
@@ -1731,6 +1830,7 @@
                                 applicanterId: this.userInfo().id,
                                 userId: this.userInfo().id,
                                 totalAmount: total,
+                                amends: amendsStr,
                                 financialReview: total > +that.totalAmount ? 1 : 0,
                                 list: this.queryByIdList.accountList.map((item) => {
                                     return {
@@ -1741,6 +1841,7 @@
                                 }),
                             };
                             console.log(paramsData, that.totalAmount);
+
                             this.confirmLoading = true;
                             if (
                                 !!this.rebateData &&