Browse Source

合并 work-jyf 代码

jiayufei 3 years ago
parent
commit
074c03d935

+ 2 - 2
src/views/modules/policy-management/policy-management-server.js

@@ -6,6 +6,6 @@
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
  // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
  // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
-//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
- export const urlAcount = 'http://192.168.1.8:9999'; // 学超
+ export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+//  export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  
  

+ 11 - 0
src/views/modules/settlement-account/settlement-account-server.js

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

+ 306 - 110
src/views/modules/settlement-account/settlement-account.vue

@@ -28,45 +28,53 @@
                         label="广告主名称:"
                         label="广告主名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.creativeAdvance" placeholder="请输入广告主名称"/>
+                        <a-input v-model="configForm.advertiserName" placeholder="请输入广告主名称"/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="产品名称:"
                         label="产品名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.creativeAdvance11" placeholder="请输入产品名称"/>
+                        <a-input v-model="configForm.productName" placeholder="请输入产品名称"/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="项目名称:"
                         label="项目名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.creativeAdvance22" placeholder="请输入项目名称"/>
+                        <a-input v-model="configForm.projectName" placeholder="请输入项目名称"/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="账户名称:"
                         label="账户名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.creativeAdvance33" placeholder="请输入账户名称"/>
+                        <a-input v-model="configForm.accountName" placeholder="请输入账户名称"/>
                     </a-form-item>
                     </a-form-item>
                 </a-row>
                 </a-row>
                 <a-row>
                 <a-row>
-                    <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-form-item label="负责人:">
+                        <a-select
+                            v-model="configForm.createUserName"
+                            style="width: 100px"
+                            :filter-option="handleFilterOption"
+                            show-search
+                            allow-clear
+                        >
+                            <a-select-option
+                                v-for="item in allSaleListOption"
+                                :key="item.userId"
+                                :value="item.userName"
+                            >
+                                {{ item.userName }}
+                            </a-select-option>
                         </a-select>
                         </a-select>
                     </a-form-item>
                     </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-form-item label="媒体类型:">
+                        <a-select v-model="configForm.mediaId" style="width: 100px">
+                            <a-select-option value="no">不限</a-select-option>
+                            <a-select-option :value="1">头条</a-select-option>
+                            <a-select-option :value="2">快手</a-select-option>
                         </a-select>
                         </a-select>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
@@ -95,8 +103,15 @@
                 :dataSource="dataSource"
                 :dataSource="dataSource"
                 :pagination="false"
                 :pagination="false"
                 :scroll="{x: 1800}"
                 :scroll="{x: 1800}"
+                :loading="controlLoading"
             >
             >
-                <span slot="acountRelax" slot-scope="text, record">
+                <span slot="mediaId" slot-scope="text">
+                    <span>{{ text === 1 ? '头条' : '快手' }}</span>
+                </span>
+                <span slot="operateType" slot-scope="text">
+                    <span>{{ text === 1 ? '自运营' : '代运营' }}</span>
+                </span>
+                <span slot="status" slot-scope="text, record">
                     <a-switch :checked="text === 0" @change="handleSwitchChang($event, record)"/>
                     <a-switch :checked="text === 0" @change="handleSwitchChang($event, record)"/>
                 </span>
                 </span>
                 <span slot="action" slot-scope="text, record">
                 <span slot="action" slot-scope="text, record">
@@ -134,34 +149,66 @@
                     :label-col="labelCol"
                     :label-col="labelCol"
                     :wrapper-col="wrapperCol"
                     :wrapper-col="wrapperCol"
                 >
                 >
-                    <a-form-model-item label="选择广告主公司名称" prop="name6">
-                        <a-select v-model="policyOperationForm.name6" placeholder="请选择广告主公司名称">
-                            <a-select-option :value="1">快手</a-select-option>
-                            <a-select-option :value="2">头条</a-select-option>
+                    <a-form-model-item label="选择广告主公司名称" prop="advertiserId">
+                        <a-select
+                            v-model="policyOperationForm.advertiserId"
+                            placeholder="请选择广告主名称"
+                            :filter-option="handleFilterOption"
+                            show-search
+                            @change="handleAdverOptionChange"
+                        >
+                            <a-select-option
+                                v-for="item in allAdverListOption"
+                                :key="item.id"
+                                :value="item.id"
+                            >
+                                {{ item.name }}
+                            </a-select-option>
                         </a-select>
                         </a-select>
                     </a-form-model-item>
                     </a-form-model-item>
