RING:fire-bugs fixed

src/views/_pageOptions/table-account.ts

@@ -35,24 +35,24 @@ export const TableColumnOfAccount = [
       customRender: "module"
     }
   },
-  {
-    title: "开始/结束时间",
-    dataIndex: "start_time",
-    ellipsis: true,
-    width: 200,
-    slots: {
-      customRender: "time"
-    }
-  },
   // {
-  //   title: "站点回传比例",
-  //   dataIndex: "rate",
-  //   width: 120,
+  //   title: "开始/结束时间",
+  //   dataIndex: "start_time",
+  //   ellipsis: true,
+  //   width: 200,
   //   slots: {
-  //     customRender: "rate"
+  //     customRender: "time"
   //   }
   // },
   {
+    title: "站点回传比例",
+    dataIndex: "rate",
+    width: 120,
+    slots: {
+      customRender: "rate"
+    }
+  },
+  {
     title: "回传状态",
     dataIndex: "report_status",
     width: 150,

src/views/_pageOptions/table-put.ts

@@ -57,19 +57,20 @@ export const TableColumnOfPutAdAccount = [
     key: "advertiser_name",
     width: 200,
     ellipsis: true,
+    slots: { customRender: "advertiserName" },
   },
   {
-    title: "账户ID",
-    dataIndex: "account_id",
-    key: "account_id",
+    title: "广告主邮箱",
+    dataIndex: "email",
+    key: "email",
     ellipsis: true,
-    slots: { customRender: "email" },
   },
   {
-    title: "用户名",
+    title: "所属账户",
     dataIndex: "account_name",
     key: "account_name",
     ellipsis: true,
+    slots: { customRender: "account" },
   },
   {
     title: "平台",
@@ -639,7 +640,7 @@ export const MatchList = [
 
 export const AdgroupCloumn: Array<colunm> = [
   {
-    title: "",
+    title: "广告组状态",
     dataIndex: "check",
     width: 100,
     slots: {
@@ -650,13 +651,13 @@ export const AdgroupCloumn: Array<colunm> = [
   {
     title: "广告组名称",
     dataIndex: "campaign_name",
-    width: 150,
+    width: 180,
 
     children: [
       {
-        title: "总计",
+        title: "合计",
         dataIndex: "campaign_name",
-        width: 100,
+        width: 180,
         slots: {
           customRender: "adgroup",
         },
@@ -664,6 +665,14 @@ export const AdgroupCloumn: Array<colunm> = [
     ],
   },
   {
+    title: "所属账户",
+    dataIndex: "advertiser_name",
+    width: 140,
+    slots: {
+      customRender: "advertiser",
+    },
+  },
+  {
     title: "组预算",
     dataIndex: "budget",
     width: 100,

src/views/account/account.vue

@@ -21,18 +21,18 @@
         <p class="label">回传状态</p>
         <a-select class="full-width" v-model:value="query.report_status">
           <a-select-option :key="10086" :value="10086">全部</a-select-option>
-          <a-select-option :key="1" :value="1">开</a-select-option>
-          <a-select-option :key="0" :value="0">关</a-select-option>
+          <a-select-option :key="1" :value="1">开启</a-select-option>
+          <a-select-option :key="0" :value="0">关闭</a-select-option>
         </a-select>
       </div>
       <div class="tool-bar-item">
         <p class="label">回传方式</p>
         <a-select class="full-width" v-model:value="query.report_module">
-          <a-select-option key="all" value="all">全部</a-select-option>
+          <a-select-option key="all" :value="null">全部</a-select-option>
           <a-select-option key="channel" value="channel"
-            >按站点</a-select-option
+            >按站点回传</a-select-option
           >
-          <a-select-option key="ad" value="ad">关</a-select-option>
+          <a-select-option key="ad" value="ad">按计划回传</a-select-option>
         </a-select>
       </div>
     </tool-bar>
@@ -58,14 +58,14 @@
       <template #module="{ record }">
         <p>{{ moduleType[record.report_module] }}</p>
       </template>
-      <template #status="{text}">
+      <template #status="{ text }">
         <p>{{ text == 0 ? "关闭" : "开启" }}</p>
       </template>
-      <template #time="{ text, record }">
+      <template #time="{ record }">
         <p>起:{{ record.start_time }}</p>
         <p>止:{{ record.end_time }}</p>
       </template>
-      <template #action="{record}">
+      <template #action="{ record }">
         <a-button type="primary" @click="initBackData(record)">
           回传配置
         </a-button>
@@ -90,26 +90,25 @@
         <p class="title">回传方式</p>
         <a-radio-group
           v-model:value="report_module"
-          @change="onReportModuleChange"
+          @change="showConfig = report_module == 'ad' ? false : true"
         >
           <a-radio value="ad">计划</a-radio>
           <a-radio value="channel">站点</a-radio>
         </a-radio-group>
+        <a href="javascript:;" @click="onReportModuleChange">保存</a>
       </div>
-      <div class="wrap-box">
+      <div class="wrap-box" v-show="!showConfig">
         <p class="title">按计划回传配置</p>
         <a-form :label-col="{ span: 6 }" :wrapper-col="{ offset: 1, span: 11 }">
           <a-form-item label="回传比例">
             <a-input-number v-model:value="ad_config.rate" />
           </a-form-item>
           <a-form-item :wrapper-col="{ offset: 7 }">
-            <a-button type="primary" @click="onRateChange">
-              保存
-            </a-button>
+            <a-button type="primary" @click="onRateChange"> 保存 </a-button>
           </a-form-item>
         </a-form>
       </div>
-      <div class="wrap-box"  v-show="showConfig">
+      <div class="wrap-box" v-show="showConfig">
         <p class="title">按站点回传配置</p>
         <a-tabs size="small" @change="onTabChange">
           <a-tab-pane
@@ -128,6 +127,7 @@
               <a-select-option
                 :value="item.name"
                 v-for="item in popForm[currentTab].report_conditions"
+                :key="item.name"
               >
                 {{ item.desc }}
               </a-select-option>
@@ -150,7 +150,7 @@
             >
               <template #suffix>
                 <a-tooltip title="比例0-100">
-                  <info-circle-outlined style="color: rgba(0,0,0,.45)" />
+                  <info-circle-outlined style="color: rgba(0, 0, 0, 0.45)" />
                 </a-tooltip>
               </template>
             </a-input>
@@ -185,7 +185,7 @@
             >
               <template #suffix>
                 <a-tooltip title="浮动比例小于固定回传比例">
-                  <info-circle-outlined style="color: rgba(0,0,0,.45)" />
+                  <info-circle-outlined style="color: rgba(0, 0, 0, 0.45)" />
                 </a-tooltip>
               </template>
             </a-input>
@@ -342,7 +342,7 @@ const Account = defineComponent({
       });
     };
     const onReportModuleChange = () => {
-      state.showConfig = state.report_module == "ad" ? false : true;
+      // state.showConfig = state.report_module == "ad" ? false : true;
       onUpdateOfficialReportType(
         state.report_channel_id,
         state.report_module

src/views/financial/index.vue

@@ -25,11 +25,11 @@
       rowKey="id"
       bordered
     >
-      <template #advertiser="{ text, record }">
+      <template #advertiser="{ record }">
         <p class="small-font single-line">{{ record.advertiser_name }}</p>
         <p class="small-font single-line">ID:{{ record.advertiser_id }}</p>
       </template>
-      <template #agent="{ text, record }">
+      <template #agent="{ record }">
         <p class="small-font single-line">{{ record.agent_name }}</p>
         <p class="small-font single-line">ID:{{ record.agent_id }}</p>
       </template>

src/views/put/ad-group.vue

@@ -54,6 +54,17 @@
             @click="goAdlgroup(record.advertiser_id, record.campaign_id)"
           >
             <a href="javascript:;">{{ record.campaign_name }} </a>
+            <span style="display: block; color: gray; font-size: 12px"
+              >ID:{{ record.campaign_id }}</span
+            >
+          </p>
+        </template>
+        <template #advertiser="{ record }">
+          <p>
+            <span style="font-size:13px;color:gray">{{ record.advertiser_name }} </span>
+            <span style="display: block; color: gray; font-size: 12px"
+              >ID:{{ record.advertiser_id }}</span
+            >
           </p>
         </template>
         <template #switch="{ record }">
@@ -63,7 +74,9 @@
           />
         </template>
         <template #budget="{ record }">
-          <a href="javascript:;" @click="changeBudget(record)">{{record.budget}}</a>
+          <a href="javascript:;" @click="changeBudget(record)">{{
+            record.budget
+          }}</a>
         </template>
       </a-table>
     </template>

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

@@ -1,16 +1,16 @@
 <template>
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
-      :text="['email', 'account_id', 'account_name', 'advertiser_id']"
-      :label="['邮箱', '账户名/ID', '用户名', '广告主ID']"
+      :text="['account_name', 'email']"
+      :label="['广告主名称', '广告主邮箱']"
       v-model:loading="inSearching"
       @confirm="onSearch"
     >
-      <template #exbutton>
+      <!-- <template #exbutton>
         <a-button type="primary" @click="handleClick" class="ml-10">
           授权
         </a-button>
-      </template>
+      </template> -->
     </tool-bar>
     <a-table
       :columns="columns"
@@ -23,15 +23,21 @@
       :scroll="{ y: 600 }"
       rowKey="id"
     >
-      <template #operator="{ text, record }">
+      <template #operator="{ record }">
         <a-switch
           v-model:checked="record.is_enable"
           @change="switchMethod(record)"
         />
       </template>
-      <template #email="{ text, record }">
-        <p>账户ID{{ record.account_id }}</p>
-        <p>邮箱：{{ record.email }}</p>
+      <template #advertiserName="{ record }">
+        <p>{{ record.advertiser_name }}</p>
+        <p style="color: gray; font-size: 12px">
+          ID:{{ record.advertiser_id }}
+        </p>
+      </template>
+      <template #account="{ record }">
+        <p>{{ record.account_name }}</p>
+        <p style="color: gray; font-size: 12px">ID:{{ record.account_id }}</p>
       </template>
     </a-table>
   </div>

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

@@ -66,7 +66,7 @@
       <a-button
         type="primary"
         @click="openCustomLine"
-        style="margin-left:10px;"
+        style="margin-left: 10px"
       >
         自定义列
       </a-button>
@@ -83,22 +83,22 @@
         bordered
         :scroll="{ x: 1600, y: scrollY }"
       >
-        <template #switch="{ text, record }">
+        <template #switch="{ record }">
           <a-switch
             v-model:checked="record.enable"
             @change="switchMethod(record)"
           />
         </template>
-        <template #external_url="{ text, record }">
+        <template #external_url="{ record }">
           <p @click="onGo(record)"><a>前往落地页链接</a></p>
         </template>
-        <template #ad_name="{ text, record }">
+        <template #ad_name="{ record }">
           <p class="small-font">{{ record.ad_name }}</p>
           <!-- <p>广告名：{{ record.ad_name }}</p>
           <p>广告ID：{{ record.ad_id }}</p> -->
         </template>
 
-        <template #dayt="{ text, record }">
+        <template #dayt="{ record }">
           <div class="flex-box line-box">
             <a-popover title="回传配置" placement="left" trigger="click">
               <template #content>
@@ -121,6 +121,7 @@
                     <a-select-option
                       :value="item.name"
                       v-for="item in popForm[currentTbs].report_conditions"
+                      :key="item"
                     >
                       {{ item.desc }}
                     </a-select-option>
@@ -145,7 +146,9 @@
                   >
                     <template #suffix>
                       <a-tooltip title="比例0-100">
-                        <info-circle-outlined style="color: rgba(0,0,0,.45)" />
+                        <info-circle-outlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
                       </a-tooltip>
                     </template>
                   </a-input>
@@ -183,7 +186,9 @@
                   >
                     <template #suffix>
                       <a-tooltip title="浮动比例小于固定回传比例">
-                        <info-circle-outlined style="color: rgba(0,0,0,.45)" />
+                        <info-circle-outlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
                       </a-tooltip>
                     </template>
                   </a-input>
@@ -209,7 +214,7 @@
               <p @click="getBackData(record)"><a>回传</a></p>
             </a-popover>
             <p @click="getregister(record)"><a>注册用户</a></p>
-           <p @click="getmoreLineData(record)"><a>更多数据</a></p> 
+            <p @click="getmoreLineData(record)"><a>更多数据</a></p>
             <!-- <p @click="openBackDrawer(reocrd)"><a>更多数据</a></p> -->
           </div>
         </template>
@@ -229,7 +234,7 @@
             @change="(val) => onCellChange(record, 'budget', val)"
           />
         </template>
-        <template #opertate="{ text, record }">
+        <template #opertate="{ record }">
           <p @click="openDrawer(record)"><a>操作日志</a></p>
         </template>
       </a-table>
@@ -263,7 +268,11 @@
       v-model:visible="lineVisable"
     >
       <a-descriptions bordered title="扩展数据" size="small">
-        <a-descriptions-item :label="item.title" v-for="item in innerClomuns">
+        <a-descriptions-item
+          :label="item.title"
+          v-for="item in innerClomuns"
+          :key="item"
+        >
           {{ temData[item.dataIndex] }}
         </a-descriptions-item>
       </a-descriptions>
@@ -574,6 +583,8 @@ const PutAdPlan = defineComponent({
         "convert_id",
         "external_actions",
         "ad_create_time",
+        "cost_protect_status",
+        "learning_phase",
       ];
       res.data.map(
         (item: { desc: string; name: string; width?: number | string }) => {

src/views/put/put-data.vue

@@ -47,9 +47,7 @@
           :max="120"
         />
       </div>
-      <a-button type="primary" @click="changeNumber">
-        修改天数
-      </a-button>
+      <a-button type="primary" @click="changeNumber"> 修改天数 </a-button>
     </div>
 
     <a-table
@@ -61,7 +59,12 @@
       size="small"
       bordered
     >
-      <template #opertate="{ text, record }">
+      <template #gzh="{ record }">
+        <a href="javascript:;" @click="goPlan(record)">{{
+          record.official_name
+        }}</a>
+      </template>
+      <template #opertate="{ record }">
         <p @click="goPlan(record)"><a>查看广告计划</a></p>
       </template>
     </a-table>
@@ -75,7 +78,7 @@ import {
   reactive,
   toRefs,
   ref,
-  onMounted
+  onMounted,
 } from "vue";
 import { picker } from "@/helper/config/range";
 import ToolBar from "@/components/tool-bar/index.vue";
@@ -83,13 +86,13 @@ import moment from "moment";
 import router from "@/router";
 import {
   TableColumnOfPutData,
-  TableColumnOfMoreStat
+  TableColumnOfMoreStat,
 } from "../_pageOptions/table-put";
 import { MutationType } from "@/store/modules/app/_type";
 import {
   getDeliveryStatList,
   getDeliveryMoreStatList,
-  getDesignList
+  getDesignList,
 } from "@/api";
 import usePagination from "@/hooks/usePagination";
 
@@ -99,7 +102,7 @@ import useAuthUser from "@/hooks/composable/useAuthUser";
 
 const PutData = defineComponent({
   components: {
-    ToolBar
+    ToolBar,
   },
   setup() {
     const { router, route, store } = useApp();
@@ -114,7 +117,7 @@ const PutData = defineComponent({
         store.getters.selectTime.length > 0
           ? [
               moment(store.getters.selectTime[0]),
-              moment(store.getters.selectTime[1])
+              moment(store.getters.selectTime[1]),
             ]
           : [moment().subtract(30, "d"), moment()]
       ),
@@ -129,14 +132,14 @@ const PutData = defineComponent({
       drawermeta: {},
       filterNumber: 7,
       show: false,
-      uids: ref<number[]>([])
+      uids: ref<number[]>([]),
     });
     if (route.query && route.query.official_name) {
       state.defaultToolvalue = {
-        official_name: route.query.official_name
+        official_name: route.query.official_name,
       };
       state.fields = {
-        official_name: route.query.official_name
+        official_name: route.query.official_name,
       };
     }
     const getList = (query: any) => {
@@ -187,7 +190,7 @@ const PutData = defineComponent({
             title: item.desc,
             dataIndex: item.name,
             ellipsis: true,
-            width: 120
+            width: 120,
           };
           if (whiteList.includes(item.name)) {
             lolumnItem.fixed = "left";
@@ -201,9 +204,14 @@ const PutData = defineComponent({
           ellipsis: true,
           width: 120,
           fixed: "right",
-          slots: { customRender: "opertate" }
+          slots: { customRender: "opertate" },
         };
         columns.push(column);
+        columns.forEach((item) => {
+          if (item.title === "公众号") {
+            item.slots = { customRender: "gzh" };
+          }
+        });
         state.columns = columns;
       });
     };
@@ -211,7 +219,7 @@ const PutData = defineComponent({
       const { current, pageSize, total } = pagination;
       let data = Object.assign(state.fields, {
         page: current,
-        day_num: state.filterNumber
+        day_num: state.filterNumber,
       });
       getList(data);
     };
@@ -224,7 +232,7 @@ const PutData = defineComponent({
       getList({
         page: 1,
         day_num: state.filterNumber,
-        official_name: route.query?.official_name ?? ""
+        official_name: route.query?.official_name ?? "",
       });
     });
     return {
@@ -235,7 +243,7 @@ const PutData = defineComponent({
       meta,
       handleTableChange,
       changeNumber,
-      changeTime
+      changeTime,
     };
   },
   methods: {
@@ -244,10 +252,10 @@ const PutData = defineComponent({
       const { date, channel_id, book_id } = record;
       router.push({
         path: "/put/datas/ad-plan",
-        query: { channel_id, begin_date: date, end_date: date, book_id }
+        query: { channel_id, begin_date: date, end_date: date, book_id },
       });
-    }
-  }
+    },
+  },
 });
 
 export default PutData;