定向包回显

src/components/businessMoudle/batchGdt/configArea/copywriter/writerDialog.vue

@@ -245,7 +245,9 @@ const initFun = (flag, obj) => {
         TextLibraryRef.value.writ_toggle_selected(obj.data)
       }
     }else{
-      text_textarea.value = obj?.data[0] || ''
+      if(obj?.data && Array.isArray(obj?.data)){
+        text_textarea.value = obj?.data[0] || ''
+      }
     }
   })
 }

src/components/businessMoudle/batchGdt/configArea/creativeMaterial/index.vue

@@ -709,7 +709,7 @@ const clearAllEvent = async () => {
                 let arr: any = _.cloneDeep(inject_accountIds)
                 let new_ac_ids: any = []
                 let all_ac_ids: any = []
-                pageInfo.creativeTeamList[0].list[0].resResult.forEach(sub => {
+                pageInfo.creativeTeamList[0].list[0].resResult?.forEach(sub => {
                   let ids_nn: number = all_ac_ids.findIndex(nn => nn == sub.account_id)
                   if (ids_nn == -1) {
                     all_ac_ids.push(sub.account_id)
@@ -739,11 +739,15 @@ const clearAllEvent = async () => {
 
 
 
-              const creatice_reuseEvent = async () => {
+              const creatice_reuseEvent = async (cMaterial) => {
                 requestObj.upload_flag = false
                 clearTimeout(requestObj.timer_get_upload_res)
+                if(cMaterial.list){
+                  pageInfo.creativeTeamList = _.cloneDeep(cMaterial.list)
+                }
                 let acArr: any = await get_new_ac_ids()
                 let targetArr: any = await get_new_target_ids()
+                console.log('targetArr',targetArr)
                 if (targetArr && targetArr.length == 0) {
                   emit('closeLoading')
                   return

src/components/businessMoudle/batchGdt/configArea/directPacket/echoIndex.vue

@@ -38,7 +38,7 @@ const { proxy } = getCurrentInstance() as any;
 const NumberHandle = proxy.$NumberHandle
 
 const emit = defineEmits<{
-  (event: "updateHaveContent", id:number,chooseNum?:number,minusFlag?:boolean,clearFlag?:boolean): void;
+  (event: "updateHaveContent", id:number,chooseNum?:number,minusFlag?:boolean,clearFlag?:boolean, type?:string): void;
 }>();
 
 const props = withDefaults(defineProps<{
@@ -56,19 +56,25 @@ const pageInfo = reactive<reactiveTableAndAny>({
 
 watch(()=>pageInfo.updateKey_DirectPacket,()=>{
   nextTick(async ()=>{
-    pageInfo.directContent =  _.cloneDeep(pageInfo.directContent_interim)
-    //计算选的个数
-    let chooseNum:number = 0
-    pageInfo.directContent.chooseList.forEach(sub=>{
-      if(sub.chooseList&&sub.chooseList.length){
-        chooseNum+=sub.chooseList&&sub.chooseList.length
-      }
-    })
-    await emit('updateHaveContent',3,chooseNum)
+    directContentChange()
   })
 })
 
-
+const directContentChange = (type?) => {
+  pageInfo.directContent =  _.cloneDeep(pageInfo.directContent_interim)
+  //计算选的个数
+  let chooseNum:number = 0
+  pageInfo.directContent.chooseList.forEach(sub=>{
+    if(sub.chooseList&&sub.chooseList.length){
+      chooseNum+=sub.chooseList&&sub.chooseList.length
+    }
+  })
+  if(type == 'feedback'){//回显
+    emit('updateHaveContent',3,chooseNum, false, false, 'feedback')
+  }else{
+    emit('updateHaveContent',3,chooseNum)
+  }
+}
 
 
 //删除某一项定向包
@@ -179,6 +185,14 @@ const AcChangeEvent = (arr:any) => {
 const getObjValue = () => {
   return pageInfo.directContent
 }
+//回显
+const feedbackEvent = (obj) => {
+  if(obj){
+    pageInfo.directContent_interim = _.cloneDeep(obj)
+    console.log('pageInfo.directContent_interim', pageInfo.directContent_interim)
+    directContentChange('feedback')
+  }
+}
 
 // 父组件共享值
 defineExpose({
@@ -188,7 +202,8 @@ defineExpose({
   getObjValue,
   // addAcEvent,
   // deleAcEvent,
-  AcChangeEvent
+  AcChangeEvent,
+  feedbackEvent
 });
 
 

src/components/businessMoudle/batchGdt/configArea/directPacket/index.vue

@@ -73,9 +73,9 @@ const wayChange = (val:any) => {
   nextTick(()=>{
     pageInfo.exposeObj.type = val
     if(pageInfo.exposeObj.type=='2'){
-      comRef2.value!.echoChooseList()
+      comRef2.value?.echoChooseList()
     }else if(pageInfo.exposeObj.type=='1'){
-      comRef.value!.echoChooseList()
+      comRef.value?.echoChooseList()
     }
   })
 }

src/components/businessMoudle/batchGdt/configArea/directPacket/ts/useDriect.ts

@@ -68,10 +68,10 @@ export function useDriectTs(initAccListParams?:any,type?:string){
 
     //清空选项
     const clearTableSelect = () => {
-        tableListRef.value!.clearSelected()
+        tableListRef.value?.clearSelected()
     }
     const toggleTableSelect = (arr:any,flag:boolean) => {
-        tableListRef.value!.toggleSelected(arr,flag)
+        tableListRef.value?.toggleSelected(arr,flag)
     }
 
     //打开新建定向

src/components/businessMoudle/batchGdt/configArea/directPacket/useDirect.vue

@@ -13,7 +13,6 @@
         <span class="pointer c-theme rMar10" @click="get_direct_list()">刷新</span>
         <el-button type="primary" class="lMarauto" @click="newAddEvent">新建定向包</el-button>
       </div>
-
       <div class="tMar20">
         <TableList
             :updateKey="Number(pageInfo.accId)"

src/components/businessMoudle/batchGdt/configArea/index.vue

@@ -247,6 +247,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
     data: [],
     allocation_type: '',//分配形式 1自动分配 2程序化相乘分配
     loadPageRule: 0, //0 全部相同 //1 按账户分配 //2 分配到计划 // 3分配到广告
+    multiCopyTesting: 0,//分账户选择 0不开启 1开启
   },
   acc_plan_ad_count: {}, //各账户对应的计划数、广告数；用于微信视频号的配置
   groupsConfig: {},//已选择的策略组
@@ -286,7 +287,7 @@ watch(()=>resuse_complate_flag_creaBasicInfo.value,async (val)=>{
    if(val){
      // 创意素材 - 修改或者新增
      await CreativeMaterialRef.value?.deleAcEvent(pageInfo.accIdsList,false)
-     CreativeMaterialRef.value?.creatice_reuseEvent()
+     CreativeMaterialRef.value?.creatice_reuseEvent(_.cloneDeep(cMaterial))
    }
 })
 
@@ -332,7 +333,8 @@ watch(()=>cMaterial.key,()=>{
 const DirectPacketExhibitionRef = ref<{get_echoAcId:()=>void,
   showDirectPacket:()=>void,
   clearDirectContent:()=>void,
-  AcChangeEvent:(arr:any)=>void
+  AcChangeEvent:(arr:any)=>void,
+  feedbackEvent:(obj)=>void
   // addAcEvent:(arr:any)=>void,deleAcEvent:(arr:any)=>void
 }>()
 
@@ -343,6 +345,7 @@ const openDialogEvent = async (sub:any) => {
     nextTick(()=>{
       if(DirectPacketExhibitionRef.value) { DirectPacketExhibitionRef.value[0]?.showDirectPacket() }
       if(sub.haveContent){
+        console.log('get_echoAcIdget_echoAcIdget_echoAcIdget_echoAcIdget_echoAcIdget_echoAcId')
         if(DirectPacketExhibitionRef.value) { DirectPacketExhibitionRef.value[0]?.get_echoAcId() }
       }
     })
@@ -372,12 +375,12 @@ const openDialogEvent = async (sub:any) => {
     CopywriterRef.value[0]?.initFun(true, pageInfo?.copywriterInfoData)
   }
   if(sub.name == '落地页' && LandPageRef.value){
-    LandPageRef.value[0]?.initFun(true, pageInfo.num_total, pageInfo.last_ad_show_list)
+    LandPageRef.value[0]?.initFun(true, pageInfo.num_total, pageInfo.last_ad_show_list, pageInfo?.copyLandPageInfoData)
   }
 }
 
 //更新数值,判断是否有内容
-const updateHaveContent = (id:number,chooseNum?:number,minusFlag?:boolean,clearFlag?:boolean) => {
+const updateHaveContent = (id:number,chooseNum?:number,minusFlag?:boolean,clearFlag?:boolean, type?:string) => {
   nextTick(()=>{
     // id : adTitleList的id  chooseNum: 选中的个数  minusFlag:是否需要减少
     if(clearFlag){ //清空
@@ -394,9 +397,11 @@ const updateHaveContent = (id:number,chooseNum?:number,minusFlag?:boolean,clearF
         if(DirectPacketExhibitionRef.value){
           pageInfo.directObj = DirectPacketExhibitionRef.value[0]?.getObjValue()
         }
-        //清空落地页
-        if(LandPageRef.value){
-          LandPageRef.value[0]?.clearEvent()
+        if(type != 'feedback'){
+          //清空落地页
+          if(LandPageRef.value){
+            LandPageRef.value[0]?.clearEvent()
+          }
         }
         updateHaveContent(8,0,false,true)
         computeCount()
@@ -470,6 +475,8 @@ const landPageEvent = (obj) => {
   pageInfo.copyLandPageInfoData.data = obj.landPage;
   pageInfo.copyLandPageInfoData.allocation_type = obj.allocation_type;
   pageInfo.copyLandPageInfoData.loadPageRule = obj.loadPageRule;
+  pageInfo.copyLandPageInfoData.multiCopyTesting = obj.multiCopyTesting;
+  
   if(obj.landPage && JSON.stringify(obj.landPage) != '{}') {
     updateHaveContent(8,length)
   }else{
@@ -624,6 +631,7 @@ const {
   closeSeletedGroup,
   strategyGroupsUse
 } = strategyGroupsEvent({
+  DirectPacketExhibitionRef,
   LandPageRef,
   CopywriterRef,
   targetRef,
@@ -637,7 +645,8 @@ const {
   aNewConfigEvent,
   getAdPresetsInfo,
   updateHaveContent,
-  clearOriginalityInfo
+  clearOriginalityInfo,
+  computeCount
 })
 /**E 策略组 */
 

src/components/businessMoudle/batchGdt/configArea/landPage/index.vue

@@ -59,7 +59,8 @@ const closeLandPageDialog = (obj) => {
   emit('landPage',{
     landPage: obj.emitData,
     allocation_type: selectValue.value,
-    loadPageRule: obj.loadPageRule
+    loadPageRule: obj.loadPageRule,
+    multiCopyTesting: obj.multiCopyTesting
   })
 }
 /**分配切换选择 清空选中 */
@@ -67,7 +68,7 @@ const selectValueChange = () => {
   closeLandPageDialog({})
 }
 /**初始化 */
-const initFun = (flag, count_info_2, last_ad_show_list_2) => {
+const initFun = (flag, count_info_2, last_ad_show_list_2, feedbackObj) => {
   nextTick(()=>{
     if(count_info_2){
       count_info.value = count_info_2;
@@ -76,7 +77,7 @@ const initFun = (flag, count_info_2, last_ad_show_list_2) => {
       last_ad_show_list.value = last_ad_show_list_2
     }
     if(LandPageDialogRef.value){
-      LandPageDialogRef.value.initFun(flag, selectValue.value, last_ad_show_list_2)
+      LandPageDialogRef.value.initFun(flag, selectValue.value, last_ad_show_list_2, feedbackObj)
     }
   })
 }
@@ -86,7 +87,8 @@ const feedbackEvent = (obj) => {
   selectValue.value = obj.allocation_type
   closeLandPageDialog({
     emitData: obj.data,
-    loadPageRule: obj.loadPageRule
+    loadPageRule: obj.loadPageRule,
+    multiCopyTesting: obj.multiCopyTesting
   })
 }
 /**清空 */
@@ -94,7 +96,8 @@ const clearEvent = () => {
   selectValue.value = 1;
   closeLandPageDialog({
     emitData: {},
-    loadPageRule: 0
+    loadPageRule: 0,
+    multiCopyTesting: 0
   })
 }
 // 暴露自己的属性供父组件使用

src/components/businessMoudle/batchGdt/configArea/landPage/landPageDialog.vue

@@ -42,7 +42,7 @@
             </el-icon></span>
         </el-tooltip>
       </div>
-      <LandPageList :page_type="page_type" :select_count="allocation == 2 ? -1 : select_count" @callBack="handleSelectionChange"
+      <LandPageList ref="LandPageListRef" :page_type="page_type" :select_count="allocation == 2 ? -1 : select_count" @callBack="handleSelectionChange"
         v-if="multiCopyTesting == 0" style="margin-top:20px"></LandPageList>
       <AccMinprogram ref="AccMinprogramRef" v-if="multiCopyTesting == 1" :count_info="count_info" :page_type="page_type" :loadPageRule="loadPageRule"
         :accIdsList="accIdsList" @callBack="AccMinprogramChange"></AccMinprogram>
@@ -60,6 +60,7 @@ import { nextTick, onBeforeMount, reactive, ref, watch } from 'vue';
 import { ElMessage } from 'element-plus';
 import LandPageList from './landPageList.vue';
 import AccMinprogram from './accMinprogram.vue'
+import _ from 'lodash';
 const props = defineProps({
   page_type: {
     type: String,
@@ -99,12 +100,13 @@ const visible = ref(false)
 const loading = ref(false)
 const multiCopyTesting = ref(0)
 const allocation = ref(1) // 创意文案分配方式 1自动分配 2程序化测试
-let multipleSelection = []
+let multipleSelection:any = []
 const select_count = ref(-1) //限制选中的条数
 const accMinprogramInfo = ref();
 const AccMinprogramRef = ref()
 const last_ad_show_list = ref([])
 const acc_select_count = ref()
+const LandPageListRef = ref()
 
 onBeforeMount(() => {
   multiCopyTestingChange(multiCopyTesting.value)
@@ -222,6 +224,7 @@ const submitEvent = () => {
   emit('close', {
     emitData,
     loadPageRule: loadPageRule.value,
+    multiCopyTesting: multiCopyTesting.value
   })
 }
 const handleSelectionChange = (val) => {
@@ -232,11 +235,40 @@ const AccMinprogramChange = (obj) => {
 }
 
 /**初始化 */
-const initFun = (flag, select, last_ad_list) => {
-  console.log(select, last_ad_list)
+const initFun = (flag, select, last_ad_list, feedback?) => {
   visible.value = flag
   allocation.value = select;
-  last_ad_show_list.value = last_ad_list
+  last_ad_show_list.value = last_ad_list || []
+
+  if(feedback){//回显
+    let feedbackObj = _.cloneDeep(feedback)
+      loadPageRule.value = feedbackObj.loadPageRule || 0
+      multiCopyTesting.value = feedbackObj.multiCopyTesting || 0
+      if(feedbackObj.data){
+        if(multiCopyTesting.value == 0) {//分账户选择不开启
+          let arr:any = [] 
+          for(let key in feedbackObj.data){
+            if(feedbackObj.data[key] && Array.isArray(feedbackObj.data[key])){
+              feedbackObj.data[key].forEach((item) => {
+                if(arr.filter((v)=>v.id == item?.id).length == 0){
+                  arr.push(item)
+                }
+              });
+            }
+          }
+          nextTick(()=>{
+            if(LandPageListRef.value){
+              LandPageListRef.value.feedbackEvent(arr)
+            }
+          })
+         
+        }else{
+
+        }
+      }
+      
+    }
+
   nextTick(()=>{
     let acc_select_count_2:any = {}
     props.accIdsList.forEach((item)=>{

src/components/businessMoudle/batchGdt/configArea/landPage/landPageList.vue

@@ -15,7 +15,7 @@
       </div>
       <div class="selected-text ml-10">已选择<span class="highlight">{{ multipleSelection?.length || 0 }}</span>条</div>
     </div>
-    <el-table ref="multipleTableRef" :row-key="(row)=>row.appid" :data="listData" border height="42vh" :header-row-style="headerRowStyle"
+    <el-table ref="multipleTableRef" :row-key="(row)=>row.id" :data="listData" border height="42vh" :header-row-style="headerRowStyle"
       :header-cell-style="headerCellStyle" :cell-style="cellStyle" @selection-change="handleSelectionChange"
       @select-all="handleSelectionAllChange">
       <el-table-column align="center" type="selection" reserve-selection width="55" fixed="left"
@@ -49,6 +49,7 @@ import clipboard3 from 'vue-clipboard3'
 import to from 'await-to-js'
 import { ElMessage } from 'element-plus'
 import { getAdcreativesLandingPageList } from './ts/api'
+import _ from 'lodash';
 
 const props = withDefaults(defineProps<{
   page_type: string,
@@ -128,7 +129,7 @@ const handleSelectionAllChange = (selection) => {
   emit('callBack', selection)
 }
 const selectableEvent = (row) => {
-  if (multipleSelection.value.map((v) => { return v.appid }).includes(row.appid)) {
+  if (multipleSelection.value.map((v) => { return v.id }).includes(row.id)) {
     return true
   }
   if (multipleSelection.value?.length == props.select_count && props.select_count != -1) {
@@ -171,6 +172,24 @@ watch([
   }
 }, { immediate: true})
 
+
+/** S 暴露自己的属性供父组件使用 */ 
+const feedbackEvent = (arr) => {
+  nextTick(async ()=>{
+    if(arr && Array.isArray(arr)){
+      await getList()
+      await multipleTableRef.value!.clearSelection()
+      arr.forEach((row) => {
+        multipleTableRef.value?.toggleRowSelection(row, true)
+      })
+    }
+  })
+}
+defineExpose({
+  feedbackEvent
+});
+/** E 暴露自己的属性供父组件使用 */ 
+
 </script>
 <style scoped lang="scss">
 .content-wrap {

src/components/businessMoudle/batchGdt/configArea/strategyGroups/saveDialog.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-dialog class="gdt-dialog" :close-on-click-modal="false" v-model="visible" title="保存策略组" width="1000px" top="40px"
+  <el-dialog class="gdt-dialog" :close-on-click-modal="false" :destroy-on-close="true" v-model="visible" title="保存策略组" width="1000px" top="40px"
     :before-close="handleClose">
     <div v-loading="loading" class="container">
-      <tempalte v-if="groupsInfo?.pageInfo?.groupsConfig?.id">
+      <div v-if="groupsInfo?.pageInfo?.groupsConfig?.id">
         <div class="block-title">保存方式</div>
         <div class="lock-wrapper lock-bt-wrapper" style="border:none;padding-top:0">
           <div :class="['lock-bt', 'lock-module', 1 == groupsInfo.saveMode && 'lock-module-active']"
@@ -20,8 +20,8 @@
             <span class="rMar3">更新当前策略组</span>
           </div>
         </div>
-      </tempalte>
-      <template v-if="groupsInfo.saveMode == 1">
+      </div>
+      <div v-if="groupsInfo.saveMode == 1">
         <div class="block-title">常用模版</div>
         <div class="lock-wrapper lock-bt-wrapper" style="border:none;padding-top:0">
           <div :class="['lock-bt', 'lock-module', key == groupsInfo.commonTemplates && 'lock-module-active']"
@@ -29,7 +29,7 @@
             <span class="rMar3">{{ item.name }}</span>
           </div>
         </div>
-      </template>
+      </div>
       <div class="block-title">选择需要锁定的内容信息</div>
       <div class="part-wrapper">
         <div class="filter-selectors">

src/components/businessMoudle/batchGdt/configArea/ts/material.ts

@@ -6,7 +6,7 @@ import _ from 'lodash'
 export function materialDeclare() {
   const CreativeMaterialRef = ref<{
     switchShow: (val: boolean, isEdit: boolean, arr: any, testNew_text:any) => void,
-    clearAllEvent: () => void, creatice_reuseEvent: () => void, deleAcEvent: (arr: any, haveAssign: boolean) => void
+    clearAllEvent: () => void, creatice_reuseEvent: (obj) => void, deleAcEvent: (arr: any, haveAssign: boolean) => void
   }>()
   const cMaterial = reactive<reactiveTableAndAny>({
     list: [],

src/components/businessMoudle/batchGdt/configArea/ts/strategyGroups.ts

@@ -9,10 +9,12 @@ interface IStrategyGroupsEvent {
   getAdPresetsInfo: (...args: any[]) => void,
   updateHaveContent: (...args: any[]) => void,
   clearOriginalityInfo: (...args: any[]) => void,
+  computeCount: (...args: any[]) => void,
   [propName: string]: any
 }
 
 export const strategyGroupsEvent = ({
+  DirectPacketExhibitionRef,
   LandPageRef,
   CopywriterRef,
   originalityBasicInfoData,
@@ -26,13 +28,14 @@ export const strategyGroupsEvent = ({
   aNewConfigEvent,
   getAdPresetsInfo,
   updateHaveContent,
-  clearOriginalityInfo
+  clearOriginalityInfo,
+  computeCount
 }: IStrategyGroupsEvent) => {
   const StrategyGroupsListRef = ref()
   const StrategyGroupsDialogRef = ref()
   /**打开策略组列表 */
   const openStrategyGroups = () => {
-    StrategyGroupsListRef.value?.initFun(true, pageInfo.groupsConfig)
+    StrategyGroupsListRef.value?.initFun(true, pageInfo.groupsConfig, pageInfo.last_ad_show_list)
   }
 
   /**打开保存策略组弹框 */
@@ -69,9 +72,8 @@ export const strategyGroupsEvent = ({
     })
     getStrategyDetail({
       id: info.id
-    }).then((res: any) => {
+    }).then(async (res: any) => {
       loading.close()
-      console.log('111', res)
       if (res.rule_conf) {//规则配置
         pageInfo.RuleConfigObj = JSON.parse(res.rule_conf)
       }
@@ -101,6 +103,9 @@ export const strategyGroupsEvent = ({
       }
       if(res?.targetings_info){//定向包
         pageInfo.directObj = JSON.parse(res?.targetings_info)
+        if(DirectPacketExhibitionRef.value && DirectPacketExhibitionRef.value[0]){
+          DirectPacketExhibitionRef.value[0].feedbackEvent(pageInfo.directObj)
+        }
       }
       if(res?.creative_info){//创意素材
         let creative_info = JSON.parse(res?.creative_info)
@@ -114,6 +119,7 @@ export const strategyGroupsEvent = ({
           CopywriterRef.value[0].feedbackEvent(_.cloneDeep(pageInfo.copywriterInfoData))
         }
       }
+      await computeCount()
       if(res?.landing_page){//落地页
         pageInfo.copyLandPageInfoData = JSON.parse(res?.landing_page)
         if(LandPageRef.value && LandPageRef.value[0]){

src/components/capsulationMoudle/tableList.vue

@@ -158,15 +158,15 @@ const clearSelected = () => {
 // 切换选择
 const toggleSelected = (rows?:any,flag?:boolean) => {
   nextTick(()=>{
-    if (rows&&rows.length>0) {
+    if (rows&&rows.length>0 && props.tableData && props.tableData.length > 0) {
       rows.forEach((row) => {
-        tableRef.value!.toggleRowSelection(
+        tableRef.value?.toggleRowSelection(
             props.tableData.find(n=>{
               return n[props.rowKeyStr] == row[props.rowKeyStr]
             }), flag)
       })
     }else{
-      tableRef.value!.clearSelection()
+      tableRef.value?.clearSelection()
     }
   })
 }