Merge branch 'xinyan' into test

src/views/efTools/automation/components/adActivityDialog.vue

@@ -82,7 +82,7 @@ const selectedColumns = computed(() => [
 ]);
 
 const treeProps = computed(() => {
-  activeModel.value = 'specified';
+  // activeModel.value = 'specified';
   if (activeModel.value === 'adGroup' || activeModel.value === 'specified') {
     return {
       rowField: 'campaignId',
@@ -129,6 +129,8 @@ const gridOptions = reactive({
   ]),
   data: []
 });
+console.log('gridOptions', gridOptions);
+console.log('activeModel', activeModel.value);
 
 function handleCurrentChange(newPage) {
   currentPage.value = newPage;
@@ -555,7 +557,7 @@ onMounted(() => {
                 @click="handleSelectTarget(row)">
               选择定向
             </el-button>
-            <span v-else-if="row.adGroupName">已选择定向</span>
+            <span v-else-if="row.adGroupName && activeModel==='specified'">已选择定向</span>
             </span>
           </template>
           <template #checkbox_header="{ checked, indeterminate }">