-                    <a-form-model-item label="选择产品名称" prop="name7">
-                        <a-select v-model="policyOperationForm.name7" placeholder="请选择产品名称">
-                            <a-select-option :value="1">快手</a-select-option>
-                            <a-select-option :value="2">头条</a-select-option>
+                    <a-form-model-item label="选择产品名称" prop="productId">
+                        <a-select
+                            v-model="policyOperationForm.productId"
+                            placeholder="请选择产品名称"
+                            :filter-option="handleFilterOption"
+                            show-search
+                            @change="handleProductOptionChange"
+                        >
+                            <a-select-option
+                                v-for="item in allProductListOption"
+                                :key="item.id"
+                                :value="item.id"
+                            >
+                                {{ item.productName }}
+                            </a-select-option>
                         </a-select>
                         </a-select>
                     </a-form-model-item>
                     </a-form-model-item>
-                    <a-form-model-item label="选择项目名称" prop="name8">
-                        <a-select v-model="policyOperationForm.name8" placeholder="请选择项目名称">
-                            <a-select-option :value="1">快手</a-select-option>
-                            <a-select-option :value="2">头条</a-select-option>
+                    <a-form-model-item label="选择项目名称" prop="projectId">
+                        <a-select
+                            v-model="policyOperationForm.projectId"
+                            placeholder="请选择产品名称"
+                            :filter-option="handleFilterOption"
+                            show-search
+                        >
+                            <a-select-option
+                                v-for="item in allProjectListOption"
+                                :key="item.id"
+                                :value="item.id"
+                            >
+                                {{ item.projectName }}
+                            </a-select-option>
                         </a-select>
                         </a-select>
                     </a-form-model-item>
                     </a-form-model-item>
                     <a-form-model-item label="选择媒体">
                     <a-form-model-item label="选择媒体">
-                        <a-radio-group v-model="policyOperationForm.name9" button-style="solid">
-                            <a-radio-button value="a">头条</a-radio-button>
-                            <a-radio-button value="b">快手</a-radio-button>
+                        <a-radio-group v-model="policyOperationForm.mediaId" button-style="solid">
+                            <a-radio-button :value="1">头条</a-radio-button>
+                            <a-radio-button :value="2">快手</a-radio-button>
                         </a-radio-group>
                         </a-radio-group>
                     </a-form-model-item>
                     </a-form-model-item>
                     <a-form-model-item label="运营方式">
                     <a-form-model-item label="运营方式">
-                        <a-radio-group v-model="policyOperationForm.name10" button-style="solid">
-                            <a-radio-button value="a">自运营</a-radio-button>
-                            <a-radio-button value="b">代运营</a-radio-button>
+                        <a-radio-group v-model="policyOperationForm.operateType" button-style="solid">
+                            <a-radio-button :value="1">自运营</a-radio-button>
+                            <a-radio-button :value="2">代运营</a-radio-button>
                         </a-radio-group>
                         </a-radio-group>
                     </a-form-model-item>
                     </a-form-model-item>
                     <a-form-model-item label="附件上传">
                     <a-form-model-item label="附件上传">
@@ -183,6 +230,9 @@
 </template>
 </template>
 <script>
 <script>
 import {mapGetters} from 'vuex';
 import {mapGetters} from 'vuex';
+import {getAction, postAction} from '@/api/manage';
+import {urlAcount} from './settlement-account-server.js';
+
 
 
 import BMF from 'browser-md5-file';
 import BMF from 'browser-md5-file';
 let COS = require('cos-js-sdk-v5');
 let COS = require('cos-js-sdk-v5');
