Browse Source

work-jyf 结算单

jiayufei 3 years ago
parent
commit
d44d35aac2

File diff suppressed because it is too large
+ 871 - 888
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue


+ 2 - 2
src/views/modules/settlement-account/settlement-account-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:9999'; // 子安
-//  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'; // 学超
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  
  

+ 22 - 2
src/views/modules/settlement-account/settlement-account.vue

@@ -108,6 +108,14 @@
                 :scroll="{x: 1800}"
                 :scroll="{x: 1800}"
                 :loading="controlLoading"
                 :loading="controlLoading"
             >
             >
+                <span slot="advertiserName" slot-scope="text">
+                    <a-tooltip placement="top">
+                        <template slot="title">
+                            <span>{{ text }}</span>
+                        </template>
+                        <span>{{ text }}</span>
+                    </a-tooltip>
+                </span>
                 <span slot="productName" slot-scope="text">
                 <span slot="productName" slot-scope="text">
                     <a-tooltip placement="top">
                     <a-tooltip placement="top">
                         <template slot="title">
                         <template slot="title">
@@ -116,6 +124,14 @@
                         <span>{{ text }}</span>
                         <span>{{ text }}</span>
                     </a-tooltip>
                     </a-tooltip>
                 </span>
                 </span>
+                <span slot="accountName" slot-scope="text">
+                    <a-tooltip placement="top">
+                        <template slot="title">
+                            <span>{{ text }}</span>
+                        </template>
+                        <span>{{ text }}</span>
+                    </a-tooltip>
+                </span>
                 <span slot="mediaId" slot-scope="text">
                 <span slot="mediaId" slot-scope="text">
                     <span>{{ text === 1 ? '头条' : '快手' }}</span>
                     <span>{{ text === 1 ? '头条' : '快手' }}</span>
                 </span>
                 </span>
@@ -280,7 +296,9 @@ export default {
                     title: '广告主主体名称',
                     title: '广告主主体名称',
                     align: 'center',
                     align: 'center',
                     dataIndex: 'advertiserName',
                     dataIndex: 'advertiserName',
-                    width: 240
+                    width: 240,
+                    ellipsis: true,
+                    scopedSlots: {customRender: 'advertiserName'}
                 },
                 },
                 {
                 {
                     title: '产品名称',
                     title: '产品名称',
@@ -306,7 +324,9 @@ export default {
                     title: '账户名称',
                     title: '账户名称',
                     dataIndex: 'accountName',
                     dataIndex: 'accountName',
                     align: 'center',
                     align: 'center',
-                    width: 160
+                    width: 160,
+                    ellipsis: true,
+                    scopedSlots: {customRender: 'accountName'}
                 },
                 },
                 {
                 {
                     title: '媒体',
                     title: '媒体',

+ 2 - 2
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:9999'; // 子安
-//  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'; // 学超
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  
  

+ 40 - 6
src/views/modules/settlement-information/settlement-information.vue

@@ -14,7 +14,6 @@
                 </span>
                 </span>
             </div>
             </div>
             <div>
             <div>
-                <!-- v-if="userInfo().roleName !== '财务'" -->
                 <span v-if="profitBtnStatus" class="add-acount-policy-btn">
                 <span v-if="profitBtnStatus" class="add-acount-policy-btn">
                     <a-button @click="handleDownloadProfit">下载利润表</a-button>
                     <a-button @click="handleDownloadProfit">下载利润表</a-button>
                 </span>
                 </span>
@@ -110,11 +109,36 @@
                 :columns="settlementColumns"
                 :columns="settlementColumns"
                 :dataSource="dataSource"
                 :dataSource="dataSource"
                 :pagination="false"
                 :pagination="false"
+                :scroll="{x: 1600}"
                 :loading="controlLoading"
                 :loading="controlLoading"
             >
             >
                 <span slot="mediaId" slot-scope="text">
                 <span slot="mediaId" slot-scope="text">
                     <span>{{ text === 1 ? '头条' : '快手' }}</span>
                     <span>{{ text === 1 ? '头条' : '快手' }}</span>
                 </span>
                 </span>
+                <span slot="advertiserName" slot-scope="text">
+                    <a-tooltip placement="top">
+                        <template slot="title">
+                            <span>{{ text }}</span>
+                        </template>
+                        <span>{{ text }}</span>
+                    </a-tooltip>
+                </span>
+                <span slot="productName" slot-scope="text">
+                    <a-tooltip placement="top">
+                        <template slot="title">
+                            <span>{{ text }}</span>
+                        </template>
+                        <span>{{ text }}</span>
+                    </a-tooltip>
+                </span>
+                <span slot="accountName" slot-scope="text">
+                    <a-tooltip placement="top">
+                        <template slot="title">
+                            <span>{{ text }}</span>
+                        </template>
+                        <span>{{ text }}</span>
+                    </a-tooltip>
+                </span>
                 <span slot="actions" slot-scope="text, record">
                 <span slot="actions" slot-scope="text, record">
                     <a @click="handleSettleDel(record)">删除</a>
                     <a @click="handleSettleDel(record)">删除</a>
                     <a-divider type="vertical"/>
                     <a-divider type="vertical"/>
@@ -398,19 +422,26 @@ export default {
                 {
                 {
                     title: '广告主主体名称',
                     title: '广告主主体名称',
                     align: 'center',
                     align: 'center',
-                    dataIndex: 'advertiserName'
+                    dataIndex: 'advertiserName',
+                    width: 240,
+                    ellipsis: true,
+                    scopedSlots: {customRender: 'advertiserName'}
                 },
                 },
                 {
                 {
                     title: '产品名称',
                     title: '产品名称',
                     align: 'center',
                     align: 'center',
                     dataIndex: 'productName',
                     dataIndex: 'productName',
-                    width: 220
+                    width: 240,
+                    ellipsis: true,
+                    scopedSlots: {customRender: 'productName'}
                 },
                 },
                 {
                 {
                     title: '账户名称',
                     title: '账户名称',
                     align: 'center',
                     align: 'center',
                     dataIndex: 'accountName',
                     dataIndex: 'accountName',
-                    width: 220
+                    width: 220,
+                    ellipsis: true,
+                    scopedSlots: {customRender: 'accountName'}
                 },
                 },
                 {
                 {
                     title: '媒体',
                     title: '媒体',
@@ -435,7 +466,7 @@ export default {
                     title: '时间',
                     title: '时间',
                     align: 'center',
                     align: 'center',
                     dataIndex: 'uploadYears',
                     dataIndex: 'uploadYears',
-                    width: 150
+                    width: 200
                 },
                 },
                 {
                 {
                     title: '操作',
                     title: '操作',
@@ -629,12 +660,15 @@ export default {
                     });
                     });
                 }
                 }
                 else {
                 else {
-                    console.log('error submit!!');
                     return false;
                     return false;
                 }
                 }
             });
             });
         },
         },
         handleProfitModalnCancel() {
         handleProfitModalnCancel() {
+            this.profitModalForm = {
+                mediaId: 1,
+                launchDateRange: []
+            };
             this.profitModalStatus = false;
             this.profitModalStatus = false;
         },
         },
         handleSettlementModalSure() {
         handleSettlementModalSure() {