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

@@ -303,6 +303,7 @@ const switchShow = async (val:boolean,mtype:number,maxNum?:number)=>{
         obj.max_duration = video_tips.max_duration
         obj.file_types = video_tips.file_format
         pageInfo.ratio_size = video_tips.ratio_width + ':' + video_tips.ratio_height
+        pageInfo.min_size = video_tips.min_width + ' * ' + video_tips.min_height
       }else if(mtype == 2){ //封面
         obj.max_size = image_tips.file_size
         obj.file_types = image_tips.file_format

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

@@ -97,10 +97,10 @@ const typeRadioList = reactive<radioFace>({
   value:1,
   name:'素材类型',
   EgName:'type',
-  radioVal:props.propInfo.testNewType,
+  radioVal:'pic',
   list:[
-    {name:'图片',value:'pic',disabled:props.propInfo.testNewType !== 'pic'},
-    {name:'视频',value:'video',disabled:props.propInfo.testNewType !== 'video'},
+    {name:'图片',value:'pic'},
+    {name:'视频',value:'video'},
   ]
 })
 const formatRadioList = reactive<radioFace>({
@@ -134,6 +134,14 @@ const switchShow = (val:boolean,creativeNum:any)=>{
     nextTick(()=>{
       pageInfo.creativeNum = creativeNum
       formatRadioList.list[0].name = props.propInfo.text || '竖版视频9:16'
+      typeRadioList.radioVal = props.propInfo.testNewType
+      if(typeRadioList.radioVal == 'pic'){
+        typeRadioList.list[1].disabled = true
+        typeRadioList.list[0].disabled = false
+      }else{
+        typeRadioList.list[0].disabled = true
+        typeRadioList.list[1].disabled = false
+      }
       clearTimeout(requestObj.timer_get_upload_res)
       CataRef.value!.initAllAlbum()
     })

src/components/businessMoudle/batchGdt/configArea/creativeMaterial/ts/materialTs.ts

@@ -61,6 +61,7 @@ export function materialTs(mType?:number){
         chooseList_Item:[],//选中素材的整个obj
         collectList:[],
         ratio_size:'',
+        min_size:'',
         arr_image:[]
     })
 
@@ -98,11 +99,13 @@ export function materialTs(mType?:number){
 
     //获取尺寸列表
     const getSizeList = async () => {
-        const paramsModel = reactive<{ratio?:string}>({
-            ratio:''
+        const paramsModel = reactive<{ratio?:string,min_size?:string}>({
+            ratio:'',
+            min_size:''
         })
         if(mType){ //弹框
             paramsModel.ratio = pageInfo.ratio_size
+            paramsModel.min_size = pageInfo.min_size
         }
         let res:any = await proxy.$http.get(Api.sizeTypeList,paramsModel)
         if(res&&res.errNo=='0'){

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

@@ -17,7 +17,7 @@
                       :haveNotes="item.haveNotes"
                       :haveFlex="item.haveFlex"
                       :toolTipsVal="item.toolTipsVal"
-                      @returnEvent="val=>item.radioVal = val">
+                      @returnEvent="val=>returnEvent(val,item)">
             <template v-if="item.EgName=='campaign_name'" v-slot:immobilization>
               <div>
                 <wildcard :id="pageInfo.radioId" title="推广计划名称" @change="val=>{item.value = val}" :fillBack="item.value"></wildcard>
@@ -97,6 +97,8 @@ const emit = defineEmits<{
 
 //处理抛出去的值
 const ExposeValue = ref<ruleConfig>({})
+
+
 //页面的值
 const pageInfo = reactive<reactiveTableAndAny>({
   jsonInfo:[
@@ -121,7 +123,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
       //     '<b class="f-wei-600">按创意组分配</b>：相同创意组的广告分配到同一个推广计划中，创意组数量>账户数量时，创意组会平均分配给各个账户，创意组数量<账户数量时，创意组会被各个账户循环使用，推广计划数量=创意组数量(不受广告数上限影响时)；<br />' +
       //     '<b class="f-wei-600">按文案组分配</b>：相同文案组的广告分配到同一个推广计划中，文案组数量>账户数量时，文案组会平均分配给各个账户，文案组数量<账户数量时，文案组会被各个账户循环使用，推广计划数量=文案组数量(不受广告数上限影响时)；（仅文案组选择程序化测试时可用）',
       list:[
-        {name:'按定向包分组',value:'Directional_packet',notes:'部分无必填文案的创意形式，不支持使用按文案分配，会默认切换至按定向包分配',subValue:1},
+        {name:'按定向包分组',value:'Directional_packet',notes:'部分无必填文案的创意形式，不支持使用按文案分配，会默认切换至按定向包分配'},
         // {name:'按创意分组',value:'originality',notes:'部分无必填文案的创意形式，不支持使用按文案分配，会默认切换至按定向包分配',subValue:2},
         // {name:'按文案分组',value:'text',disabled:true,disTitle:'仅当文案的测试方式为程序化测试时可选',notes:'部分无必填文案的创意形式，不支持使用按文案分配，会默认切换至按定向包分配',subValue:3},
       ]
@@ -228,6 +230,14 @@ const handleCommand = (command: string | number | object,itemVal:any) => {
   itemVal.value = itemVal.value + '_<'+command+'>'
 }
 
+const returnEvent = (val:any,item:any) => {
+  item.radioVal = val
+  if(item.list?.length>0){//切换radio
+    let idx:number = item.list.findIndex(n=>n.value == val)
+    item.value = item.list[idx].subValue
+  }
+}
+
 const loading = ref<boolean>(false)
 const confirmEvent = async () => {
   let arr:any = pageInfo.jsonInfo
@@ -287,7 +297,11 @@ const confirmEvent = async () => {
   }else if(Number(paramsModel.total_budget)<50 && Number(paramsModel.total_budget)!==0){
     ElMessage.error('推广总预算需大于50')
     return
+  }else if(Number(paramsModel.start_day)<1 && Number(paramsModel.start_day)>5 && Number(paramsModel.total_budget)!==0){
+    ElMessage.error('投放开始日期范围为1-5')
+    return
   }
+
   loading.value = true
   let res:any = await proxy.$http.post(Api.ruleConfig_set,paramsModel)
   loading.value = false
@@ -309,15 +323,24 @@ const echoValue = async () => {
     ExposeValue.value = resNew
     pageInfo.jsonInfo.forEach(item=>{
       let val:string|number = resNew[item.EgName]
-      item.value = val
-      if(item.haveAppoint){//需要指定
-        item.radioVal = (!val || val=='0.00') ? 'unlimited' : 'appoint'
-      }else{
-        if(item.list && item.list.length>0){//切换radio
-          let idx:number = item.list.findIndex(n=>n.subValue == val)
-          item.radioVal = item.list[idx].value
+      if(item.EgName == 'account_assign' || item.EgName == 'assign_type'
+          || item.EgName == 'campaign_name' || item.EgName == 'dynamic_num'
+          || item.EgName == 'campaign_ad_max' || item.EgName == 'adcreative_max'){
+        item.value = val
+      }else if(item.EgName == 'campaign_status' || item.EgName == 'ad_status' || item.EgName == 'speed_mode'){
+        item.value = val
+        let idx:number = item.list.findIndex(n=>n.subValue == val)
+        item.radioVal = item.list[idx].value
+      }else if(item.EgName == 'daily_budget' || item.EgName == 'total_budget' || item.EgName == 'start_day'){
+        if(Number(val) > 0){
+          item.list[1].subValue = val
+          returnEvent('appoint',item)
+        }else{
+          item.radioVal = 'unlimited'
+          item.value = 0
         }
       }
+
     })
   }else{
     ElMessage.error(res.errMsg)

src/components/businessMoudle/gdtList/advert.vue

@@ -24,8 +24,8 @@
     <div  v-loading="loading">
       <div class="bMar10 flex">
         <Dropdown title="批量操作" :list="tableInfo.moreList" @close="dropdownEvent" class="rMar10"
-                  :disabledFlag="tableInfo.multipleSelection&&tableInfo.multipleSelection.length == 0"></Dropdown>
-        <div>已选 : <span>{{tableInfo.multipleSelection&&tableInfo.multipleSelection.length}}</span></div>
+                  :disabledFlag="tableInfo.multipleSelection?.length == 0"></Dropdown>
+        <div>已选 : <span>{{tableInfo.multipleSelection?.length}}</span></div>
         <div  class="lMarauto">
           <Indicators type="ad_base" @refresh="init"></Indicators>
         </div>
@@ -99,12 +99,25 @@
                         <span v-else-if="scope.row[item.key_value] == 'SPEED_MODE_FAST'">加速投放</span>
                         <span v-else>-</span>
                       </div>
+
                       <div v-else-if="item.key_value == 'operate'">
                         <div class="flex">
-<!--                          <span class="c-theme pointer" @click="copyEvent(scope.row)">复制</span>-->
-                          <span class="c-theme pointer lMar10" @click="goDetial(scope.row)">详情</span>
+                          <span class="c-theme pointer" @click="goDetial(scope.row)">详情</span>
+                          <span class="lMar10"
+                                :class="scope.row.configured_status == 'AD_STATUS_NORMAL' ? 'pointer-drop c-green-opa' : 'pointer c-green'"
+                                @click="scope.row.configured_status == 'AD_STATUS_SUSPEND'&&batchPlanEvent(scope.row,1)">启用</span>
+                        </div>
+                        <div>
+                        <span :class="scope.row.configured_status == 'AD_STATUS_SUSPEND' ? 'pointer-drop c-red-opa' : 'pointer c-red'"
+                              @click="scope.row.configured_status == 'AD_STATUS_NORMAL'&&batchPlanEvent(scope.row,2)">禁用</span>
+                          <Popconfirm key="dele" @confirm="batchPlanEvent(scope.row,3)" :slotFlag="true">
+                            <template #con>
+                              <span class="pointer lMar10">删除</span>
+                            </template>
+                          </Popconfirm>
                         </div>
                       </div>
+
                       <div class="flex c-theme" v-else-if="item.key_value == 'daily_budget'">
                         {{scope.row[item.key_value] ? NumberHandle(scope.row[item.key_value]) : '不限'}}
                       </div>
@@ -176,6 +189,7 @@ import Indicators from './indicators/index.vue'
 import {commonlistTs} from "@/components/businessMoudle/ts/commonList";
 import {getCurrentTime} from "@/common/common";
 import _ from "lodash";
+import Popconfirm from '@/components/capsulationMoudle/_popconfirm.vue'
 
 
 const { proxy } = getCurrentInstance() as any;
@@ -210,7 +224,7 @@ const tableInfo = reactive<reactiveTableAndAny>({
     {value:'4',label:'修改日预算'},
     {value:'5',label:'修改出价'},
     {value:'6',label:'深度优化出价'},
-    {value:'7',label:'期望roi'},
+    {value:'7',label:'期望ROI'},
     {value:'8',label:'推广日期'},
     {value:'9',label:'投放时段'},
     {value:'10',label:'开启一键起量'},
@@ -225,6 +239,16 @@ const tableInfo = reactive<reactiveTableAndAny>({
   sortType:'',
 })
 
+const batchPlanEvent = async (row?:any,val?:any) => {
+  loading.value = true
+  let infos:any = []
+  infos.push({
+    account_id:row.account_id,
+    adgroup_id:row.adgroup_id
+  })
+  batchEventApi(infos,val)
+}
+
 const batchEventApi = async (infos?:any,flag?:any,flagVal?:any,callback?:any) => {
   const paramsModel = reactive<batchGdt_ads_edit>({
     infos:JSON.stringify(infos),
@@ -246,8 +270,8 @@ const batchEventApi = async (infos?:any,flag?:any,flagVal?:any,callback?:any) =>
 //得到新的符合条件的数组
 const getNewArr = (key:string,val?:any) => {
   let arr:any = []
-  tableInfo.multipleSelection.findIndex(item=>{
-    if(item[key] == val){
+  tableInfo.multipleSelection.forEach(item=>{
+    if(item[key] == val || !item[key]){}else{
       arr.push(item)
     }
   })
@@ -266,9 +290,17 @@ const dropdownEvent = (val: string | number | object) => {
   if(val == 4){ //修改日预算
     BatchEditDayBudgetRef.value!.switchShow(true,tableInfo.multipleSelection)
   }else if(val == 6){ // 深度优化出价
-    EditDeepBidRef.value!.switchShow(true,tableInfo.multipleSelection)
+    if(getNewArr('deep_bid_amount',0)?.length == 0){
+      ElMessage.error('所选暂无深度优化出价')
+      return
+    }
+    EditDeepBidRef.value!.switchShow(true,getNewArr('deep_bid_amount',0))
   }else if(val == 7){ // 期望roi
-    EditExpectedRoiRef.value!.switchShow(true,tableInfo.multipleSelection)
+    if(getNewArr('deep_conversion_worth_roi',0)?.length == 0){
+      ElMessage.error('所选暂无期望ROI')
+      return
+    }
+    EditExpectedRoiRef.value!.switchShow(true,getNewArr('deep_conversion_worth_roi',0))
   }else if(val == 10){ // 开启一键起量
     if(getNewArr('auto_acquisition_enabled',0)?.length == 0){
       ElMessage.error('所选暂无关闭状态的一键起量')
@@ -435,6 +467,17 @@ const singleChooseCheckboxEvent = (idx:number,row:any)=>{
   }
 }
 
+//清空
+const clearEvent = () => {
+  nextTick(()=>{
+    InputRef_text.value!.value = ''
+    acRef.value!.value = []
+    statusRef.value!.value = ''
+    timeRef.value!.dateVal = ''
+    init()
+  })
+}
+
 
 const {
   init_acList,
@@ -443,7 +486,6 @@ const {
   acRef,
   statusRef,
   InputRef_text,
-  clearEvent,
   tableHeaderStyle,
   init_ad_statusList
 } = listTs()

src/components/businessMoudle/gdtList/advertBatch/batchEditDayBudget.vue

@@ -8,7 +8,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <div class="bMar20 f13">已选{{pageInfo.chooseList?.length || 0}}条广告</div>
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <RadioGroup :radioList="RadioList.list"
                     :echoVal="RadioList.radioVal"
                     :title="RadioList.name"

src/components/businessMoudle/gdtList/advertBatch/editBid.vue

@@ -7,7 +7,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <div class="bMar20 f13">已选{{pageInfo.chooseList?.length || 0}}条广告</div>
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <Input ref="nameRef" title="修改出价" :placeholderTxt="title"/>
       </div>
     </template>

src/components/businessMoudle/gdtList/advertBatch/editDeepBid.vue

@@ -8,7 +8,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <div class="bMar20 f13">已选{{pageInfo.chooseList?.length || 0}}条广告</div>
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <RadioGroup :radioList="RadioList.list"
                     :echoVal="RadioList.radioVal"
                     :title="RadioList.name"

src/components/businessMoudle/gdtList/advertBatch/editExpectedRoi.vue

@@ -8,7 +8,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <div class="bMar20 f13">已选{{pageInfo.chooseList?.length || 0}}条广告</div>
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <RadioGroup :radioList="RadioList.list"
                     :echoVal="RadioList.radioVal"
                     :title="RadioList.name"
@@ -92,7 +92,7 @@ const confirmEvent = async () => {
     }
   }else {
     pageInfo.chooseList.forEach(i=>{
-      if(!i.deep_bid_amount_edit){
+      if(!i.deep_conversion_worth_roi_edit){
         isKong = true
       }
     })

src/components/businessMoudle/gdtList/advertBatch/editPromoteDate.vue

@@ -7,7 +7,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <div class="bMar20 f13">已选{{pageInfo.chooseList?.length || 0}}条广告</div>
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <!-- 投放日期 -->
         <MyRadio :info="RadioList" :fillBack="props.dataFillBack['date_model']" @change="radioChange">
           <!-- 投放日期 -->

src/components/businessMoudle/gdtList/advertBatch/editPutTime.vue

@@ -8,6 +8,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <!-- 投放时段 -->
         <MyRadio :info="RadioList" :fillBack="props.dataFillBack['time_series_type']"
                  @change="radioChange">

src/components/businessMoudle/gdtList/advertBatch/oneClickMeasure.vue

@@ -8,7 +8,7 @@
       :dialog-title="title">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <div class="bMar20 f13">已选{{pageInfo.chooseList?.length || 0}}条广告</div>
+        <div class="bMar20 f13">已选 <span class="f-wei-600">{{pageInfo.chooseList?.length || 0}}</span> 条广告</div>
         <RadioGroup :radioList="RadioList.list"
                     :echoVal="RadioList.radioVal"
                     :title="RadioList.name"

src/components/businessMoudle/gdtList/plan.vue

@@ -117,7 +117,6 @@
                               <span class="pointer lMar10">删除</span>
                             </template>
                           </Popconfirm>
-
                         </div>
                       </div>
                       <div class="flex c-theme pointer" v-else-if="item.key_value == 'daily_budget'" @click="editPlanEvent(scope.row)">
@@ -235,7 +234,6 @@ const batchPlanEvent = async (row?:any,val?:any) => {
     campaign_id:row.campaign_id
   })
   batchPlanApi(arr,val)
-
 }
 const dropdownEvent = (val: string | number | object) => {
   loading.value = true
@@ -292,6 +290,12 @@ const init = async (page?:any,totalPages?:any) => {
     if(totalPages){
       tableInfo.tableList_all = res.rst.data.list
     }else{
+      tableInfo.total = res.rst.pageInfo.total
+      tableInfo.totalPages = res.rst.pageInfo.total
+      if(!res.rst.data){
+        tableInfo.tableList = []
+        return
+      }
       tableInfo.summary = res.rst.data.summary
       tableInfo.summary[0].campaign_name = '合计(缓存时间:' + getCurrentTime() + ')'
       tableInfo.descol = []
@@ -304,8 +308,6 @@ const init = async (page?:any,totalPages?:any) => {
       tableInfo.descol = res.rst.data.explain;
       tableInfo.descol.splice(1,0,{label:'操作',key_value:'operate',disabled:1,sub:[{label:'',key_value:'operate',disabled:1}]})
       tableInfo.tableList = res.rst.data.list
-      tableInfo.total = res.rst.pageInfo.total
-      tableInfo.totalPages = res.rst.pageInfo.total
     }
   }else{
     ElMessage.error(res.errMsg)
@@ -369,7 +371,16 @@ const singleChooseCheckboxEvent = (idx:number,row:any)=>{
     tableInfo.chooseAll = false
   }
 }
-
+//清空
+const clearEvent = () => {
+  nextTick(()=>{
+    InputRef_text.value!.value = ''
+    acRef.value!.value = []
+    statusRef.value!.value = ''
+    timeRef.value!.dateVal = ''
+    init()
+  })
+}
 
 const {
   init_acList,
@@ -378,7 +389,6 @@ const {
   acRef,
   statusRef,
   InputRef_text,
-  clearEvent,
   tableHeaderStyle,
   planEditIptRef,
   TargetEditRef,

src/components/businessMoudle/gdtList/ts/list.ts

@@ -3,6 +3,7 @@ import {getCurrentInstance, nextTick, reactive, ref} from "vue";
 import {adqParam, reactiveTableAndAny} from "@/api/ApiModel";
 import {Api} from "@/api/api";
 import {ElMessage} from "element-plus";
+import http from "@/http/http";
 export function listTs(){
     const { proxy } = getCurrentInstance() as any;
 // 全局方法定义
@@ -66,12 +67,12 @@ export function listTs(){
 
 //清空
     const clearEvent = () => {
-      nextTick(()=>{
-          InputRef_text.value!.value = ''
-          acRef.value!.value = []
-          statusRef.value!.value = ''
-          timeRef.value!.dateVal = ''
-      })
+        nextTick(()=>{
+            InputRef_text.value!.value = ''
+            acRef.value!.value = []
+            statusRef.value!.value = ''
+            timeRef.value!.dateVal = ''
+        })
     }
 
     //打开自定义指标