@@ -195,55 +245,47 @@ export default {
     name: 'settlement-account',
     name: 'settlement-account',
     data() {
     data() {
         return {
         return {
+            allProjectListOption: [],
+            allAdverListOption: [],
+            allProductListOption: [],
+            controlLoading: false,
+            allSaleListOption: [],
             fileList: [],
             fileList: [],
             labelCol: {span: 7},
             labelCol: {span: 7},
             wrapperCol: {span: 14},
             wrapperCol: {span: 14},
             policyOperationForm: {
             policyOperationForm: {
-                name6: undefined,
-                name7: undefined,
-                name8: undefined,
-                name9: 'a',
-                name10: 'a',
+                advertiserId: undefined,
+                productId: undefined,
+                projectId: undefined,
+                mediaId: 1,
+                operateType: 1
             },
             },
             policyOperationRules: {
             policyOperationRules: {
-                name6: [{required: true, message: '请选择广告主公司名称', trigger: 'change'}],
-                name7: [{required: true, message: '请选择产品名称', trigger: 'change'}],
-                name8: [{required: true, message: '请选择项目名称', trigger: 'change'}],
+                advertiserId: [{required: true, message: '请选择广告主公司名称', trigger: 'change'}],
+                productId: [{required: true, message: '请选择产品名称', trigger: 'change'}],
+                projectId: [{required: true, message: '请选择项目名称', trigger: 'change'}]
             },
             },
             policyOperationStatus: false,
             policyOperationStatus: false,
-            totalAll: 100,
-            dataSource: [
-                {
-                    status: '腾讯科技有限公司', 
-                    accountId_dictText: '腾讯科技有限公司', 
-                    creativeImageMode: '产品名称', 
-                    accountId: '快手', 
-                    createTime: '何甜甜', 
-                    validBalance: '待审核', 
-                    accountBudget: '是', 
-                    adCpaBidStr: '80天',
-                    acountRelax: 0
-                }
-            ],
+            totalAll: 0,
+            dataSource: [],
             settlementColumns: [
             settlementColumns: [
                 {
                 {
                     title: '广告主主体名称',
                     title: '广告主主体名称',
                     align: 'center',
                     align: 'center',
-                    dataIndex: 'status',
-                    width: 150
+                    dataIndex: 'advertiserName',
+                    width: 240
                 },
                 },
                 {
                 {
                     title: '产品名称',
                     title: '产品名称',
                     align: 'center',
                     align: 'center',
-                    dataIndex: 'accountId_dictText',
-                    width: 150,
-                    scopedSlots: {customRender: 'accountId_dictText'}
+                    dataIndex: 'productName',
+                    width: 200
                 },
                 },
                 {
                 {
                     title: '项目名称',
                     title: '项目名称',
                     align: 'center',
                     align: 'center',
-                    dataIndex: 'creativeImageMode',
-                    width: 150
+                    dataIndex: 'projectName',
+                    width: 180
                 },
                 },
                 {
                 {
                     title: '账户ID',
                     title: '账户ID',
@@ -253,36 +295,36 @@ export default {
                 },
                 },
                 {
                 {
                     title: '账户名称',
                     title: '账户名称',
-                    dataIndex: 'createTime',
+                    dataIndex: 'accountName',
                     align: 'center',
                     align: 'center',
-                    width: 150
+                    width: 160
                 },
                 },
                 {
                 {
                     title: '媒体',
                     title: '媒体',
-                    dataIndex: 'validBalance',
+                    dataIndex: 'mediaId',
                     align: 'center',
                     align: 'center',
                     width: 150,
                     width: 150,
-                    scopedSlots: {customRender: 'validBalance'}
+                    scopedSlots: {customRender: 'mediaId'}
                 },
                 },
                 {
                 {
                     title: '负责人',
                     title: '负责人',
-                    dataIndex: 'accountBudget',
+                    dataIndex: 'createUserName',
                     width: 180,
                     width: 180,
                     align: 'center'
                     align: 'center'
                 },
                 },
                 {
                 {
                     title: '运营方式',
                     title: '运营方式',
-                    dataIndex: 'adCpaBidStr',
+                    dataIndex: 'operateType',
                     align: 'center',
                     align: 'center',
                     width: 150,
                     width: 150,
-                    scopedSlots: {customRender: 'adCpaBidStr'}
+                    scopedSlots: {customRender: 'operateType'}
                 },
                 },
                 {
                 {
                     title: '账户状态',
                     title: '账户状态',
                     align: 'center',
                     align: 'center',
-                    dataIndex: 'acountRelax',
+                    dataIndex: 'status',
                     width: 150,
                     width: 150,
-                    scopedSlots: {customRender: 'acountRelax'}
+                    scopedSlots: {customRender: 'status'}
                 },
                 },
                 {
                 {
                     title: '操作',
                     title: '操作',
@@ -294,12 +336,12 @@ export default {
                 },
                 },
             ],
             ],
             configForm: {
             configForm: {
-                creativeAdvance: '',
-                creativeAdvance11: '',
-                creativeAdvance22: '',
-                creativeAdvance33: '',
+                advertiserName: '',
+                productName: '',
+                projectName: '',
+                accountName: '',
                 creativeSale: 2,
                 creativeSale: 2,
-                creativeMedia: 2,
+                mediaId: 'no',
                 time: []
                 time: []
             },
             },
             tablePag: {
             tablePag: {
@@ -311,8 +353,117 @@ export default {
     created() {
     created() {
         this.searchForm = this.$form.createForm(this);
         this.searchForm = this.$form.createForm(this);
     },
     },
+    mounted() {
+        this.handleInitTable();
+        this.handleGetAllSaleList();
+        this.handleGetAllAdverList();
+    },
     methods: {
     methods: {
         ...mapGetters(['userInfo']),
         ...mapGetters(['userInfo']),
+        handleProductOptionChange(e) {
+            const paramsData = {
+                pageNo: 1,
+                pageSize: 1000,
+                advertiserId: this.policyOperationForm.advertiserId,
+                productId: e
+            };
+            getAction('/ctop/project/list', paramsData).then(result => {
+                if (result.success) {
+                    this.allProjectListOption = result.result.records || [];
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
+        handleAdverOptionChange(e) {
+            const paramsData = {
+                pageNo: 1,
+                pageSize: 1000,
+                advertiserId: e
+            };
+            getAction('/ctop/product/list', paramsData).then(result => {
+                if (result.success) {
+                    this.allProductListOption = result.result.records || [];
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
+        handleFilterOption(input, option) {
+            return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+        },
+        // 获取所有的广告主列表
+        handleGetAllAdverList() {
+            const paramsData = {
+                pageNo: 1,
+                pageSize: 1000
+            };
+            getAction('/ctop/advertiser/list', paramsData).then(result => {
+                if (result.success) {
+                    this.allAdverListOption = result.result.records || [];
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
+        },
+        // 获取所有的媒体 枚举值
+        handleGetAllSaleList() {
+            const paramsData = {
+                userId: this.userInfo().id
+            };
+            getAction(urlAcount + '/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 = {
+                createUserId: this.userInfo().id,
+                advertiserName: this.configForm.adverName,
+                productName: this.configForm.productName,
+                projectName: this.configForm.projectName,
+                accountName: this.configForm.accountName,
+                createUserName: this.configForm.createUserName,
+                mediaId: this.configForm.mediaId === 'no' ? '' : this.configForm.mediaId,
+                startTime: this.configForm.time[0],
+                endTime: this.configForm.time[1],
+                pageNo: this.tablePag.page,
+                pageSize: this.tablePag.size
+            };
+            getAction(urlAcount + '/finance/settLementController/getSettlementList', paramsData).then(result => {
+                if (result.code === 0) {
+                    let defaultList = result.result.list;
+                    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;
+            });
+        },
         // 文件格式下载
         // 文件格式下载
         handleFileDownTitle() {
         handleFileDownTitle() {
             console.log('文件格式下载');
             console.log('文件格式下载');
@@ -325,24 +476,25 @@ export default {
             let that = this;
             let that = this;
             return new Promise(function (resolve, reject) {
             return new Promise(function (resolve, reject) {
                 bmf.md5(file, (err, md5) => {
                 bmf.md5(file, (err, md5) => {
-                    getAction('kuaishouPopulationPackage/checkPopulationPackage', {signature: md5}).then(result => {
-                        if (result.code === 200) {
-                            that.personNameDisabled = false;
-                            that.personResourceDisabled = false;
-                            resolve();
-                        }
-                        else if (result.code === 201) {
-                            that.$message.error(result.message);
-                            that.personForm.name = result.result.orientationName;
-                            that.personForm.resource = result.result.type;
-                            that.personNameDisabled = true;
-                            that.personResourceDisabled = true;
-                            reject();
-                        }
-                    }).catch(error => {
-                        console.log(error, 'eeee');
-                        reject();
-                    });
+                    console.log(md5, 'md5');
+                    // getAction('kuaishouPopulationPackage/checkPopulationPackage', {signature: md5}).then(result => {
+                    //     if (result.code === 200) {
+                    //         that.personNameDisabled = false;
+                    //         that.personResourceDisabled = false;
+                    //         resolve();
+                    //     }
+                    //     else if (result.code === 201) {
+                    //         that.$message.error(result.message);
+                    //         that.personForm.name = result.result.orientationName;
+                    //         that.personForm.resource = result.result.type;
+                    //         that.personNameDisabled = true;
+                    //         that.personResourceDisabled = true;
+                    //         reject();
+                    //     }
+                    // }).catch(error => {
+                    //     console.log(error, 'eeee');
+                    //     reject();
+                    // });
                 });
                 });
             });
             });
         },
         },
@@ -393,20 +545,21 @@ export default {
                         status: 'done',
                         status: 'done',
                         url: '//' + data.Location
                         url: '//' + data.Location
                     });
                     });
+                    console.log(data.Location, 'data.Location');
                     if (that.fileList.length > 1) {
                     if (that.fileList.length > 1) {
                         that.fileList = that.fileList.slice(-1);
                         that.fileList = that.fileList.slice(-1);
                     }
                     }
                     const isZip = file.type.includes('xlxs');
                     const isZip = file.type.includes('xlxs');
                     const fileOvesize = file.size > (1024 * 1024 * 1024);
                     const fileOvesize = file.size > (1024 * 1024 * 1024);
-                    if (!isZip) {
-                        that.$message.error('只能上传xlxs格式的文件');
-                        return;
-                    }
-                    if (fileOvesize) {
-                        that.$message.error('文件大小不能超过1G');
-                        return;
-                    }
-                    // that.handleMd5(file);
+                    // if (!isZip) {
+                    //     that.$message.error('只能上传xlxs格式的文件');
+                    //     return;
+                    // }
+                    // if (fileOvesize) {
+                    //     that.$message.error('文件大小不能超过1G');
+                    //     return;
+                    // }
+                    that.handleMd5(file);
                 }
                 }
             );
             );
         },
         },
@@ -421,12 +574,23 @@ export default {
         },
         },
         // 删除操作
         // 删除操作
         handleSettleDel(list) {
         handleSettleDel(list) {
-            console.log(list, '删除操作');
             let that = this;
             let that = this;
             this.$confirm({
             this.$confirm({
                 title: '提示',
                 title: '提示',
                 content: '确认删除该条数据',
                 content: '确认删除该条数据',
-                onOk() {}
+                onOk() {
+                    getAction(urlAcount + '/finance/settLementController/deleteSettlementById', {id: list.id}).then(result => {
+                        if (result.code === 0) {
+                            that.handleInitTable();
+                            that.$message.success('删除成功');
+                        }
+                        else {
+                            that.$message.error(result.message);
+                        }
+                    }).catch(error => {
+                        console.log(error, 'eeee');
+                    });
+                }
             });
             });
         },
         },
         // 分页操作按钮
         // 分页操作按钮
@@ -435,11 +599,25 @@ export default {
                 page: current,
                 page: current,
                 size: pageSize
                 size: pageSize
             };
             };
-            // this.handleInitTable();
+            this.handleInitTable();
         },
         },
         // table 开关 操作按钮
         // table 开关 操作按钮
         handleSwitchChang(checked, data) {
         handleSwitchChang(checked, data) {
-            console.log(checked, data, '------');
+            const paramsData = {
+                id: data.id,
+                status: checked ? 0 : 1
+            };
+            getAction(urlAcount + '/finance/settLementController/updSettlementStatusById', paramsData).then(result => {
+                if (result.code === 0) {
+                    this.$message.success(result.message);
+                    this.handleInitTable();
+                }
+                else {
+                    this.$message.error(result.message);
+                }
+            }).catch(error => {
+                console.log(error, 'eeee');
+            });
         },
         },
         // 账户上传按钮
         // 账户上传按钮
         handleUploadAccount() {
         handleUploadAccount() {
@@ -449,10 +627,28 @@ export default {
         // 查询的按钮
         // 查询的按钮
         handleQueryList() {
         handleQueryList() {
             console.log(this.configForm, '搜索的按钮');
             console.log(this.configForm, '搜索的按钮');
+            this.tablePag = {
+                page: 1,
+                size: 10
+            };
+            this.handleInitTable();
         },
         },
         // 重置的按钮
         // 重置的按钮
         handleResetList() {
         handleResetList() {
-            console.log(this.configForm, '重置的按钮');
+            this.configForm = {
+                advertiserName: '',
+                productName: '',
+                projectName: '',
+                accountName: '',
+                creativeSale: 2,
+                mediaId: 'no',
+                time: []
+            };
+            this.tablePag = {
+                page: 1,
+                size: 10
+            };
+            this.handleInitTable();
         }
         }
     }
     }
 };
 };

+ 1 - 1
src/views/modules/settlement-information/settlement-information-server.js

@@ -5,7 +5,7 @@
 
 
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
- export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+ export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  
  

+ 1 - 1
vue.config.js

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