Parcourir la source

预警-监测链接预警;报表-新的账户视频报表

朱鑫波 il y a 3 ans
Parent
commit
c108252994

+ 4 - 1
.env.development

@@ -2,4 +2,7 @@
 VUE_APP_BASE_API_URL = http://118.24.244.213:3030
 
 #账户报表/素材报表接口地址
-VUE_APP_BASE_REPORT_URL = http://192.168.1.67:9999/reportModule
+VUE_APP_BASE_REPORT_URL = http://api.tjyourong.com.cn/reportModule
+# 测试地址 http://gateway.tjyourong.com.cn
+# 线上地址 http://api.tjyourong.com.cn
+# 宋英豪 http://192.168.1.67:9999

+ 40 - 3
src/components/formComponents/selectAccount.vue

@@ -19,6 +19,7 @@
             :value-consists-of="valueConsistsOf"
             :auto-load-root-options="false"
             @select="update"
+            @deselect="unUpdate"
             @input="emitValue"
             :limit="limit"
             :default-options="true"
@@ -45,7 +46,8 @@ export default {
     data: () => ({
         valueConsistsOf: 'LEAF_PRIORITY',
         options: [],
-        showLoading: 'loading...'
+        showLoading: 'loading...',
+        selectRightData: []
     }),
     props: {
         value: {
@@ -109,7 +111,7 @@ export default {
                 this.$nextTick(() => {
                     this.$emit('input', val)
                     this.$emit('change', val)
-                    this.$emit('value');
+                    this.$emit('value')
                 })
             }
         }
@@ -118,7 +120,38 @@ export default {
     methods: {
         ...mapGetters(['userInfo']),
         update(node, id) {
-            this.$emit('select-value', node)
+            if (node.id == 'all') {
+                this.node(this.options)
+                this.$nextTick(() => {
+                    this.selectedVal = this.selectRightData.map(item => {
+                        return item.id
+                    })
+                })
+            }
+        },
+        unUpdate(node, id) {
+            if (node.id == 'all') {
+                this.$nextTick(() => {
+                    this.selectedVal = []
+                    this.selectRightData = []
+                })
+            } else {
+                let index = this.selectedVal.findIndex(item => item == 'all')
+                this.$nextTick(() => {
+                    this.selectedVal.splice(index, 1)
+                })
+            }
+        },
+        node(data) {
+            data.forEach(item => {
+                if (item.children) {
+                    this.node(item.children)
+                } else {
+                    if (this.selectRightData.findIndex(i => i.id == item.id) == -1) {
+                        this.selectRightData.push(item)
+                    }
+                }
+            })
         },
         emitValue() {},
         loadOptions({ action, parentNode, callback }) {
@@ -183,6 +216,10 @@ export default {
                                       : []
                               }
                           })
+                    if (this.multiple) {
+                        this.options.unshift({ id: 'all', label: '全选' })
+                    }
+
                     if (this.oneData) {
                         this.$nextTick(() => {
                             if (this.multiple) {

+ 54 - 13
src/views/modules/Statistics/kuaishouReport/accountReport.vue

@@ -10,10 +10,10 @@
             <div class="table-page-search-wrapper">
                 <a-form layout="inline" :form="form" hide-required-mark :selfUpdate="true" @submit="handleQueryList">
                     <a-row :gutter="24">
-                        <a-col :md="12" :sm="12" :xxl="12">
+                        <a-col :md="16" :sm="16" :xxl="16">
                             <a-form-item label="账户名称">
                                 <selectTreeAccount
-                                    v-decorator="['accountIds']"
+                                    v-decorator="['accountIds', { initialValue: [] }]"
                                     multiple
                                     style="width:100%"
                                     :reqUrl="reqUrl"
@@ -212,7 +212,13 @@
                 <span slot="statDate" slot-scope="text, records">
                     {{
                         text
-                            ? ('' + text).substr(0, 4) + '-' + ('' + text).substr(4, 2) + '-' + ('' + text).substr(6, 2)
+                            ? text == '总计'
+                                ? text
+                                : ('' + text).substr(0, 4) +
+                                  '-' +
+                                  ('' + text).substr(4, 2) +
+                                  '-' +
+                                  ('' + text).substr(6, 2)
                             : '-'
                     }}
                 </span>
@@ -260,12 +266,14 @@
                 <span slot="playOverRate" slot-scope="playOverRate">{{ playOverRate | toPercentage }}</span>
                 <!-- 新加数据 -->
 
+                <span slot="clickRate" slot-scope="clickRate">{{ clickRate | toPercentage }}</span>
+                <span slot="bClickRate" slot-scope="bClickRate">{{ bClickRate | toPercentage }}</span>
+
                 <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
                 <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
                 <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
                 <span slot="cpc" slot-scope="cpc">{{ cpc | decimalsHandle }}</span>
                 <span slot="cpm" slot-scope="cpm">{{ cpm | decimalsHandle }}</span>
-                <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
                 <span slot="installFinishRate" slot-scope="installFinishRate">{{
                     installFinishRate | toPercentage
                 }}</span>
@@ -304,6 +312,12 @@
                     gameAddictionRate | toPercentage
                 }}</span>
                 <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                <span slot="eventCreditGrantAppRate" slot-scope="eventCreditGrantAppRate">{{
+                    eventCreditGrantAppRate | toPercentage
+                }}</span>
+                <span slot="play3sRate" slot-scope="play3sRate">{{ play3sRate | toPercentage }}</span>
+                <span slot="formCountRate" slot-scope="formCountRate">{{ formCountRate | toPercentage }}</span>
+
                 <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
             </a-table>
         </div>
@@ -665,7 +679,7 @@ export default {
             this.handleGetTableList({})
         },
         handleGetTableList(data) {
-            if (data.accountIds) {
+            if (data.accountIds && data.accountIds.length > 0) {
                 const paramsData = {
                     ...data,
                     startDate: this.dateValue.length === 2 ? moment(this.dateValue[0]).format('YYYY-MM-DD') : null,
@@ -680,13 +694,38 @@ export default {
                 this.tableData = []
                 this.dataLoading = true
                 postAction(this.accountListUrl, paramsData)
-                    .then(result => {
+                    .then(res => {
                         this.dataLoading = false
-                        if (result.success) {
-                            this.tableData = result.result
+                        if (res.success) {
+                            this.tableData = res.result
                             // this.ipagination.total = result.result.total || 0
+                            if (this.dateValue[0].format('YYYY-MM-DD') == this.dateValue[1].format('YYYY-MM-DD')) {
+                                for (let i = res.result.length - 1; i > res.result.length - 4; i--) {
+                                    res.result[i].authName = '-'
+                                    res.result[i].accountId = '-'
+                                    res.result[i].statDate = '总计'
+                                }
+                                for (let key in res.result[res.result.length - 1]) {
+                                    if (res.result[res.result.length - 1][key] < 1) {
+                                        res.result[res.result.length - 1][key] =
+                                            (res.result[res.result.length - 1][key] * 100).toFixed(2) + '%'
+                                    }
+                                }
+
+                                res.result[res.result.length - 1].statDate = '环比'
+                                res.result[res.result.length - 2].statDate = '昨日总计(相对)'
+
+                                this.tableData = res.result
+                                length = this.tableData.length - 3
+                            } else {
+                                res.result[res.result.length - 1].statDate = '总计'
+                                res.result[res.result.length - 1].authName = '-'
+                                res.result[res.result.length - 1].accountId = '-'
+                                this.tableData = res.result
+                                length = this.tableData.length - 1
+                            }
                         } else {
-                            this.$message.error(result.message)
+                            this.$message.error(res.message)
                         }
                     })
                     .catch(error => {
@@ -800,6 +839,8 @@ export default {
                         this.callback(this.tabKey)
                     }
                 })
+            } else {
+                this.$message.error('请选择账户')
             }
         },
         treeSearch() {
@@ -1339,7 +1380,7 @@ export default {
                         for (let i = res.result.length - 1; i > res.result.length - 4; i--) {
                             res.result[i].authName = '-'
                             res.result[i].accountId = '-'
-                            res.result[i].date = '总计'
+                            res.result[i].statDate = '总计'
                         }
                         for (let key in res.result[res.result.length - 1]) {
                             if (res.result[res.result.length - 1][key] < 1) {
@@ -1348,13 +1389,13 @@ export default {
                             }
                         }
 
-                        res.result[res.result.length - 1].date = '环比'
-                        res.result[res.result.length - 2].date = '昨日总计(相对)'
+                        res.result[res.result.length - 1].statDate = '环比'
+                        res.result[res.result.length - 2].statDate = '昨日总计(相对)'
 
                         this.tableData = res.result
                         length = this.tableData.length - 3
                     } else {
-                        res.result[res.result.length - 1].date = '总计'
+                        res.result[res.result.length - 1].statDate = '总计'
                         res.result[res.result.length - 1].authName = '-'
                         res.result[res.result.length - 1].accountId = '-'
                         this.tableData = res.result

+ 40 - 20
src/views/modules/Statistics/kuaishouReport/videoReport.vue

@@ -8,13 +8,12 @@
     <div class="video-report">
         <div class="directional-content">
             <div class="table-page-search-wrapper">
-              
                 <a-form layout="inline" :form="form" hide-required-mark :selfUpdate="true" @submit="handleQueryList">
                     <a-row :gutter="24">
-                        <a-col :md="12" :sm="12" :xxl="12">
+                        <a-col :md="16" :sm="16" :xxl="16">
                             <a-form-item label="账户名称">
                                 <selectTreeAccount
-                                    v-decorator="['accountIds']"
+                                    v-decorator="['accountIds', { initialValue: [] }]"
                                     multiple
                                     style="display: inline-block;position: relative;margin-left: 0px;width:100%;margin-bottom:15px"
                                     :limit="1"
@@ -27,7 +26,7 @@
                                         'dateValue',
                                         { initialValue: [moment().subtract(7, 'days'), moment().subtract(1, 'days')] }
                                     ]" -->
-                        <a-col :md="8" :sm="8" :xxl="6">
+                        <a-col :md="6" :sm="6" :xxl="6">
                             <a-form-item label="时间选择">
                                 <a-range-picker
                                     v-model="dateValue"
@@ -37,7 +36,7 @@
                             </a-form-item>
                         </a-col>
 
-                        <a-col :md="8" :sm="8" :xxl="6">
+                        <a-col :md="6" :sm="6" :xxl="6">
                             <a-form-item label="设计负责人">
                                 <a-select
                                     v-decorator="['leaderId']"
@@ -51,7 +50,7 @@
                                 </a-select>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="8" :sm="8" :xxl="6">
+                        <a-col :md="6" :sm="6" :xxl="6">
                             <a-form-item label="剪辑">
                                 <a-select v-decorator="['clipId']" allowClear show-search :filter-option="filterOption">
                                     <a-select-option v-for="item in designList" :key="item.userId" :value="item.userId">
@@ -60,7 +59,7 @@
                                 </a-select>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="8" :sm="8" :xxl="6">
+                        <a-col :md="6" :sm="6" :xxl="6">
                             <a-form-item label="拍摄">
                                 <a-select v-decorator="['shotId']" allowClear show-search :filter-option="filterOption">
                                     <a-select-option v-for="item in designList" :key="item.userId" :value="item.userId">
@@ -69,7 +68,7 @@
                                 </a-select>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="8" :sm="8" :xxl="6">
+                        <a-col :md="6" :sm="6" :xxl="6">
                             <a-form-item label="编导">
                                 <a-select v-decorator="['planId']" allowClear show-search :filter-option="filterOption">
                                     <a-select-option v-for="item in designList" :key="item.userId" :value="item.userId">
@@ -78,7 +77,7 @@
                                 </a-select>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="8" :sm="8" :xxl="6">
+                        <a-col :md="6" :sm="6" :xxl="6">
                             <a-form-item label="素材渠道">
                                 <a-select v-decorator="['channelType']" allowClear>
                                     <a-select-option :value="0">内部</a-select-option>
@@ -87,7 +86,7 @@
                             </a-form-item>
                         </a-col>
 
-                        <a-col :md="8" :sm="8" :xxl="12" style="display: flex;justify-content: flex-end;">
+                        <a-col :md="12" :sm="12" :xxl="12" style="display: flex;justify-content: flex-end;">
                             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
                                 <a-button type="primary" icon="search" @click="handleQueryList">查询</a-button>
                                 <!-- <a-button type="primary" @click="handleResetForm" icon="reload" class="middle-button"
@@ -186,10 +185,10 @@
                 <span slot="formCountCost" slot-scope="formCountCost">{{ formCountCost | decimalsHandle }}</span>
                 <span slot="aClick" slot-scope="aClick">{{ aClick | formatCurrency }}</span>
                 <span slot="photoShow" slot-scope="photoShow">{{ photoShow | formatCurrency }}</span>
-                <span slot="photoClick" slot-scope="photoClick">{{ photoClick | formatCurrency }}</span>
                 <span slot="bClick" slot-scope="bClick">{{ bClick | formatCurrency }}</span>
                 <span slot="active" slot-scope="active">{{ active | formatCurrency }}</span>
                 <span slot="submit" slot-scope="submit">{{ submit | formatCurrency }}</span>
+                <span slot="nextDayOpen" slot-scope="nextDayOpen">{{ nextDayOpen | formatCurrency }}</span>
                 <span slot="eventCreditGrantLandingPage" slot-scope="eventCreditGrantLandingPage">{{
                     eventCreditGrantLandingPage | formatCurrency
                 }}</span>
@@ -205,13 +204,16 @@
                     play25FeedBreakRate | toPercentage
                 }}</span>
                 <span slot="playOverRate" slot-scope="playOverRate">{{ playOverRate | toPercentage }}</span>
+                <!-- 新加数据 -->
+
+                <span slot="clickRate" slot-scope="clickRate">{{ clickRate | toPercentage }}</span>
+                <span slot="bClickRate" slot-scope="bClickRate">{{ bClickRate | toPercentage }}</span>
 
                 <span slot="convertRate" slot-scope="convertRate">{{ convertRate | toPercentage }}</span>
                 <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
                 <span slot="ctr" slot-scope="ctr">{{ ctr | toPercentage }}</span>
                 <span slot="cpc" slot-scope="cpc">{{ cpc | decimalsHandle }}</span>
                 <span slot="cpm" slot-scope="cpm">{{ cpm | decimalsHandle }}</span>
-                <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
                 <span slot="installFinishRate" slot-scope="installFinishRate">{{
                     installFinishRate | toPercentage
                 }}</span>
@@ -220,6 +222,7 @@
                 <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
                 <span slot="validPlayCost" slot-scope="validPlayCost">{{ validPlayCost | decimalsHandle }}</span>
                 <span slot="activeCost" slot-scope="activeCost">{{ activeCost | decimalsHandle }}</span>
+                <span slot="nextDayOpenCost" slot-scope="nextDayOpenCost">{{ nextDayOpenCost | decimalsHandle }}</span>
                 <span slot="gameAddictionCost" slot-scope="gameAddictionCost">{{
                     gameAddictionCost | decimalsHandle
                 }}</span>
@@ -233,13 +236,29 @@
                     installFinishCost | decimalsHandle
                 }}</span>
                 <span slot="convertCost" slot-scope="convertCost">{{ convertCost | decimalsHandle }}</span>
-                <span slot="activeRegisterCost" slot-scope="activeRegisterCost">{{
-                    activeRegisterCost | decimalsHandle
-                }}</span>
 
+                <!--  -->
                 <span slot="downloadStartRate" slot-scope="downloadStartRate">{{
                     downloadStartRate | toPercentage
                 }}</span>
+                <span slot="downloadFinishRate" slot-scope="downloadFinishRate">{{
+                    downloadFinishRate | toPercentage
+                }}</span>
+                <span slot="activeRate" slot-scope="activeRate">{{ activeRate | toPercentage }}</span>
+                <span slot="activeRegisterRate" slot-scope="activeRegisterRate">{{
+                    activeRegisterRate | toPercentage
+                }}</span>
+                <span slot="gameAddictionRate" slot-scope="gameAddictionRate">{{
+                    gameAddictionRate | toPercentage
+                }}</span>
+                <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span>
+                <span slot="eventCreditGrantAppRate" slot-scope="eventCreditGrantAppRate">{{
+                    eventCreditGrantAppRate | toPercentage
+                }}</span>
+                <span slot="play3sRate" slot-scope="play3sRate">{{ play3sRate | toPercentage }}</span>
+                <span slot="formCountRate" slot-scope="formCountRate">{{ formCountRate | toPercentage }}</span>
+
+                <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
                 <!-- <span
                   slot="downloadFinishRate"
                   slot-scope="downloadFinishRate"
@@ -336,6 +355,7 @@ const columnsFixd = [
     {
         title: '渠道',
         dataIndex: 'channel',
+        scopedSlots: { customRender: 'channel' },
         align: 'center',
         width: 150,
         fixed: 'left'
@@ -615,7 +635,7 @@ export default {
             this.handleGetTableList({})
         },
         handleGetTableList(data) {
-            if (data.accountIds) {
+            if (data.accountIds && data.accountIds.length > 0) {
                 this.loading = true
                 const params = {
                     ...data,
@@ -646,6 +666,8 @@ export default {
                         this.loading = false
                     }
                 })
+            } else {
+                this.$message.error('请选择账户')
             }
         },
         filterOption(input, option) {
@@ -653,7 +675,7 @@ export default {
         },
         //点击查看明细按钮的事件
         opendetail(text, record) {
-            console.log(text, record)
+            // console.log(text, record)
             this.visibleDetail = true
             this.detailData = []
             this.detailLoading = true
@@ -665,7 +687,7 @@ export default {
                 signature: record.signature,
                 accountIds: this.appId
             }).then(res => {
-                console.log(res)
+                // console.log(res)
                 this.detailLoading = false
                 if (res.success) {
                     let result = res.result
@@ -973,9 +995,7 @@ export default {
         postAction('/toutiao/videoReportDaily/getColumnJson', {
             columnType: 4
         }).then(res => {
-            console.log(res, 'activated--activated')
             if (res.success) {
-                console.log(JSON.parse(res.result), '-------')
                 if (res.result) {
                     let columns = JSON.parse(res.result)
                     if (columns.length) {

+ 2 - 2
src/views/modules/earlyWarningRules/configurationList.vue

@@ -338,8 +338,8 @@ export default {
         handleGetTableList() {
             this.loading = true
             const params = {
-                pageSize: this.ipaginationWhite.pageSize,
-                pageNo: this.ipaginationWhite.current,
+                pageSize: this.ipagination.pageSize,
+                pageNo: this.ipagination.current,
                 userId: this.userInfo().id,
                 accountId: this.searchAccountId
             }

+ 22 - 3
src/views/modules/earlyWarningRules/whitelist.vue

@@ -41,13 +41,23 @@
                 </a>
             </a-table>
         </div>
-        <a-modal v-model="whiteVisible" title="添加白名单" @ok="whiteListOk" :footer="null" width="50%">
+        <a-modal
+            v-model="whiteVisible"
+            title="添加白名单"
+            @ok="whiteListOk"
+            @cancel="
+                whiteVisible = false
+                projectName = ''
+            "
+            :footer="null"
+            width="50%"
+        >
             <div class="tableTop" style="margin-bottom:10px;width:300px">
                 <a-input-search
                     placeholder="请输入项目名称"
                     v-model="projectName"
                     enter-button
-                    @search="getWhiteList"
+                    @search="getWhiteListSearch"
                 />
             </div>
             <a-table
@@ -175,7 +185,11 @@ export default {
         ...mapGetters(['userInfo']),
         handleGetTableList() {
             this.loading = true
-            getAction(this.whiteListRul).then(res => {
+            const params = {
+                pageSize: this.ipagination.pageSize,
+                pageNo: this.ipagination.current
+            }
+            getAction(this.whiteListRul, params).then(res => {
                 this.loading = false
                 if (res.success) {
                     // let result = res.result
@@ -211,6 +225,11 @@ export default {
         },
         addWhite() {
             this.whiteVisible = true
+            this.ipaginationWhite.current = 1
+            this.getWhiteList()
+        },
+        getWhiteListSearch() {
+            this.ipaginationWhite.current = 1
             this.getWhiteList()
         },
         getWhiteList() {

+ 2 - 1
src/views/modules/material/accountCheckBytedance.vue

@@ -289,12 +289,13 @@ export default {
         resolve(data)
       }
     },
-    getParticipateList(productId) {
+    getParticipateList(productId) {d:
       //我参与的
       //   toutiaoParticipateList
       this.showEdit = true
       getAction('/ctop/userAllocation/getUserIdListByProductId', {
         productId: productId,
+        userId: this.userInfo().id
       }).then((res) => {
         if (res.code == 0) {
           console.log(res)

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

@@ -235,9 +235,9 @@
             .isActive {
                 padding-left: 139px;
             }
-            /deep/ .ant-col-14 {
-                width: 100%;
-            }
+            // /deep/ .ant-col-14 {
+            //     width: 100%;
+            // }
         }
     }
 }

+ 21 - 2
src/views/modules/policy-management/policy-management.vue

@@ -188,15 +188,16 @@
                     <span>{{ text ? text : '-' }}</span>
                 </span>
                 <span slot="action" slot-scope="text, record">
-                    <a v-if="record.updateOperation.includes('查看')" @click="handleDetail(record)">查看</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.updateOperation.includes('编辑')" @click="handleEditTable(record)">编辑</a>
+                    <!-- 
                     <a-divider v-if="record.updateOperation.includes('审核通过')" 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>
+                    <a v-if="record.updateOperation.includes('审核拒绝')" @click="handleAuditCancel(record)">审核拒绝</a> -->
                 </span>
                 <span slot="reason" slot-scope="text, record">
                     <a @click="handleRejectionReason(record)" :disabled="record.approvedStatus !== 4">被拒原因</a>
@@ -448,6 +449,8 @@
                             >
                                 <a-select-option :value="1">头条</a-select-option>
                                 <a-select-option :value="2">快手</a-select-option>
+                                <a-select-option :value="3">千川</a-select-option>
+                                <a-select-option :value="4">UD</a-select-option>
                             </a-select>
                         </a-form-model-item>
                         <a-form-model-item label="销售" prop="createUserId">
@@ -549,6 +552,7 @@
                                 <a-select-option :value="0">返现</a-select-option>
                                 <a-select-option :value="1">返货</a-select-option>
                                 <a-select-option :value="2">返现+返货</a-select-option>
+                                <a-select-option :value="3">服务费</a-select-option>
                             </a-select>
                         </a-form-model-item>
                         <a-form-model-item label="返点比例" prop="rebateRate">
@@ -647,6 +651,14 @@ export default {
                 {
                     id: 2,
                     name: '快手'
+                },
+                {
+                    id: 3,
+                    name: '千川'
+                },
+                {
+                    id: 4,
+                    name: 'UD'
                 }
             ],
             creativeRebateOptions: [
@@ -665,6 +677,10 @@ export default {
                 {
                     id: 2,
                     name: '返现+返货'
+                },
+                {
+                    id: 3,
+                    name: '服务费'
                 }
             ],
             searchStatusOptions: [
@@ -1021,7 +1037,9 @@ export default {
             };
             getAction(urlAcount + '/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('|');
@@ -1031,6 +1049,7 @@ export default {
                     });
                     this.dataSource = defaultList;
                     this.totalAll = result.result.total;
+                    
                 }
                 else {
                     this.dataSource = [];

+ 2 - 2
vue.config.js

@@ -97,7 +97,7 @@ module.exports = {
       '/jeecg-boot': {
         // target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.1.3:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        target: 'http://192.168.1.3:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.1.3:7001', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.62:7001', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.6.162:9806', //请求本地 需要jeecg-boot后台项目  祚云
@@ -108,7 +108,7 @@ module.exports = {
         // target: 'http://192.168.1.219:7701', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
-        // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+        target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目