Browse Source

政策管理 联调测试

jiayufei 3 năm trước cách đây
mục cha
commit
8e5968a24e

+ 1 - 1
src/utils/request.js

@@ -19,7 +19,7 @@ else if (process.env.NODE_ENV === 'debug') {
 }
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
-    // axios.defaults.baseURL = 'http://139.186.165.84:8806/jeecg-boot';
+    // axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试
 	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 }
 const service = axios.create({

+ 11 - 0
src/views/modules/policy-management/policy-management-server.js

@@ -0,0 +1,11 @@
+/**
+ * @file 账户配置API
+ * @author jiayufei
+ */
+
+//  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+ // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
+ // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+ // export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+ export const urlAcount = 'http://192.168.1.8:7005'; // 学超
+ 

+ 2 - 2
src/views/modules/policy-management/policy-management.less

@@ -52,7 +52,7 @@
     }
 }
 /deep/ .audit-policy-class {
-    width: 730px !important;
+    width: 930px !important;
     .ant-modal-body {
         height: 420px;
         overflow-y: auto;
@@ -80,7 +80,7 @@
                 }
                 .line-right-spn {
                     display: inline-block;
-                    width: 140px;
+                    width: 220px;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;

+ 342 - 142
src/views/modules/policy-management/policy-management.vue

@@ -13,7 +13,6 @@
                 layout="inline"
                 :form="searchForm"
                 hide-required-mark
-                @submit="handleQueryList"
             >
                 <a-row class="grid-form-options">
                     <a-form-item
@@ -39,17 +38,24 @@
                     </a-form-item>
                     <a-form-item label="媒体:">
                         <a-select v-model="configForm.creativeMedia" style="width: 100px">
-                            <a-select-option :value="2">不限</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">快手</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE">头条</a-select-option>
+                            <a-select-option
+                                v-for="item in creativeMediaOptions"
+                                :key="item.id"
+                                :value="item.id"
+                            >
+                                {{ item.name }}
+                            </a-select-option>
                         </a-select>
                     </a-form-item>
                     <a-form-item label="返点类型:">
                         <a-select v-model="configForm.creativeRebate" style="width: 100px">
-                            <a-select-option :value="2">不限</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">返现</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE">返货</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE_VERTICAL">返现+返货</a-select-option>
+                            <a-select-option
+                                v-for="item in creativeRebateOptions"
+                                :key="item.id"
+                                :value="item.id"
+                            >
+                                {{ item.name }}
+                            </a-select-option>
                         </a-select>
                     </a-form-item>
                 </a-row>
@@ -63,18 +69,20 @@
                     </a-form-item>
                     <a-form-item label="销售:">
                         <a-select v-model="configForm.creativeSale" style="width: 100px">
-                            <a-select-option :value="2">不限</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">竖版视频</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE">大图横图</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE_VERTICAL">大图竖图</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_UNION_SPLASH">开屏</a-select-option>
+                            <a-select-option
+                                v-for="item in allSaleListOption"
+                                :key="item.userId"
+                                :value="item.userId"
+                            >
+                                {{ item.userName }}
+                            </a-select-option>
                         </a-select>
                     </a-form-item>
                     <a-form-item label="运营方式:">
                         <a-select v-model="configForm.creativeOperate" style="width: 100px">
-                            <a-select-option :value="2">不限</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">自运营</a-select-option>
-                            <a-select-option value="CREATIVE_IMAGE_MODE_LARGE">代运营</a-select-option>
+                            <a-select-option value="no">不限</a-select-option>
+                            <a-select-option :value="0">自运营</a-select-option>
+                            <a-select-option :value="1">代运营</a-select-option>
                         </a-select>
                     </a-form-item>
                     <a-form-item
@@ -89,16 +97,18 @@
                     </a-form-item>
                     <a-form-item label="状态:">
                         <a-select v-model="configForm.searchStatus" style="width: 100px">
-                            <a-select-option :value="2">不限</a-select-option>
-                            <a-select-option :value="0">待审核</a-select-option>
-                            <a-select-option :value="1">审核中</a-select-option>
-                            <a-select-option :value="1">审核通过</a-select-option>
-                            <a-select-option :value="1">审核拒绝</a-select-option>
+                            <a-select-option
+                                v-for="item in searchStatusOptions"
+                                :key="item.id"
+                                :value="item.id"
+                            >
+                                {{ item.name }}
+                            </a-select-option>
                         </a-select>
                     </a-form-item>
                     <a-form-item class="form-handle-btn">
                         <a-button type="default" class="reset-class" @click="handleResetList">重置</a-button>
-                        <a-button type="primary" html-type="submit">搜索</a-button>
+                        <a-button type="primary" @click="handleQueryList">搜索</a-button>
                     </a-form-item>
                 </a-row>
             </a-form>
@@ -111,30 +121,43 @@
                 :columns="columns"
                 :dataSource="dataSource"
                 :pagination="false"
+                :loading="controlLoading"
                 :scroll="{x: 3000}"
             >
-                <span slot="accountId_dictText" slot-scope="text">
+                <span slot="advertiserName" slot-scope="text">
                     <a>{{ text }}</a>
                 </span>
-                <span slot="validBalance" slot-scope="text">
+                <span slot="promotionType" slot-scope="text">
+                    <a>{{ text === 0 ? '自运营' : '代运营' }}</a>
+                </span>
+                <span slot="advancePay" slot-scope="text">
+                    <a>{{ text === 0 ? '否' : '是' }}</a>
+                </span>
+                <span slot="isDianPay" slot-scope="text">
+                    <a>{{ text === 0 ? '否' : '是' }}</a>
+                </span>
+                <span slot="updateApprovedStatus" slot-scope="text">
                     <a>{{ text }}</a>
                 </span>
-                <span slot="adCpaBidStr" slot-scope="text">
+                <span slot="accountingPeriod" slot-scope="text">
                     <a>{{ text }}</a>
                 </span>
+                <span slot="policyStartDate" slot-scope="text, record">
+                    <span>{{ text }} 至 {{ record.policyEndDate}}</span>
+                </span>
                 <span slot="action" slot-scope="text, record">
-                    <a @click="handleDetail">查看</a>
-                    <a-divider type="vertical"/>
-                    <a @click="handleSubmitReview(text)">提交审核</a>
-                    <a-divider type="vertical"/>
-                    <a @click="handleEditTable(record)">编辑</a>
-                    <a-divider type="vertical"/>
-                    <a @click="handleAuditSure">审核通过</a>
-                    <a-divider type="vertical"/>
-                    <a @click="handleAuditCancel">审核拒绝</a>
+                    <a v-if="record.updateOperation.includes('查看')" @click="handleDetail(record)">查看</a>
+                    <a-divider v-if="record.updateOperation.includes('查看')" type="vertical"/>
+                    <a v-if="record.updateOperation.includes('提交审核')" @click="handleSubmitReview(record)">提交审核</a>
+                    <a-divider v-if="record.updateOperation.includes('提交审核')" type="vertical"/>
+                    <a v-if="record.approvedStatus === 4" @click="handleEditTable(record)">编辑</a>
+                    <a-divider v-if="record.approvedStatus === 4" type="vertical"/>
+                    <a v-if="record.updateOperation.includes('审核通过')" @click="handleAuditSure(record)">审核通过</a>
+                    <a-divider v-if="record.updateOperation.includes('审核通过')" type="vertical"/>
+                    <a v-if="record.updateOperation.includes('审核拒绝')" @click="handleAuditCancel(record)">审核拒绝</a>
                 </span>
                 <span slot="reason" slot-scope="text, record">
-                    <a @click="handleRejectionReason(text)">被拒原因</a>
+                    <a @click="handleRejectionReason(record)" :disabled="record.approvedStatus !== 4">被拒原因</a>
                 </span>
             </a-table>
             <a-pagination
@@ -158,8 +181,8 @@
             @cancel="handleModeCancel"
         >
             <div>
-                <div class="reason-class-header">请输入审核不通过的理由:</div>
-                <div>显示不通过的理由</div>
+                <div class="reason-class-header">审核不通过的理由:</div>
+                <div>{{ rejectionReasonList.approvalContent }}</div>
             </div>
         </a-modal>
         <!-- 查看详情 -->
@@ -180,81 +203,89 @@
                     <div class="line-quen-left">
                         <div class="policy-line-left">
                             <span class="line-left-spn">公司名称:</span>
-                            <span class="line-right-spn">北京有限公司北京有限公司北京有限公司北京有限公司北京有限公司北京有限公司</span>
+                            <span class="line-right-spn">{{ queryByIdList.companyName || '-' }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">广告主:</span>
-                            <span class="line-right-spn">北京有限公司</span>
+                            <span class="line-right-spn">{{ queryByIdList.advertiserName || '-' }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">产品名称:</span>
                             <div style="width: 200px;">
-                                <div class="line-right-spn">产品名称产品名称产品名称产品名称产品名称产品名称</div>
-                                <div class="line-right-spn">产品名称</div>
-                                <div class="line-right-spn">产品名称</div>
+                                <div
+                                    class="line-right-spn"
+                                    v-for="(item, index) in queryByIdList.policyProductName"
+                                    :key="index + 1"
+                                >
+                                    {{ item }}
+                                </div>
                             </div>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">媒体:</span>
-                            <span class="line-right-spn">产品名称</span>
+                            <span class="line-right-spn">{{ queryByIdList.updateMediaType }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">销售:</span>
-                            <span class="line-right-spn">产品名称</span>
+                            <span class="line-right-spn">{{ queryByIdList.createUserName }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">区域:</span>
-                            <span class="line-right-spn">产品名称</span>
+                            <span class="line-right-spn">{{ queryByIdList.nickName }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">我司主体:</span>
-                            <span class="line-right-spn">产品名称</span>
+                            <span class="line-right-spn">{{ queryByIdList.companySubjectName }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">运营方式:</span>
-                            <span class="line-right-spn">产品名称</span>
+                            <span class="line-right-spn">{{ queryByIdList.promotionType === 0 ? '自运营' : '代运营' }}</span>
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">集团简称:</span>
-                            <span class="line-right-spn">产品名称</span>
+                            <span class="line-right-spn">{{ queryByIdList.groupAbbreviation }}</span>
                         </div>
                     </div>
                     <div class="line-quen-right">
                         <div class="policy-line-right">
                             <span class="line-left-spn">是否预付:</span>
-                            <span class="line-right-spn">否</span>
+                            <span class="line-right-spn">{{ queryByIdList.advancePay === 0 ? '' : '是' }}</span>
                         </div>
                         <div class="policy-line-right">
                             <span class="line-left-spn">返点类型:</span>
-                            <span class="line-right-spn">返现</span>
+                            <span class="line-right-spn">{{ queryByIdList.updateRebateType }}</span>
                         </div>
                         <div class="policy-line-right">
                             <span class="line-left-spn">返点比例:</span>
-                            <span class="line-right-spn">3%</span>
+                            <span class="line-right-spn">{{ queryByIdList.rebateRate }}</span>
                         </div>
-                        <div class="policy-line-right">
-                            <span class="line-left-spn">账期:</span>
-                            <span class="line-right-spn">3%</span>
-                        </div>
-                        <div class="policy-line-right">
-                            <span class="line-left-spn">是否第三方支付:</span>
-                            <span class="line-right-spn">3%</span>
-                        </div>
-                        <div class="policy-line-right">
-                            <span class="line-left-spn">垫付公司:</span>
-                            <span class="line-right-spn">3%</span>
-                        </div>
-                        <div class="policy-line-right">
-                            <span class="line-left-spn">垫付返现:</span>
-                            <span class="line-right-spn">3%</span>
+                        <div v-if="queryByIdList.advancePay === 0">
+                            <div class="policy-line-right">
+                                <span class="line-left-spn">账期:</span>
+                                <span class="line-right-spn">{{ queryByIdList.accountingPeriod }}</span>
+                            </div>
+                            <div class="policy-line-right">
+                                <span class="line-left-spn">是否第三方垫付:</span>
+                                <span class="line-right-spn">{{ queryByIdList.isDianPay === 0 ? '否' : '是' }}</span>
+                            </div>
+                            <div v-if="queryByIdList.isDianPay === 1">
+                                <div class="policy-line-right">
+                                    <span class="line-left-spn">垫付公司:</span>
+                                    <span class="line-right-spn">{{ queryByIdList.dianPayCompanyName }}</span>
+                                </div>
+                                <div class="policy-line-right">
+                                    <span class="line-left-spn">垫付返点:</span>
+                                    <span class="line-right-spn">{{ queryByIdList.dianPayCompanyRebateRate }}</span>
+                                </div>
+                            </div>
                         </div>
                         <div class="policy-line-right">
                             <span class="line-left-spn">政策起止时间:</span>
-                            <span class="line-right-spn">3%</span>
+                            <span class="line-right-spn">{{ queryByIdList.policyStartDate }} 至 {{ queryByIdList.policyEndDate }}</span>
                         </div>
                         <div class="policy-line-right">
                             <span class="line-left-spn">备注:</span>
-                            <span class="line-right-spn">3%</span>
+                            <span class="line-right-spn">{{ queryByIdList.remarks }}</span>
                         </div>
                     </div>
                 </div>
@@ -463,6 +494,10 @@
     </div>
 </template>
 <script>
+import {getAction, postAction, deleteAction} from '@/api/manage';
+import {urlAcount} from './policy-management-server.js';
+import {mapGetters} from 'vuex';
+
 export default {
     name: 'policy-management',
     data() {
@@ -470,6 +505,62 @@ export default {
             this.handleExportRules(value, 1, 30, callback);
         };
         return {
+            controlLoading: true,
+            allSaleListOption: [],
+            creativeMediaOptions: [
+                {
+                    id: 'no',
+                    name: '不限'
+                },
+                {
+                    id: 1,
+                    name: '头条'
+                },
+                {
+                    id: 2,
+                    name: '快手'
+                }
+            ],
+            creativeRebateOptions: [
+                {
+                    id: 'no',
+                    name: '不限'
+                },
+                {
+                    id: 0,
+                    name: '返现'
+                },
+                {
+                    id: 1,
+                    name: '返货'
+                },
+                {
+                    id: 2,
+                    name: '返现+返货'
+                }
+            ],
+            searchStatusOptions: [
+                {
+                    id: 'no',
+                    name: '不限'
+                },
+                {
+                    id: 1,
+                    name: '待审核'
+                },
+                {
+                    id: 2,
+                    name: '审核中'
+                },
+                {
+                    id: 3,
+                    name: '审核通过'
+                },
+                {
+                    id: 4,
+                    name: '审核拒绝'
+                }
+            ],
             subTitleMsgStatus: false,
             remarksStatus: false,
             changeRules: [
@@ -541,128 +632,114 @@ export default {
                     {min: 5, max: 100, message: '请输入5-100个字符', trigger: 'blur'}
                 ]
             },
-            dataSource: [
-                {
-                   status: '腾讯科技有限公司', 
-                   accountId_dictText: '腾讯科技有限公司', 
-                   creativeImageMode: '产品名称', 
-                   accountId: '快手', 
-                   createTime: '何甜甜', 
-                   validBalance: '待审核', 
-                   accountBudget: '是', 
-                   adCpaBidStr: '80天',
-                   cost: '返现',
-                   cost11: '3%',
-                   cost22: '是',
-                   cost33: '酒气有限公司',
-                   cost44: '3%',
-                   cost55: '代运营',
-                   cost66: '2020-12-04',
-                   cost77: '这个是备注',
-                }
-            ],
+            dataSource: [],
             columns: [
                 {
                     title: '公司名称',
                     align: 'center',
-                    dataIndex: 'status',
-                    width: 150
+                    dataIndex: 'companyName',
+                    width: 180
                 },
                 {
                     title: '广告主',
                     align: 'center',
-                    dataIndex: 'accountId_dictText',
-                    width: 150,
-                    scopedSlots: {customRender: 'accountId_dictText'}
+                    dataIndex: 'advertiserName',
+                    width: 180,
+                    scopedSlots: {customRender: 'advertiserName'}
                 },
                 {
                     title: '产品',
                     align: 'center',
-                    dataIndex: 'creativeImageMode',
-                    width: 150
+                    dataIndex: 'updatePolicyProductName',
+                    ellipsis: true,
+                    width: 190
                 },
                 {
                     title: '媒体',
                     align: 'center',
-                    dataIndex: 'accountId',
+                    dataIndex: 'updateMediaType',
                     width: 150
                 },
                 {
                     title: '销售',
-                    dataIndex: 'createTime',
+                    dataIndex: 'createUserName',
                     align: 'center',
                     width: 150
                 },
                 {
                     title: '状态',
-                    dataIndex: 'validBalance',
+                    dataIndex: 'updateApprovedStatus',
                     align: 'center',
                     width: 150,
-                    scopedSlots: {customRender: 'validBalance'}
+                    scopedSlots: {customRender: 'updateApprovedStatus'}
                 },
                 {
                     title: '是否预付',
-                    dataIndex: 'accountBudget',
+                    dataIndex: 'advancePay',
                     width: 180,
-                    align: 'center'
+                    align: 'center',
+                    scopedSlots: {customRender: 'advancePay'}
                 },
                 {
                     title: '账期',
-                    dataIndex: 'adCpaBidStr',
+                    dataIndex: 'accountingPeriod',
                     align: 'center',
                     width: 150,
-                    scopedSlots: {customRender: 'adCpaBidStr'}
+                    scopedSlots: {customRender: 'accountingPeriod'}
                 },
                 {
                     title: '返点类型',
                     align: 'center',
-                    dataIndex: 'cost',
+                    dataIndex: 'updateRebateType',
                     width: 150
                 },
                 {
                     title: '返点比例',
                     align: 'center',
-                    dataIndex: 'cost11',
+                    dataIndex: 'rebateRate',
                     width: 150
                 },
                 {
                     title: '是否垫付',
                     align: 'center',
-                    dataIndex: 'cost22',
-                    width: 150
+                    dataIndex: 'isDianPay',
+                    width: 150,
+                    scopedSlots: {customRender: 'isDianPay'}
                 },
                 {
                     title: '垫付公司',
                     align: 'center',
-                    dataIndex: 'cost33',
+                    dataIndex: 'dianPayCompanyName',
                     width: 150
                 },
                 {
                     title: '垫付公司返点',
                     align: 'center',
-                    dataIndex: 'cost44',
+                    dataIndex: 'dianPayCompanyRebateRate',
                     width: 150
                 },
                 {
                     title: '运营方式',
                     align: 'center',
-                    dataIndex: 'cost55',
-                    width: 150
+                    dataIndex: 'promotionType',
+                    width: 150,
+                    scopedSlots: {customRender: 'promotionType'}
                 },
                 {
                     title: '政策日期',
                     align: 'center',
-                    dataIndex: 'cost66',
-                    width: 150
+                    dataIndex: 'policyStartDate',
+                    width: 220,
+                    scopedSlots: {customRender: 'policyStartDate'}
                 },
                 {
                     title: '备注',
                     align: 'center',
-                    dataIndex: 'cost77',
-                    width: 150
+                    dataIndex: 'remarks',
+                    width: 190
                 },
                 {
-                    title: '操作',
+                    title: '操作', // operation
                     dataIndex: 'action',
                     align: 'center',
                     width: 250,
@@ -670,7 +747,7 @@ export default {
                     scopedSlots: {customRender: 'action'}
                 },
                 {
-                    title: '审核理由',
+                    title: '审核理由', // approvalContent
                     dataIndex: 'reason',
                     align: 'center',
                     width: 150,
@@ -682,24 +759,111 @@ export default {
                 companyName: undefined,
                 adverName: undefined,
                 productName: undefined,
-                creativeMedia: 2,
-                creativeRebate: 2,
+                creativeMedia: 'no',
+                creativeRebate: 'no',
                 creativeAdvance: undefined,
                 creativeSale: undefined,
-                creativeOperate: 2,
+                creativeOperate: 'no',
                 time: [],
-                searchStatus: 2
+                searchStatus: 'no'
             },
             tablePag: {
                 page: 1,
                 size: 10
-            }
+            },
+            rejectionReasonList: {},
+            tableOnlyId: ''
         }; 
     },
     created() {
         this.searchForm = this.$form.createForm(this);
     },
+    mounted() {
+        this.handleInitTable();
+        this.handleGetAllSaleList();
+    },
     methods: {
+        ...mapGetters(['userInfo']),
+        handleExamineAll(data) {
+            const paramsData = {
+                id: data.id,
+                type: data.type,
+                userId: this.userInfo().id,
+                approvalContent: data.value
+            };
+            getAction('http://192.168.1.8:9999/finance/cwjsPolicyInfo/policyApproval', paramsData).then(result => {
+                if (result.code === 0) {
+                    this.rejectAuditStatus = false;
+                    this.auditPolicyStatus = false;
+                    this.handleInitTable();
+                    this.$message.success(result.message);
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
+        // 获取所有的媒体 枚举值
+        handleGetAllSaleList() {
+            const paramsData = {
+                userId: this.userInfo().id
+            };
+            getAction('http://192.168.1.8:9999/finance/cwjsPolicyInfo/getAllSaleList', paramsData).then(result => {
+                if (result.code === 200) {
+                    this.allSaleListOption = result.result;
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
+        // 获取默认的列表数据
+        handleInitTable() {
+            this.controlLoading = true;
+            const paramsData = {
+                userId: this.userInfo().id,
+                companyName: this.configForm.companyName,
+                advertiserName: this.configForm.adverName,
+                productName: this.configForm.productName,
+                mediaType: this.configForm.creativeMedia === 'no' ? '' : this.configForm.creativeMedia,
+                rebateType: this.configForm.creativeRebate === 'no' ? '' : this.configForm.creativeRebate,
+                dianPayCompanyName: this.configForm.creativeAdvance,
+                createUserId: this.configForm.creativeSale === 'no' ? '' : this.configForm.creativeSale,
+                promotionType: this.configForm.creativeOperate === 'no' ? '' : this.configForm.creativeOperate,
+                approvedStatus: this.configForm.searchStatus === 'no' ? '' : this.configForm.searchStatus,
+                startTime: this.configForm.time[0], 
+                endTime: this.configForm.time[1],
+                pageNo: this.tablePag.page,
+                pageSize: this.tablePag.size
+            };
+            getAction('http://192.168.1.8:9999/finance/cwjsPolicyInfo/list', paramsData).then(result => {
+                if (result.code === 0) {
+                    let defaultList = result.result.list;
+                    defaultList.forEach(item => {
+                        item.updatePolicyProductName = item.policyProductName.join(',');
+                        item.updateOperation = item.operation.split('|');
+                        item.updateMediaType = this.creativeMediaOptions.filter(val => val.id === item.mediaType)[0].name;
+                        item.updateRebateType = this.creativeRebateOptions.filter(val => val.id === item.rebateType)[0].name;
+                        item.updateApprovedStatus = this.searchStatusOptions.filter(val => val.id === item.approvedStatus)[0].name;
+                    });
+                    this.dataSource = defaultList;
+                    this.totalAll = result.result.total;
+                }
+                else {
+                    this.dataSource = [];
+                    this.totalAll = 0;
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            }).finally(() => {
+                this.controlLoading = false;
+            });
+        },
         handleRemarksChange(e) {
             const targetVal = e.target.value;
             let cnReg = /([\u4e00-\u9fa5]|[\u3000-\u303F]|[\uFF00-\uFF60])/;
@@ -788,11 +952,11 @@ export default {
         },
         // 分页操作按钮
         onShowSizeChange(current, pageSize) {
-            // this.tablePag = {
-            //     page: current,
-            //     size: pageSize
-            // };
-            // this.handleInitTable();
+            this.tablePag = {
+                page: current,
+                size: pageSize
+            };
+            this.handleInitTable();
         },
         handleEditTable() {
             this.addType = 'edit';
@@ -804,7 +968,6 @@ export default {
         },
         // 新增政策按钮
         handleAddAccountPolicy() {
-            console.log('新增政策按钮');
             this.addType = 'add';
             this.policyOperationStatus = true;
         },
@@ -823,16 +986,19 @@ export default {
         },
         // 新增政策取消按钮
         handlePolicyOperationCancel() {
-            console.log('新增政策取消按钮');
             this.policyOperationStatus = false;
         },
         // 审核拒绝确定按钮
         handleRejectSure() {
-            console.log('审核拒绝确定按钮');
             this.$refs.rejectRuleForm.validate(valid => {
                 if (valid) {
-                    console.log('submit!');
-                    this.rejectAuditStatus = false;
+                    const params = {
+                        id: this.tableOnlyId || this.queryByIdList.id,
+                        type: 3,
+                        value: this.reasonForm.desc
+                    };
+                    this.handleExamineAll(params);
+                    this.handleRejectCancel();
                 }
                 else {
                     console.log('error submit!!');
@@ -847,43 +1013,57 @@ export default {
         },
         // 查看的按钮
         handleDetail(list) {
-            console.log(list, '查看的按钮');
             this.auditPolicyStatus = true;
+            this.queryByIdList = list;
         },
         // 查看的取消按钮
         handleCloseAuditPolicy() {
             this.auditPolicyStatus = false;
         },
         // 查看-审核政策-审核通过-按钮
-        handleAuditSure() {
+        handleAuditSure(list) {
             let that = this;
             this.$confirm({
                 title: '提示',
                 content: '确认该政策审核通过',
-                onOk() {}
+                onOk() {
+                    const params = {
+                        id: list.id || that.queryByIdList.id,
+                        type: 2,
+                        value: ''
+                    };
+                    that.handleExamineAll(params);
+                }
             });
         },
         // 查看-审核政策-审核拒绝-按钮
-        handleAuditCancel() {
+        handleAuditCancel(data) {
             this.rejectAuditStatus = true;
+            this.tableOnlyId = data.id;
         },
         // 提交审核弹窗
-        handleSubmitReview(val) {
+        handleSubmitReview(list) {
             let that = this;
             this.$confirm({
                 title: '提示',
                 content: '是否确认重新提交政策审核',
-                onOk() {}
+                onOk() {
+                    const params = {
+                        id: list.id,
+                        type: 1,
+                        value: ''
+                    };
+                    that.handleExamineAll(params);
+                }
             });
         },
         // 被拒理由的操作
         handleRejectionReason(val) {
-            console.log('被拒理由的操作');
+            this.rejectionReasonList = val;
             this.rejectionReasonStatus = true;
         },
         // 被拒理由确定按钮
         handleModeSure() {
-            console.log('被拒理由确定按钮');
             this.rejectionReasonStatus = false;
         },
         // 被拒理由取消按钮
@@ -892,11 +1072,31 @@ export default {
         },
         // 搜索按钮
         handleQueryList() {
-            console.log('搜索按钮');
+            this.tablePag = {
+                page: 1,
+                size: 10
+            };
+            this.handleInitTable();
         },
         // 重置搜索
         handleResetList() {
-            console.log('重置搜索');
+            this.configForm = {
+                companyName: undefined,
+                adverName: undefined,
+                productName: undefined,
+                creativeMedia: 'no',
+                creativeRebate: 'no',
+                creativeAdvance: undefined,
+                creativeSale: undefined,
+                creativeOperate: 'no',
+                time: [],
+                searchStatus: 'no'
+            };
+            this.tablePag = {
+                page: 1,
+                size: 10
+            };
+            this.handleInitTable();
         }
     }
 };

+ 2 - 2
vue.config.js

@@ -87,8 +87,8 @@ module.exports = {
 				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
 				// target:'http://118.24.244.213:8804',
 				// target: 'http://192.168.1.43:9090', // 子安
-				// target: 'http://192.168.1.8:8806', // 学超
-				target:'http://139.186.165.84:8806', //测试
+				target: 'http://192.168.1.8:9999', // 学超
+				// target:'http://gateway.tjyourong.com.cn', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
 
 				ws: false,