.

src/api/ApiModel.ts

@@ -6,6 +6,9 @@ import {getCookie} from "@/common/common";
 export interface Objectof<v>{ // 对象类型
     [_:string]:v
 }
+export interface ANYELSE {
+    [propName:string]:any
+}
 export class descolObjectItem{
     name?: string;
     column?: string;
@@ -154,7 +157,7 @@ export interface directPacket extends pageParams{
     type?:string,
     targeting_id?:string
 }
-export interface ruleConfig{
+export interface ruleConfig extends ANYELSE{
     account_assign?:string|number,
     assign_type?:string|number,
     campaign_name?:string|number,

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

@@ -14,6 +14,7 @@
         {{id}}
 
         <Input class="bMar20" ref="InputRef_name" spanTitleWidth="112px" :showTitle="true" title="定向包名称" inputWidth="400px" maxLength="15"/>
+
         <template v-for="item in pageInfo.jsonInfo">
           {{item.value}}
           <CheckGroup v-if="item.isMultiple" :checkList="item.list"
@@ -21,17 +22,17 @@
                       :haveFlex="item.haveFlex"
                       :title="item.name"
                       :key="item.EgName"
-                      :echoVal="item.value"
+                      :echoVal="item.radioVal"
                       :id="id"
-                      @returnEvent="(val,flag)=>reEventCheck(val,item,flag)"></CheckGroup>
+                      @returnEvent="val=>{item.radioVal = val;getEstimation()}"></CheckGroup>
           <RadioGroup v-else :radioList="item.list"
                       :title="item.name"
                       :haveNotes="item.haveNotes"
                       :haveFlex="item.haveFlex"
                       :key="item.EgName"
-                      :echoVal="item.value"
+                      :echoVal="item.radioVal"
                       :id="id"
-                      @returnEvent="(val,flag)=>reEvent(val,item,flag)">
+                      @returnEvent="val=>reEventRadio(val,item)">
             <template v-if="item.EgName=='geo_location'" v-slot:appoint>
               <div class="tMar20">
                 <el-checkbox-group v-model="pageInfo.locationCheckList">
@@ -42,7 +43,7 @@
 
             <template v-if="item.EgName=='age'" v-slot:appoint>
               <div class="tMar20">
-                <el-input-number v-model="age_min" :min="14" :max="66" @change="ageEvent(item)"/> - <el-input-number v-model="age_max" :min="63" :max="66"  @change="ageEvent(item)"/>
+                <el-input-number v-model="item.value.min" :min="14" :max="66" @change="getEstimation"/> - <el-input-number v-model="item.value.min" :min="63" :max="66"  @change="getEstimation"/>
               </div>
             </template>
 
@@ -86,7 +87,7 @@
 </template>
 <script setup lang="ts">
 import {computed, getCurrentInstance, inject, nextTick, onMounted, reactive, ref} from "vue";
-import { directPacket, reactiveTableAndAny} from "@/api/ApiModel";
+import {directPacket, menuParam, reactiveTableAndAny} from "@/api/ApiModel";
 import Dialog from '@/components/capsulationMoudle/_dialog.vue'
 import RadioGroup from '@/components/businessMoudle/batchGdt/configArea/radioGroup.vue'
 import CheckGroup from '@/components/businessMoudle/batchGdt/configArea/checkGroup.vue'
@@ -120,6 +121,7 @@ const props = withDefaults(defineProps<{
 //得到上边传来的值
 const inject_accountId = inject('accountId')
 
+
 const pageInfo = reactive<reactiveTableAndAny>({
   transformation_behavior_list:[],
   locationCheckList:[],
@@ -133,40 +135,47 @@ const pageInfo = reactive<reactiveTableAndAny>({
   jsonInfo:[
     {
       isMultiple:false,
-      value:{},
       name:'地域',
       EgName:'geo_location',
       list:[
         {name:'不限',value:'unlimited'},
         {name:'指定区域',value:'appoint'},
-      ]
+      ],
+      radioVal:'unlimited',
+      value:[],
     },
     {
       isMultiple:false,
-      value:{},
       name:'年龄',
       EgName:'age',
       list:[
         {name:'不限',value:'unlimited'},
         {name:'指定',value:'appoint'},
-      ]
+      ],
+      radioVal:'unlimited',
+      value:[{
+        min:14,
+        max:63
+      }],
     },
     {
       isMultiple:false,
-      value:{},
       name:'性别',
       EgName:'gender',
       list:[
         {name:'不限',value:'unlimited'},
         {name:'男性',value:'MALE'},
         {name:'女性',value:'FEMALE'},
-      ]
+      ],
+      radioVal:'unlimited',
+      value:[],
     },
     {
       isMultiple:true,
       value:[],
       name:'学历',
       EgName:'education',
+      radioVal:'',
       list:[
         {name:'博士',value:'DOCTOR'},
         {name:'硕士',value:'MASTER'},
@@ -330,7 +339,7 @@ const InputRef_name = ref<{value:string}>()
 const age_min = ref<number>(14)
 const age_max = ref<number>(66)
 const ageEvent = (item:any) => {
-  item.value.subValue = age_min.value + '至' + age_max.value + '岁'
+  // item.value.subValue = age_min.value + '至' + age_max.value + '岁'
   getEstimation()
 }
 //排除已转化用户
@@ -340,6 +349,11 @@ const behaviorEvent = (val:any,item:any) => {
   getEstimation()
 }
 
+//回显值 RadioGroup
+const reEventRadio = (val:string,item:any) => {
+  item.radioVal = val
+  getEstimation()
+}
 
 //回显值 RadioGroup
 const reEvent = (val:any,item:any,flag?:boolean) => {

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

@@ -64,7 +64,7 @@
   </div>
 
   <!--规则配置-->
-  <RuleConfig ref="RuleConfigRef"></RuleConfig>
+  <RuleConfig ref="RuleConfigRef" @ExposeEvent="val=>pageInfo.RuleConfigObj = val"></RuleConfig>
 
 <!-- 广告基本信息 -->
 <BasicInfo :visible="basicInfoData.visible" :dataFillBack="basicInfoData.fillBack" @close="basicInfoClose"></BasicInfo>
@@ -72,7 +72,7 @@
 </template>
 <script setup lang="ts">
 import {getCurrentInstance, nextTick, onMounted, reactive, ref, provide, computed,toRef} from "vue";
-import {adqParam, reactiveTableAndAny} from "@/api/ApiModel";
+import {adqParam, reactiveTableAndAny, ruleConfig} from "@/api/ApiModel";
 import Select from '@/components/capsulationMoudle/_select.vue'
 import DirectPacketExhibition from '@/components/businessMoudle/batchGdt/configArea/directPacket/echoIndex.vue'
 import RuleConfig from '@/components/businessMoudle/batchGdt/configArea/ruleConfig/index.vue'
@@ -89,7 +89,6 @@ const { proxy } = getCurrentInstance() as any;
 const NumberHandle = proxy.$NumberHandle
 
 
-
 const pageInfo = reactive<reactiveTableAndAny>({
   adNum:0,
   targetList:[],
@@ -108,6 +107,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
   accountList:[],
   accIdsList:[],//选中的格式化后的账户列表
   directObj:{},//定向包展示的数据
+  RuleConfigObj:{},//规则配置的值
 })
 
 
@@ -209,9 +209,21 @@ onMounted(()=>{
   nextTick(()=>{
     get_account_list()
     getAdPresetsInfo(); // 广告预存信息获取
+    get_ruleConfig_info() //规则配置获取
   })
 })
 
+// 得到规则配置的值
+const get_ruleConfig_info = async () => {
+  let res:any = await proxy.$http.get(Api.ruleConfig_get)
+  if(res&&res.errNo=='0'){
+    let resNew:any = res.rst
+    pageInfo.RuleConfigObj = resNew
+  }else{
+    ElMessage.error(res.errMsg)
+  }
+}
+
 /**广告基础信息回调 */
 const basicInfoClose = (obj) => {
   if(obj?.type=='update'){

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

@@ -6,7 +6,7 @@
       <template v-if="radioList&&radioList.length>0">
         <div :class="haveFlex ? 'haveFlex' : ''">
           <div class="flex">
-            <el-radio-group v-model="value" @change="val=>returnValueEvent(true)">
+            <el-radio-group v-model="value" @change="val=>returnValueEvent">
               <el-radio-button v-for="item in radioList" :label="item.value" :disabled="item.disabled" :title="item.disTitle">{{item.name}}</el-radio-button>
             </el-radio-group>
             <Tooltip v-if="toolTipsVal" :notes="toolTipsVal" effect="light" popperClass="wid400"/>
@@ -27,11 +27,11 @@
 
 </template>
 <script lang="ts" setup>
-import {nextTick, onMounted, ref, watch} from "vue";
+import { ref, watch} from "vue";
 import Tooltip from '@/components/capsulationMoudle/_tooltip.vue'
 
 const emit = defineEmits<{
-  (event: "returnEvent", val: string | number | boolean,flag?:boolean): void;
+  (event: "returnEvent", val: string | number | boolean): void;
 }>();
 
 const value=ref('')
@@ -47,7 +47,7 @@ const props = withDefaults(defineProps<{
   alignItems?:string,
   haveFlex?:boolean,
   toolTipsVal?:string,
-  echoVal?:any,
+  echoVal?:string,
   id?:string|number,
 }>(),{
   spanTitleWidth: '',
@@ -60,44 +60,20 @@ const props = withDefaults(defineProps<{
   alignItems:'center',
   haveFlex:false,
   toolTipsVal:'',
-  echoVal:{},
+  echoVal:'',
   id:''
 })
 
-
-
 //返回值
-const returnValueEvent = (flag?:boolean)=>{
-  let reVal:any = {}
-  props.radioList.forEach(item=>{
-    if(value.value == item.value){
-      reVal = item
-    }
-  })
-  emit('returnEvent',reVal,flag)
+const returnValueEvent = ()=>{
+  emit('returnEvent',value.value)
 }
 
-
-// 暴露自己的属性供父组件使用
-defineExpose({
-  value
-});
-
-onMounted(()=>{
-  nextTick(()=>{
-    if(props.radioList&&props.radioList.length>0){
-      value.value = props.radioList[0].value
-      if(!props.id) {
-        returnValueEvent(false)
-      }
-    }
-  })
-})
-
-watch(()=>props.id,()=>{
-  value.value = props.echoVal ? props.echoVal.value : props.radioList[0].value
-  // returnValueEvent(true)
+watch(()=>props.echoVal,()=>{
+  value.value = props.echoVal ? props.echoVal : props.radioList[0].value
+  emit('returnEvent',value.value)
 },{immediate:true,deep:true})
+
 </script>
 
 <style lang="scss" scoped>

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

@@ -2,7 +2,7 @@
   <Dialog
       :dialogVisible="dialogShow"
       @confirm="confirmEvent"
-      @close="dialogShow = false"
+      @close="closeEvent"
       width="700px"
       height="calc(100vh - 190px)"
       top="8px"
@@ -93,7 +93,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import {getCurrentInstance, nextTick, onMounted, reactive, ref} from "vue";
+import {getCurrentInstance, nextTick, onMounted, reactive, ref,watch} from "vue";
 import {reactiveTableAndAny, ruleConfig} from "@/api/ApiModel";
 import RadioGroup from '@/components/businessMoudle/batchGdt/configArea/radioGroup.vue'
 import Tooltip from '@/components/capsulationMoudle/_tooltip.vue'
@@ -106,6 +106,10 @@ const { proxy } = getCurrentInstance() as any;
 // 全局方法定义
 const NumberHandle = proxy.$NumberHandle
 
+const emit = defineEmits<{
+  (event: "ExposeEvent",val:ruleConfig): void;
+}>();
+
 const WildcardList = [
   {name:'定向包名',value:''},
   {name:'素材名',value:''},
@@ -123,6 +127,9 @@ const WildcardList = [
   {name:'账户ID',value:''},
 ]
 
+//处理抛出去的值
+const ExposeValue = ref<ruleConfig>({})
+//页面的值
 const pageInfo = reactive<reactiveTableAndAny>({
   jsonInfo:[
     {
@@ -304,6 +311,7 @@ const confirmEvent = async () => {
   ElMessage.info(res.errMsg)
   if(res&&res.errNo=='0'){
     let resNew:any = res.rst
+    ExposeValue.value = paramsModel
     dialogShow.value = false
   }
 }
@@ -315,6 +323,7 @@ const echoValue = async () => {
   loading.value = false
   if(res&&res.errNo=='0'){
     let resNew:any = res.rst
+    ExposeValue.value = resNew
     pageInfo.jsonInfo.forEach(item=>{
       let subValue:string|number = resNew[item.EgName]
       let key:string = item.EgName
@@ -341,6 +350,11 @@ const echoValue = async () => {
     ElMessage.error(res.errMsg)
   }
 }
+//关闭
+const closeEvent = () => {
+  dialogShow.value = false
+  emit('ExposeEvent',ExposeValue.value)
+}
 
 // 切换显隐
 const dialogShow = ref<boolean>(false)
@@ -350,6 +364,7 @@ const switchShow = (val:boolean)=>{
     echoValue()
   }
 }
+
 // 父组件共享值
 defineExpose({
   switchShow,