xia před 4 roky
rodič
revize
3816b066e0

+ 1 - 0
src/api/index.ts

@@ -225,6 +225,7 @@ export const opertaroLog = (
     begin_time: string;
     end_time: string;
     page: number;
+    ad_id:string;
   }> = { page: 1 }
 ): AxiosPromise<IList<adPlanLog>> => {
   return axios("/ad/adOptLogs", { params: query });

+ 1 - 3
src/views/_pageOptions/table-put.ts

@@ -177,14 +177,12 @@ export const TableColumnOfPutLog = [
   {
     title: "日志",
     key: "content_log",
-    width: 200,
+    width: 500,
     slots: { customRender: "log" },
   }
 ]
 
 
-
-
 export const TableColumnOfMoreStat = [
   {
     fixed: "left",

+ 14 - 2
src/views/put/put-ad-count.vue

@@ -53,21 +53,33 @@ const PutCount = defineComponent({
     };
     getAdplanTable().then((res) => {
       let columns: any[] = [];
+      let fixedList = ['ad_name','pay_num','recharge_amount','register_num','second_pay_num']
       res.data.map((item: { desc: string; name: string }) => {
         let lolumnItem: {
           title: string;
           dataIndex: string;
           slots?: any;
           width?: string | number;
+          fixed?: string;
         } = {
           title: item.desc,
           dataIndex: item.name,
-          width: 150,
+          width: 120,
         };
+        if(item.name == 'ad_id'){
+            lolumnItem.width = 200
+        }
+        if(fixedList.includes(item.name)){
+            lolumnItem.fixed = 'left';
+        }
         columns.push(lolumnItem);
       });
       state.columns = [];
-      state.columns.push(...columns);
+     let columnSort = columns.sort((a,b)=>{
+          return ~!!a.fixed - ~!!b.fixed;
+      })
+      console.log(columnSort)
+      state.columns.push(...columnSort);
     });
     getAdplanData(props.ids).then((res) => {
       state.list = res.data;

+ 3 - 1
src/views/put/put-ad-plan.vue

@@ -77,7 +77,7 @@
       :closable="false"
       v-model:visible="visible"
     >
-      <put-data></put-data>
+      <put-data :id="currentId"></put-data>
     </a-drawer>
     <a-drawer
       title="回本数据"
@@ -134,6 +134,7 @@ const PutAdPlan = defineComponent({
       loading,
       currentSelect: "AD_STATUS_DELIVERY_OK",
       picker: [],
+      currentId:'',
       visible: false,
       visible1: false,
       pickerFilter: [moment(), moment()],
@@ -243,6 +244,7 @@ const PutAdPlan = defineComponent({
     },
     openDrawer(record: any) {
       this.visible = true;
+      this.currentId = record.ad_id;
     },
     onCellChange(record: any, dataIndex: string, value: string) {
       console.log(record);

+ 21 - 6
src/views/put/put-log.vue

@@ -33,8 +33,8 @@
       :pagination="false"
     >
       <template #log="{ text, record }">
-        <p v-for="(log, index) in record.content_log" :key="log">
-          <span style="line-height: 200%">{{ log }}</span>
+        <p v-for="(log, index) in record.content_log" :key="log" class="table-p">
+          {{ log }}
         </p>
       </template>
     </a-table>
@@ -58,7 +58,10 @@ const PutData = defineComponent({
   components: {
     ToolBar,
   },
-  setup() {
+  props: {
+    id: String,
+  },
+  setup(props) {
     const { router } = useApp();
     let { loading, meta, tablePageOptions } = usePagination();
     const state = reactive({
@@ -73,7 +76,12 @@ const PutData = defineComponent({
         let [begin_dates, end_dates] = picker;
         let begin_time = moment(begin_dates).format("YYYY-MM-DD");
         let end_time = moment(end_dates).format("YYYY-MM-DD");
-        const { data } = await opertaroLog({ begin_time, end_time, page: 1 });
+        const { data } = await opertaroLog({
+          begin_time,
+          end_time,
+          page: 1,
+          ad_id: props.id,
+        });
         state.list = data.list;
         meta.value = data.meta;
       } catch (e) {
@@ -83,9 +91,8 @@ const PutData = defineComponent({
         state.inSearching = false;
       }
     };
-    opertaroLog().then((res) => {
+    opertaroLog({ ad_id: props.id }).then((res) => {
       state.list = res.data.list;
-      console.log(state.list);
     });
     const handleTableChange = (pagination: PageOptions) => {
       const { current, pageSize, total } = pagination;
@@ -107,3 +114,11 @@ const PutData = defineComponent({
 
 export default PutData;
 </script>
+<style lang="scss" scoped>
+.table-p{
+  max-width: 500px;
+  white-space:normal;
+  word-break: break-all;
+  line-height: 200%;
+}
+</style>