12.6.1 优化

src/views/rai_manage/activityManage/components/addActivity.vue

@@ -18,7 +18,7 @@
           <el-select placeholder="请选择活动类型" :disabled="!isShowSelect" clearable v-model="cactivityType" @change="activityTypeDetail" style="width: 360px">
             <el-option v-for="item in cactivityTypeList" :label="item.ActivityTypeName" :key="item.ActivityTypeId" :value="item.ActivityTypeId"></el-option>
           </el-select>
-          <template v-if="isResearch">
+          <template>
             <el-radio style="margin-left: 30px" v-model="areaType" :label="1">国内</el-radio>
             <el-radio v-model="areaType" :label="2">海外</el-radio>
           </template>

src/views/rai_manage/cygxManage/components/lableDlg.vue

@@ -61,9 +61,17 @@ export default {
       return str;
     },
   },
-  watch: {},
+  watch: {
+    showRegularDlg: {
+      handler(newVal) {
+        if (newVal) {
+          newVal && this.getInitList();
+        }
+      },
+    },
+  },
   created() {},
-  mounted() {},
+  async mounted() {},
   methods: {
     handleClose() {
       this.querySearchList = [];
@@ -122,6 +130,17 @@ export default {
         }
       });
     },
+    async getInitList() {
+      const res = await raiInterface.tagHot_activityList();
+      if (res.Ret === 200 && res.Data.List.length > 0) {
+        res.Data.List.forEach((item) => {
+          this.addDataList.push({
+            name: item.ActivityName + "，" + item.ActivityTime,
+            id: item.ActivityId,
+          });
+        });
+      }
+    },
   },
 };
 </script>