Merge branch 'master' of qk:zhuishuyun/precise_delivery_distribution_front

src/scss/index.scss

@@ -13,7 +13,7 @@
 }
 
 body {
-  min-width: 1300px;
+  min-width: 1400px;
   overflow-x: auto;
 
   p {

src/views/financial/index.vue

@@ -2,7 +2,7 @@
   <div class="page-wrap page-finacial">
     <tool-bar
       :text="['advertiser_id']"
-      :label="['广告主名/ID']"
+      :label="['账户名/ID']"
       v-model:loading="inSearching"
       @confirm="onSearch"
     >

src/views/put/landing/add.vue

@@ -7,7 +7,7 @@
           <a-step title="编辑内容" />
         </a-steps>
       </div>
-      <div class="step-content-container">
+      <div class="step-content-container" >
         <component
           :is="stepComponent[stepCurrent]"
           :content="forms"
@@ -64,7 +64,7 @@ const LandingAddPage = defineComponent({
         next();
       }
     });
-
+    
     if (route.query && route.query.id) {
       getLandingInfo(route.query.id as string).then((res) => {
         state.forms = res.data;

src/views/put/landing/stepComp/step-one.vue

@@ -104,10 +104,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, ref, toRefs } from "vue";
+import { defineComponent, reactive, ref, toRefs,watch } from "vue";
 import { InfoCircleOutlined } from "@ant-design/icons-vue";
 import { useForm } from "@ant-design-vue/use";
-import { useRouter } from "vue-router";
+import useApp from "@/hooks/useApp";
 import store from "@/store";
 import { MutationType } from "@/store/modules/app/_type";
 import ImageUpload from "@/components/image-upload/index.vue";
@@ -129,7 +129,7 @@ const StepOne = defineComponent({
   },
   emits: ["next"],
   setup(props, { emit }) {
-    const router = useRouter();
+    const { route, router } = useApp();
 
     const state = reactive({
       officials: ref<IGZHItem[]>([]),
@@ -177,7 +177,11 @@ const StepOne = defineComponent({
         },
       ],
     });
-
+    watch( (props as any)?.content,(newProps, oldProps) => {
+     if (route.query && route.query.id) {
+       state.forms = Object.assign(state.forms, (props as any)?.content ?? {});
+      }
+    });
     const { validate, validateInfos } = useForm(state.forms, formsRules);
 
     const initConfigData = async () => {

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

@@ -1,8 +1,8 @@
 <template>
   <div class="page-wrap page-wrap-account page-adplan">
     <tool-bar
-      :text="['ad_id', 'advertiser_id', 'campaign_id', 'channel_id', 'book_id']"
-      :label="['计划名/ID', '账号名/ID', '广告组名称/ID', '站点ID', '书籍ID']"
+      :text="['ad_id', 'advertiser_id', 'campaign_id']"
+      :label="['计划名称/ID', '所属账号/ID', '所属广告组名称/ID']"
       :defaultVal="defaultToolvalue"
       v-model:loading="inSearching"
       @confirm="onSearch"
@@ -18,6 +18,22 @@
           >
         </a-select>
       </div>
+
+      <div class="tool-bar-item">
+        <p class="label">投放状态</p>
+        <a-select class="full-width" v-model:value="currentSelectStatus">
+          <a-select-option :value="null" key="3">
+            不限
+          </a-select-option>
+          <a-select-option value="1" key="1">
+            启用
+          </a-select-option>
+          <a-select-option value="0" key="0">
+            不启用
+          </a-select-option>
+        </a-select>
+      </div>
+
       <template v-if="!!is_admin">
         <div class="tool-bar-item">
           <p class="label">推广员</p>
@@ -267,6 +283,13 @@
       :closable="false"
       v-model:visible="lineVisable"
     >
+      <put-count
+        :ids="backData.ids"
+        :begin_date="backData.begin_date"
+        :end_date="backData.end_date"
+        :field="backData.field"
+      ></put-count>
+
       <a-descriptions bordered title="扩展数据" size="small">
         <a-descriptions-item
           :label="item.title"
@@ -284,12 +307,6 @@
       :closable="false"
       v-model:visible="registerVisable"
     >
-      <put-count
-        :ids="backData.ids"
-        :begin_date="backData.begin_date"
-        :end_date="backData.end_date"
-        :field="backData.field"
-      ></put-count>
       <register-datad
         :ad_lid="register.ad_lid"
         :back_platform="register.back_platform"
@@ -347,6 +364,7 @@ import {
 
 import { ADPlanItem, PageOptions, PlanBack } from "#/api";
 import useAuthUser from "@/hooks/composable/useAuthUser";
+import ARow from "ant-design-vue/lib/grid/Row";
 
 const PutAdPlan = defineComponent({
   components: {
@@ -371,6 +389,7 @@ const PutAdPlan = defineComponent({
     const state = reactive({
       platform: "platform1",
       list: ref<ADPlanItem[]>([]),
+      currentSelectStatus: null,
       inSearching: false,
       loading,
       currentSelect: "AD_STATUS_DELIVERY_OK",
@@ -487,8 +506,11 @@ const PutAdPlan = defineComponent({
     };
 
     const switchDate = (date: any, dateString: any[]) => {
-      store.commit(MutationType.setSelectTime, dateString);
-      onSearch(state.fields);
+      if(Array.isArray(dateString) && dateString.join('')){
+         store.commit(MutationType.setSelectTime, dateString);
+         onSearch(state.fields);
+      }
+     
     };
 
     const getData = async (query?: any) => {
@@ -504,7 +526,12 @@ const PutAdPlan = defineComponent({
           ...state.fields,
         },
         query || {},
-        { begin_date, end_date, status: state.currentSelect },
+        {
+          begin_date,
+          end_date,
+          status: state.currentSelect,
+          is_enable: state.currentSelectStatus,
+        },
         {
           cost_order: state.cost_order,
           convert_order: state.convert_order,
@@ -731,6 +758,13 @@ const PutAdPlan = defineComponent({
       }
     },
     getmoreLineData(record: any) {
+      let [begin_dates, end_dates] = this.pickerFilter;
+      let begin_date = moment(begin_dates).format("YYYY-MM-DD");
+      let end_date = moment(end_dates).format("YYYY-MM-DD");
+      this.backData.ids = record.id;
+      this.backData.begin_date = begin_date;
+      this.backData.end_date = end_date;
+      this.backData.field = this.currentStats;
       this.lineVisable = true;
       this.temData = record;
     },
@@ -759,13 +793,7 @@ const PutAdPlan = defineComponent({
     getregister(record: any) {
       this.register.ad_lid = record.id;
       this.register.back_platform = record.delivery_platform;
-      let [begin_dates, end_dates] = this.pickerFilter;
-      let begin_date = moment(begin_dates).format("YYYY-MM-DD");
-      let end_date = moment(end_dates).format("YYYY-MM-DD");
-      this.backData.ids = record.id;
-      this.backData.begin_date = begin_date;
-      this.backData.end_date = end_date;
-      this.backData.field = this.currentStats;
+
       this.registerVisable = true;
     },
     onCellChange(record: any, dataIndex: string, value: string) {

src/views/put/put-data.vue

@@ -2,7 +2,7 @@
   <div class="page-wrap page-wrap-put-books">
     <tool-bar
       :text="['official_name', 'book_name']"
-      :label="['公众号名称', '书名2']"
+      :label="['公众号名称', '书名']"
       :defaultVal="defaultToolvalue"
       @confirm="onSearch"
       v-model:loading="inSearching"
@@ -15,7 +15,7 @@
           v-model:value="pickered"
           @change="changeTime"
         />
-      </template>
+      </template>   
       <template v-if="!!is_admin">
         <div class="tool-bar-item">
           <p class="label">推广员</p>