提交需求

src/plugins/install.ts

@@ -19,7 +19,8 @@ import {
   Dropdown,
   Drawer,
   Tooltip,
-  InputNumber
+  InputNumber,
+  Descriptions
 } from "ant-design-vue";
 
 import VueClipboard3 from "./vue-clipboard";
@@ -55,6 +56,7 @@ const install = (app: App<Element>) => {
     .use(Popover)
     .use(Switch)
     .use(Modal)
+    .use(Descriptions)
     .use(Drawer);
 };
 

src/scss/antd.scss

@@ -43,3 +43,4 @@
 .ant-table td {
   @include single-line();
 }
+.ant-table td { white-space: nowrap; }

src/views/_pageOptions/table-account.ts

@@ -2,30 +2,37 @@ export const TableColumnOfAccount = [
   {
     title: "公众号名称",
     dataIndex: "account_name",
+    ellipsis: true,
   },
   {
     title: "公众号唯一标识",
     dataIndex: "app_id",
+    ellipsis: true,
   },
   {
     title: "平台",
     dataIndex: "platform",
+    ellipsis: true,
   },
   {
     title: "站点",
     dataIndex: "channel_id",
+    ellipsis: true,
   },
   {
     title: "推广员",
     dataIndex: "nickname",
+    ellipsis: true,
   },
   {
     title: "开始时间",
     dataIndex: "start_time",
+    ellipsis: true,
   },
   {
     title: "结束时间",
     dataIndex: "end_time",
+    ellipsis: true,
   },
 
   {

src/views/_pageOptions/table-put.ts

@@ -47,16 +47,19 @@ export const TableColumnOfPutAdAccount = [
     title: "账户ID",
     dataIndex: "account_id",
     key: "account_id",
+    ellipsis: true,
   },
   {
     title: "用户名",
     dataIndex: "account_name",
     key: "account_name",
+    ellipsis: true,
   },
   {
     title: "平台",
     dataIndex: "delivery_platform",
     key: "delivery_platform",
+    ellipsis: true,
   },
   {
     title: "推广员",
@@ -76,19 +79,25 @@ export const TableColumnOfPutData = [
     title: "日期",
     dataIndex: "date",
     width: 100,
+    fiexd:"left"
   },
   {
     title: "公众号名称",
     dataIndex: "official_name",
     width: 150,
+    ellipsis: true,
+    fiexd:"left"
   },
   {
     title: "书名",
     dataIndex: "book_name",
+    ellipsis: true,
+    fiexd:"left"
   },
   {
     title: "消耗",
     dataIndex: "cost",
+    fiexd:"left"
   },
   {
     title: "新增注册用户",
@@ -97,6 +106,7 @@ export const TableColumnOfPutData = [
   {
     title: "流量平台",
     dataIndex: "delivery_platform",
+    ellipsis: true,
   },
   {
     title: "注册成本",
@@ -215,6 +225,7 @@ export const TableMoreStat = [
     title: "流量平台",
     dataIndex: "delivery_platform",
     width: 100,
+    ellipsis: true,
   },
   {
     title: "注册成本",
@@ -264,6 +275,7 @@ export const TableColumnOfMoreStat = [
     fixed: "left",
     title: "公众号名称",
     dataIndex: "official_name",
+    ellipsis: true,
     width: 150,
   },
   {
@@ -479,6 +491,7 @@ export const ALLCloumnList = [
     title: "应用下载详情页链接",
     dataIndex: "ad_name",
     width: 150,
+    ellipsis: true,
   },
   {
     title: "转化目标",

src/views/_pageOptions/table_financial.ts

@@ -4,32 +4,33 @@ export const TableColumnOfFinancial = [
     dataIndex: "date",
   },
   {
-    title: "(广告主/管家)ID",
-    dataIndex: "advertiser_id",
+    title: "账户信息",
+    dataIndex: "advertiser_name",
+    slots: { customRender: "advertiser" },
+    fixed: "left",
+    ellipsis: true,
   },
   {
-    title: "日终结余",
-    dataIndex: "balance",
-  },
-  {
-    title: "现金支出",
-    dataIndex: "cash_cost",
+    title: "所属代理商信息",
+    dataIndex: "agent_name",
+    slots: { customRender: "agent" },
+    fixed: "left",
   },
   {
     title: "总支出",
     dataIndex: "cost",
   },
   {
-    title: "总存入",
-    dataIndex: "income",
+    title: "现金支出",
+    dataIndex: "cash_cost",
   },
   {
-    title: "冻结",
-    dataIndex: "frozen",
+    title: "赠款支出",
+    dataIndex: "reward_cost",
   },
   {
-    title: "返货支出",
-    dataIndex: "return_goods_cost",
+    title: "总存入",
+    dataIndex: "income",
   },
   {
     title: "总转入",
@@ -40,11 +41,12 @@ export const TableColumnOfFinancial = [
     dataIndex: "transfer_out",
   },
   {
-    title: "账户信息",
-    dataIndex: "advertiser_name",
+    title: "冻结",
+    dataIndex: "frozen",
   },
   {
-    title: "代理商信息",
-    dataIndex: "company_name",
+    title: "日终结余",
+    dataIndex: "balance",
   },
+  
 ];

src/views/account/account.vue

@@ -1,30 +1,40 @@
 <template>
   <div class="page-wrap page-wrap-account">
-    <tool-bar :text="['name']"
-              :label="['公众号名称']"
-              v-model:loading="searching"
-              @confirm="onSearch">
+    <tool-bar
+      :text="['name']"
+      :label="['公众号名称']"
+      v-model:loading="searching"
+      @confirm="onSearch"
+    >
       <div class="tool-bar-item">
         <p class="label">小说平台</p>
-        <a-select class="full-width"
-                  v-model:value="query.platform">
-          <a-select-option v-for="platform in platforms"
-                           :key="platform.value"
-                           :value="platform.value">{{platform.label}}</a-select-option>
+        <a-select class="full-width" v-model:value="query.platform">
+          <a-select-option
+            v-for="platform in platforms"
+            :key="platform.value"
+            :value="platform.value"
+            >{{ platform.label }}</a-select-option
+          >
         </a-select>
       </div>
     </tool-bar>
-    <a-table rowKey="id"
-             :loading="loading"
-             :pagination="tablePageOptions"
-             :columns="columns"
-             :data-source="list"
-             @change="onLoadOfficials" >
-         <template #operte="{ text, record }">
-           <p v-clipboard:copy="record.fans_add_monitor_link" v-clipboard:success="copySuccess"><a>复制监测链接</a></p>
-         </template>
-
-
+    <a-table
+      rowKey="id"
+      :loading="loading"
+      :pagination="tablePageOptions"
+      :columns="columns"
+      :scroll="{ y: true }"
+      :data-source="list"
+      @change="onLoadOfficials"
+    >
+      <template #operte="{ text, record }">
+        <p
+          v-clipboard:copy="record.fans_add_monitor_link"
+          v-clipboard:success="copySuccess"
+        >
+          <a>复制监测链接</a>
+        </p>
+      </template>
     </a-table>
   </div>
 </template>
@@ -95,12 +105,12 @@ const Account = defineComponent({
       onLoadOfficials,
     };
   },
-  methods:{
-    copySuccess(){
-      this.$message.success('复制成功')
-    }
-  }
+  methods: {
+    copySuccess() {
+      this.$message.success("复制成功");
+    },
+  },
 });
 
 export default Account;
-</script>
+</script>

src/views/financial/index.vue

@@ -15,7 +15,23 @@
         />
       </template>
     </tool-bar>
-    <a-table :columns="columns" :data-source="list" :scroll="{ x: 3000 }" @change="handleTableChange">
+    <a-table :columns="columns" :data-source="list" :scroll="{ x: 1500,y:600 }" @change="handleTableChange">
+      <template #advertiser="{ text, record }">
+        <p>
+         账户名:{{ record.advertiser_name }}
+        </p>
+        <p>
+          账户ID:{{ record.advertiser_id }}
+        </p>
+      </template>
+      <template #agent="{ text, record }">
+        <p>
+          代理商名:{{ record.agent_name }}
+        </p>
+        <p>
+         代理商Id:{{ record.agent_id }}
+        </p>
+      </template>
     </a-table>
   </div>
 </template>

src/views/put/ad-countdata.vue

@@ -126,10 +126,10 @@ const Adgroup = defineComponent({
     const setSateSwitch = (val: string, name: string) => {
       switch (val) {
         case "ascend":
-          (state as any)[name] = 1;
+          (state as any)[name] = 2;
           break;
         case "descend":
-          (state as any)[name] = 2;
+          (state as any)[name] = 1;
           break;
         default:
           (state as any)[name] = 0;

src/views/put/ad-group.vue

@@ -126,10 +126,10 @@ const Adgroup = defineComponent({
     const setSateSwitch = (val: string, name: string) => {
       switch (val) {
         case "ascend":
-          (state as any)[name] = 1;
+          (state as any)[name] = 2;
           break;
         case "descend":
-          (state as any)[name] = 2;
+          (state as any)[name] = 1;
           break;
         default:
           (state as any)[name] = 0;

src/views/put/put-ad-account.vue

@@ -18,6 +18,7 @@
       :pagination="tablePageOptions"
       :loading="loading.value"
       @change="handleTableChange"
+      :scroll="{y: true }"
       rowKey="id"
     >
     </a-table>

src/views/put/put-ad-plan.vue

@@ -52,6 +52,7 @@
       :loading="loading.value"
       @change="handleTableChange"
       rowKey="id"
+      bordered
       :scroll="{ x: 1800,y:700 }"
     >
       <template #switch="{ text, record }">
@@ -179,6 +180,7 @@
           <p @click="getBackData(record)"><a>回传</a></p>
         </a-popover>
         <p @click="getregister(record)"><a>注册用户</a></p>
+        <p @click="getmoreLineData(record)"><a>更多数据</a></p>
       </template>
 
       <template #cpa_bid="{ text, record }">
@@ -202,7 +204,7 @@
     </a-table>
     <a-drawer
       title="操作日志"
-      placement="right"
+      placement="right" 
       :closable="false"
       v-model:visible="visible"
     >
@@ -222,6 +224,19 @@
       ></put-count>
     </a-drawer>
     <a-drawer
+      title="补充数据"
+      placement="right"
+      :closable="false"
+      v-model:visible="lineVisable"
+    >
+     <a-descriptions bordered title="扩展数据" size="small">
+         <a-descriptions-item :label="item.title" v-for="item in innerClomuns">
+           {{temData[item.dataIndex]}}
+         </a-descriptions-item>
+       </a-descriptions>
+    </a-drawer>
+    
+    <a-drawer
       title="注册用户"
       placement="right"
       :closable="false"
@@ -292,6 +307,8 @@ const PutAdPlan = defineComponent({
       currentSelect: "AD_STATUS_DELIVERY_OK",
       picker: [],
       currentId: "",
+      innerClomuns: ref<any[]>([]),
+      lineVisable:false,
       defaultToolvalue: {},
       visible: false,
       popconfirmShow: false,
@@ -305,6 +322,7 @@ const PutAdPlan = defineComponent({
       pickerFilter: [moment(), moment()],
       tablePageOptions,
       columns: list,
+      temData:{},
       backData: {
         ids: "",
         begin_date: "",
@@ -412,6 +430,18 @@ const PutAdPlan = defineComponent({
         "ad_id",
         "delivery_platform",
       ];
+      let extendList = [
+        "campaign_name",
+        "landing_type",
+        "start_end_time",
+        "pricing",
+        "promotion_type",
+        "delivery_range",
+        "inventory_type",
+        "convert_id",
+        "external_actions",
+        "ad_create_time"
+      ]
       res.data.map((item: { desc: string; name: string }) => {
         let lolumnItem: {
           title: string;
@@ -419,10 +449,12 @@ const PutAdPlan = defineComponent({
           slots?: any;
           width?: string | number;
           sorter?: boolean;
+          ellipsis?:boolean;
         } = {
           title: item.desc,
           dataIndex: item.name,
           width: 120,
+          ellipsis: true,
         };
 
         if (item.name == "external_url") {
@@ -434,13 +466,18 @@ const PutAdPlan = defineComponent({
         if (item.name == "cost") {
           lolumnItem.sorter = true;
         }
+        if(extendList.includes(item.name)){
+          state.innerClomuns.push(lolumnItem)
+        }
 
         columns.push(lolumnItem);
       });
+
+
       let newColunms = columns.filter(
-        (item) => !blackList.includes(item.dataIndex)
+        (item) => !blackList.includes(item.dataIndex) && !extendList.includes(item.dataIndex)
       );
-
+    
       state.columns = [];
       state.columns.push(...state.defaultColumns);
       state.columns.push(...newColunms);
@@ -457,15 +494,16 @@ const PutAdPlan = defineComponent({
         slots: { customRender: "dayt" },
         width: 100,
       });
+      
     });
 
     const setSateSwitch = (val: string, name: string) => {
       switch (val) {
         case "ascend":
-          (state as any)[name] = 1;
+          (state as any)[name] = 2;
           break;
         case "descend":
-          (state as any)[name] = 2;
+          (state as any)[name] = 1;
           break;
         default:
           (state as any)[name] = 0;
@@ -517,6 +555,10 @@ const PutAdPlan = defineComponent({
         this.popconfirmShow = true;
       }
     },
+    getmoreLineData(record:any){
+      this.lineVisable = true;
+      this.temData = record;
+    },
     confirmEdit() {
       let { id, back_on, rate, condition, price, float_rate } = this.popForm[
         this.currentTbs

src/views/put/put-data.vue

@@ -33,7 +33,7 @@
     <a-table
       :columns="columns"
       :data-source="list"
-      :scroll="{ x: 3000 }"
+      :scroll="{ x: true,y:true }"
       @change="handleTableChange"
     >
     </a-table>
@@ -80,7 +80,7 @@ const PutData = defineComponent({
       rangePick: picker,
       drawerinSearching: false,
       drawermeta: {},
-      filterNumber: 120,
+      filterNumber: 7,
       show: false,
     });
 
@@ -123,10 +123,13 @@ const PutData = defineComponent({
             slots?: any;
             width?: string | number;
             fixed?: string;
+            ellipsis?: boolean,
           } = {
             title: item.desc,
             dataIndex: item.name,
+            ellipsis:true,
             width: 120,
+
           };
           if (whiteList.includes(item.name)) {
             lolumnItem.fixed = "left";

src/views/put/register-data.vue

@@ -22,7 +22,7 @@
       :pagination="tablePageOptions"
       :loading="loading.value"
       @change="handleTableChange"
-      :scroll="{ x: true }"
+      :scroll="{ x: true,y:true }"
     >
       <template #report_register_num="{ text, record }">
         <p v-if="record.report_register_num >= 1">