diff --git a/src/components/Activity/ActivityAdd.vue b/src/components/Activity/ActivityAdd.vue
index ab547ca..2c34301 100644
--- a/src/components/Activity/ActivityAdd.vue
+++ b/src/components/Activity/ActivityAdd.vue
@@ -213,7 +213,7 @@ export default {
     return {
       formItemLayout,
       tailItemLayout,
-      form: this.$form.createForm(this, { name: 'r-d-add' }),
+      form: this.$form.createForm(this, { name: 'activity-add' }),
       types: [
         { id: 0, name: '路演' },
         { id: 1, name: '沙龙' },
diff --git a/src/components/Activity/ActivityDate.vue b/src/components/Activity/ActivityDate.vue
index b077d99..5df2288 100644
--- a/src/components/Activity/ActivityDate.vue
+++ b/src/components/Activity/ActivityDate.vue
@@ -1,119 +1,134 @@
 <template>
   <div class="main flex-1">
-    <div style="width:100%" v-if="lists && lists.length > 0">
-      <a-table
-        :columns="columns"
-        :data-source="lists"
-        :loading="loading"
-        :pagination="pagination"
-        :row-key="record => record.activityId"
-        :scroll="{ y: height }"
-        @change="handleTableChange"
-        @expand="getDetail"
-        bordered
-        class="white"
-      >
-        <template slot="id" slot-scope="text, record, index">
-          <span>{{ index + 1 }}</span>
-        </template>
+    <a-spin :spinning="showEdit">
+      <div style="width:100%" v-if="lists && lists.length > 0">
+        <a-table
+          :columns="columns"
+          :data-source="lists"
+          :loading="loading"
+          :pagination="pagination"
+          :row-key="record => record.activityId"
+          :scroll="{ y: height }"
+          @change="handleTableChange"
+          @expand="getDetail"
+          bordered
+          class="white"
+        >
+          <template slot="id" slot-scope="text, record, index">
+            <span>{{ index + 1 }}</span>
+          </template>
 
-        <template slot="time" slot-scope="text, record">
-          <span v-if="record.releaseTime">{{ record.releaseTime}}</span>
-          <span v-if="record.releaseTime">-{{record.releaseTime}}</span>
-        </template>
+          <template slot="time" slot-scope="text, record">
+            <span v-if="record.releaseTime">{{ record.releaseTime}}</span>
+            <span v-if="record.closeTime">-{{record.closeTime}}</span>
+          </template>
 
-        <template slot="auditStatus" slot-scope="text, record">
-          <a-tag
-            :color="record.auditStatus === 2 ? 'green' : record.auditStatus === 1 ? 'red' : 'blue'"
-          >{{ record.auditStatus === 2 ? '已通过' : record.auditStatus === 1 ? '未通过' : '审核中' }}</a-tag>
-        </template>
+          <template slot="auditStatus" slot-scope="text, record">
+            <a-tag
+              :color="record.auditStatus === 2 ? 'green' : record.auditStatus === 1 ? 'red' : 'blue'"
+            >{{ record.auditStatus === 2 ? '已通过' : record.auditStatus === 1 ? '未通过' : '审核中' }}</a-tag>
+          </template>
 
-        <template slot="examine" slot-scope="text, record">
-          <div class="d-flex flex-column align-center">
-            <a-button
-              @click="handleApply(record, 2)"
-              size="small"
-              type="primary"
-              v-if="record.auditStatus !== 2"
-            >通过</a-button>
-            <a-button @click="handleApply(record, 1)" size="small" type="danger" v-else>不通过</a-button>
-            <a-textarea class="fill-width mt-3" placeholder="备注" v-model="record.remark" />
-          </div>
-        </template>
+          <template slot="examine" slot-scope="text, record">
+            <div class="d-flex flex-column align-center">
+              <a-button
+                @click="handleApply(record, 2)"
+                size="small"
+                type="primary"
+                v-if="record.auditStatus !== 2"
+              >通过</a-button>
+              <a-button @click="handleApply(record, 1)" size="small" type="danger" v-else>不通过</a-button>
+              <a-textarea class="fill-width mt-3" placeholder="备注" v-model="record.remark" />
+            </div>
+          </template>
 
-        <template slot="edit" slot-scope="text, record">
-          <a-icon @click="showEditModal(record)" class="pointer mr-3" theme="twoTone" type="edit" />
-        </template>
+          <template slot="edit" slot-scope="text, record">
+            <a-icon
+              @click="showEditModal(record)"
+              class="pointer mr-5"
+              theme="twoTone"
+              type="edit"
+            />
+            <a-button @click="openEnroll(record.activityId)" size="small" type="primary">活动报名</a-button>
+          </template>
 
-        <div
-          class="d-flex flex-column"
-          slot="expandedRowRender"
-          slot-scope="record"
-          style="margin: 0"
-        >
-          <a-spin :spinning="spinning" tip="详情加载中...">
-            <div class="d-flex flex-nowrap justify-space-between mb-3">
-              <div class="d-flex flex-row">
-                <span class="font-bold-14">主讲人：</span>
-                <span v-if="record.info && record.info.name">{{ record.info.name }}</span>
-                <span v-else>暂无</span>
+          <div
+            class="d-flex flex-column"
+            slot="expandedRowRender"
+            slot-scope="record"
+            style="margin: 0"
+          >
+            <a-spin :spinning="spinning" tip="详情加载中...">
+              <div class="d-flex flex-nowrap justify-space-between mb-3">
+                <div class="d-flex flex-row">
+                  <span class="font-bold-14">主讲人：</span>
+                  <span v-if="record.info && record.info.name">{{ record.info.name }}</span>
+                  <span v-else>暂无</span>
+                </div>
+                <div class="d-flex flex-row">
+                  <span class="font-bold-14">
+                    活动类型：
+                    <a-tag
+                      color="blue"
+                      v-if="record.info && record.info.activityType !== null"
+                    >{{ record.info.activityType === 0 ? '路演' : record.info.activityType === 1 ? '讲座' : record.info.activityType === 2 ? '沙龙' : '' }}</a-tag>
+                  </span>
+                </div>
+                <div class="d-flex flex-row">
+                  <span class="font-bold-14">培训对象：</span>
+                  <span v-if="record.info && record.info.trainees">{{ record.info.trainees }}</span>
+                  <span v-else>暂无</span>
+                </div>
               </div>
-              <div class="d-flex flex-row">
-                <span class="font-bold-14">
-                  活动类型：
-                  <a-tag
-                    color="blue"
-                    v-if="record.info && record.info.activityType !== null"
-                  >{{ record.info.activityType === 0 ? '路演' : record.info.activityType === 1 ? '讲座' : record.info.activityType === 2 ? '沙龙' : '' }}</a-tag>
-                </span>
+              <div class="d-flex flex-nowrap justify-space-between mb-3">
+                <div class="d-flex flex-row">
+                  <span class="font-bold-14">组织单位：</span>
+                  <span
+                    v-if="record.info && record.info.organization"
+                  >{{ record.info.organization }}</span>
+                  <span v-else>暂无</span>
+                </div>
+                <div class="d-flex flex-row">
+                  <span class="font-bold-14">
+                    发布平台：
+                    <a-tag
+                      color="green"
+                      v-if="record.info && record.info.publishPlatform !== null"
+                    >{{ record.info.publishPlatform === 0 ? '绿谷' : record.info.publishPlatform === 1 ? '创时代' : '' }}</a-tag>
+                  </span>
+                </div>
               </div>
-              <div class="d-flex flex-row">
-                <span class="font-bold-14">培训对象：</span>
-                <span v-if="record.info && record.info.trainees">{{ record.info.trainees }}</span>
-                <span v-else>暂无</span>
+              <div class="mb-3">
+                <span class="font-bold-14">活动结束内容：</span>
+                <br />
+                <span v-if="record.info && record.info.endContent">{{ record.info.endContent }}</span>
+                <span v-else>暂无内容</span>
               </div>
-            </div>
-            <div class="d-flex flex-nowrap justify-space-between mb-3">
-              <div class="d-flex flex-row">
-                <span class="font-bold-14">组织单位：</span>
-                <span v-if="record.info && record.info.organization">{{ record.info.organization }}</span>
-                <span v-else>暂无</span>
+              <div class="mb-3">
+                <span class="font-bold-14">公告简介：</span>
+                <br />
+                <span v-if="record.intro">{{ record.intro }}</span>
+                <span v-else>暂无内容</span>
               </div>
-              <div class="d-flex flex-row">
-                <span class="font-bold-14">
-                  发布平台：
-                  <a-tag
-                    color="green"
-                    v-if="record.info && record.info.publishPlatform !== null"
-                  >{{ record.info.publishPlatform === 0 ? '绿谷' : record.info.publishPlatform === 1 ? '创时代' : '' }}</a-tag>
-                </span>
+              <div v-if="record.info && record.intro">
+                <span class="font-bold-14">详情：</span>
+                <span v-dompurify-html="record.info.content" v-if="record.info.content"></span>
+                <span v-else>暂无内容</span>
               </div>
-            </div>
-            <div class="mb-3">
-              <span class="font-bold-14">活动结束内容：</span>
-              <br />
-              <span v-if="record.info && record.info.endContent">{{ record.info.endContent }}</span>
-              <span v-else>暂无内容</span>
-            </div>
-            <div class="mb-3">
-              <span class="font-bold-14">公告简介：</span>
-              <br />
-              <span v-if="record.intro">{{ record.intro }}</span>
-              <span v-else>暂无内容</span>
-            </div>
-            <div v-if="record.info && record.intro">
-              <span class="font-bold-14">详情：</span>
-              <span v-dompurify-html="record.info.content" v-if="record.info.content"></span>
-              <span v-else>暂无内容</span>
-            </div>
-          </a-spin>
-        </div>
-      </a-table>
-    </div>
-    <a-empty v-else />
+            </a-spin>
+          </div>
+        </a-table>
+      </div>
+      <a-empty v-else />
 
-    <!-- 编辑 -->
-    <activity-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" />
+      <!-- 编辑 -->
+      <activity-edit
+        :editItem="editItem"
+        :editVisible="editVisible"
+        @closeModal="closeModal"
+        @getDetail="getDetail"
+      />
+    </a-spin>
   </div>
 </template>
 
@@ -169,7 +184,6 @@ const columns = [
     align: 'center',
     dataIndex: 'edit',
     key: 'edit',
-    width: 80,
     scopedSlots: { customRender: 'edit' },
   },
 ];
@@ -190,6 +204,7 @@ export default {
       editVisible: false,
       editItem: null, // 修改的那条
       spinning: false,
+      showEdit: false,
     };
   },
 
@@ -206,8 +221,10 @@ export default {
   },
 
   methods: {
-    showEditModal(record) {
-      console.log('record: ', record);
+    async showEditModal(record) {
+      this.showEdit = true;
+      await this.getDetail(true, record);
+      this.showEdit = false;
       this.editItem = record;
       this.editVisible = true;
     },
@@ -260,6 +277,12 @@ export default {
         this.$message.error(error || '审核失败');
       }
     },
+
+    // 活动报名
+    openEnroll(id) {
+      const { query } = this.$route;
+      this.$router.push({ path: `/event-registration?activityId=${id}`, query });
+    },
   },
 };
 </script>
diff --git a/src/components/Activity/ActivityEdit.vue b/src/components/Activity/ActivityEdit.vue
index 5e1b289..4d86bbb 100644
--- a/src/components/Activity/ActivityEdit.vue
+++ b/src/components/Activity/ActivityEdit.vue
@@ -2,137 +2,221 @@
   <div class="d-flex flex-wrap pb-3">
     <!-- 编辑 -->
     <a-modal :closable="false" footer title="修改活动公告" v-model="editVisible" width="700px">
-      <a-form :form="form" @submit="handleSubmit">
-        <!-- 发布平台 -->
+      <a-form :form="form" @submit="handleSubmit" v-if="editVisible && editItem">
+        <!-- 标题 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="发布平台"
+          label="标题"
         >
-          <a-radio-group @change="getPlatform" v-model="platValue">
-            <a-radio :value="1">绿谷</a-radio>
-            <a-radio :value="2">维基</a-radio>
-          </a-radio-group>
+          <a-input
+            placeholder="标题"
+            v-decorator="[
+                      'title',
+                      {
+                        initialValue: editItem.title || '',
+                        rules: [
+                          { required: true, message: '标题不能为空' },
+                          { whitespace: true, message: '标题不能为空' },
+                          { max: 140, massage: '地点最多140个字符' },
+                        ],
+                      },
+                    ]"
+          />
+        </a-form-item>
+        <!-- 地点 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="地点"
+        >
+          <a-input
+            placeholder="地点"
+            v-decorator="[
+                      'address',
+                      {
+                        initialValue: editItem.address || '',
+                        rules: [
+                          { required: true, message: '地点不能为空' },
+                          { whitespace: true, message: '地点不能为空' },
+                          { max: 140, massage: '地点最多140个字符' },
+                        ],
+                      },
+                    ]"
+          />
         </a-form-item>
-        <!-- 类型 -->
+        <!-- 时间 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="类型"
+          label="时间"
+          required
         >
-          <a-select @change="getPlatform" placeholder="类型" style="width: 200px">
+          <a-range-picker
+            :default-value="[editItem.releaseTime ? editItem.releaseTime : '',editItem.closeTime ? editItem.closeTime : '']"
+            @change="onChange"
+            format="YYYY-MM-DD HH:mm:ss"
+            show-time
+            style="width:100%"
+          />
+        </a-form-item>
+        <!-- 活动类型 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="活动类型"
+        >
+          <a-select
+            @change="changeType"
+            placeholder="活动类型"
+            style="width:100%"
+            v-decorator="[
+                      'activityType',
+                      {
+                        initialValue: editItem.info && editItem.info.activityType,
+                      },
+                    ]"
+          >
             <a-select-option
               :key="index"
-              :value="category"
-              v-for="(category, index) in categories"
-            >{{ category }}</a-select-option>
+              :value="category.id"
+              v-for="(category, index) in types"
+            >{{ category.name }}</a-select-option>
           </a-select>
         </a-form-item>
-        <!-- 计划举办时间 -->
+
+        <!-- 主讲人 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="计划举办时间"
+          label="主讲人"
         >
-          <a-range-picker @change="onChange" format="YYYY/MM/DD HH:mm:ss" show-time />
+          <a-input
+            placeholder="主讲人"
+            v-decorator="[
+                      'name',
+                      {
+                        initialValue: (editItem.info && editItem.info.name) ? editItem.info.name : '',
+                        rules: [
+                          { required: true, message: '主讲人不能为空' },
+                          { whitespace: true, message: '主讲人不能为空' },
+                          { max: 140, massage: '主讲人最多140个字符' },
+                        ],
+                      },
+                    ]"
+          />
         </a-form-item>
-        <!-- 实际举办时间 -->
+        <!-- 组织单位 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="计划举办时间"
+          label="组织单位"
         >
-          <a-range-picker @change="onChange" format="YYYY/MM/DD HH:mm:ss" show-time />
+          <a-input
+            placeholder="组织单位"
+            v-decorator="[
+                      'organization',
+                      {
+                        initialValue: (editItem.info && editItem.info.organization) ? editItem.info.organization : '',
+                      },
+                    ]"
+          />
         </a-form-item>
-        <!-- 地点 -->
+        <!-- 其他事宜 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="地点"
+          label="其他事宜"
         >
-          <!-- initialValue: editItem.place, -->
           <a-input
-            placeholder="地点"
+            placeholder="其他事宜"
             v-decorator="[
-                      'place',
+                      'other',
                       {
-                        rules: [
-                          { required: true, message: '地点不能为空' },
-                          { whitespace: true, message: '地点不能为空' },
-                          { max: 140, massage: '地点最多140个字符' },
-                        ],
+                        initialValue: (editItem.info && editItem.info.other) ? editItem.info.other : '',
                       },
                     ]"
           />
         </a-form-item>
-        <!-- 组织人 -->
+        <!-- 会议主题 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="组织人"
+          label="会议主题"
         >
-          <!-- initialValue: editItem.speaker, -->
           <a-input
-            placeholder="组织人"
+            placeholder="会议主题"
             v-decorator="[
-                      'organizer',
+                      'theme',
                       {
-                        rules: [
-                          { required: true, message: '组织人不能为空' },
-                          { whitespace: true, message: '组织人不能为空' },
-                          { max: 140, massage: '组织人最多140个字符' },
-                        ],
+                        initialValue: (editItem.info && editItem.info.theme) ? editItem.info.theme : '',
                       },
                     ]"
           />
         </a-form-item>
-        <!-- 主讲人 -->
+
+        <!-- 培训对象 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="主讲人"
+          label="培训对象"
         >
-          <!-- initialValue: editItem.speaker, -->
           <a-input
-            placeholder="主讲人"
+            placeholder="培训对象"
             v-decorator="[
-                      'speaker',
+                      'trainees',
                       {
-                        rules: [
-                          { required: true, message: '主讲人不能为空' },
-                          { whitespace: true, message: '主讲人不能为空' },
-                          { max: 140, massage: '主讲人最多140个字符' },
-                        ],
+                        initialValue: (editItem.info && editItem.info.trainees) ? editItem.info.trainees : '',
+                      },
+                    ]"
+          />
+        </a-form-item>
+        <!-- 报名方式 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="报名方式"
+        >
+          <a-input
+            placeholder="报名方式"
+            v-decorator="[
+                      'way',
+                      {
+                        initialValue: (editItem.info && editItem.info.way) ? editItem.info.way : '',
                       },
                     ]"
           />
         </a-form-item>
-        <!-- 活动内容 -->
+
+        <!-- 活动结束内容 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="活动内容"
+          label="活动结束内容"
         >
-          <!-- initialValue: editItem.content, -->
           <a-textarea
-            placeholder="活动内容"
+            placeholder="活动结束内容"
             v-decorator="[
-                      'content',
+                      'endContent',
+                      {
+                        initialValue: (editItem.info && editItem.info.endContent) ? editItem.info.endContent : '',
+                      },
                     ]"
           />
         </a-form-item>
-        <!-- 发布状态 -->
+        <!-- 详情 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="发布状态"
+          label="详情"
+          required
         >
-          <a-radio-group @change="getState" v-model="stateValue">
-            <a-radio :value="1">发布</a-radio>
-            <a-radio :value="2">不发布</a-radio>
-          </a-radio-group>
+          <quill-editor
+            :max-size="maxSize"
+            :value="(editItem && editItem.info && editItem.info.content) ? editItem.info.content : content"
+            @changeInput="changeInput"
+          />
         </a-form-item>
-
         <a-form-item class="d-flex flex-row-reverse">
           <a-button @click="$emit('closeModal')" class="mr-3">取消</a-button>
           <a-button class="white--text" html-type="submit" type="primary">保存</a-button>
@@ -143,7 +227,8 @@
 </template>
 
 <script>
-// import { upTeam } from 'config/api';
+import { updateActivity } from 'config/api';
+import QuillEditor from 'components/QuillEditor/QuillEditor.vue';
 
 const formItemLayout = {
   labelCol: { span: 6 },
@@ -155,47 +240,50 @@ const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 export default {
   name: 'ActivityEdit',
   props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
+  components: { QuillEditor },
   data() {
     return {
       formItemLayout,
       tailItemLayout,
-      form: this.$form.createForm(this, { name: 'r-d-add' }),
-      platValue: 1,
-      categories: [
-        { id: 1, name: '路演' },
-        { id: 2, name: '沙龙' },
-        { id: 3, name: '论坛' },
-        { id: 4, name: '培训' },
-        { id: 5, name: '讲座' },
-        { id: 6, name: '创业活动' },
+      form: this.$form.createForm(this, { name: 'activity-edit' }),
+      types: [
+        { id: 0, name: '路演' },
+        { id: 1, name: '沙龙' },
+        { id: 2, name: '论坛' },
       ],
-      category: '',
-      stateValue: 1,
+      activityType: null,
+      maxSize: 2048,
+      content: null,
+      releaseTime: null, // 开始时间
+      closeTime: null, // 结束时间
     };
   },
 
   methods: {
-    // 发布平台
-    getPlatform(value) {
-      console.log('value: ', value);
-      this.platValue = value;
-    },
-    // 类型
-    getCategory(value) {
-      console.log('value: ', value);
-      this.category = value;
+    // 修改内容
+    changeInput(value) {
+      this.content = value;
     },
 
-    // 发布状态
-    getState(value) {
-      console.log('value: ', value);
-      this.stateValue = value;
+    // 类型
+    changeType(value) {
+      this.activityType = value;
     },
 
     // 举办时间
     onChange(dates, dateStrings) {
-      console.log('From: ', dates[0], ', to: ', dates[1]);
-      console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]);
+      this.releaseTime = dateStrings[0];
+      this.closeTime = dateStrings[1];
+    },
+
+    // 验证时间
+    verificationTime() {
+      if (!this.releaseTime || !this.closeTime) {
+        this.$message.error('时间不能为空');
+        return false;
+      } else {
+        return true;
+      }
     },
 
     // 提交表单
@@ -204,16 +292,28 @@ export default {
       this.form.validateFieldsAndScroll(async (err, values) => {
         if (!err) {
           try {
-            // const params = { param: values };
-            // const res = await upTeam(params);
-            // const { data, msg, code } = res.data;
-            // this.$emit('closeModal');
-            // if (code === 200) {
-            //   this.$message.success('修改成功')
-            //   // TODO: 填到列表中
-            // } else {
-            //   throw msg;
-            // }
+            if (!this.verificationTime()) return;
+            console.log('values: ', values);
+            const { releaseTime, closeTime, content, activityType, editItem } = this;
+            const params = { param: values };
+            params.param.activityId = editItem.activityId;
+            params.param.releaseTime = releaseTime || editItem.releaseTime;
+            params.param.closeTime = closeTime || editItem.closeTime;
+            params.param.content = content || editItem.info.content;
+            params.param.activityType = activityType || editItem.activityType;
+            console.log('params: ', params);
+            const res = await updateActivity(params);
+            const { data, msg, code } = res.data;
+            if (code === 200) {
+              this.$message.success('修改成功');
+              this.$emit('closeModal');
+              this.releaseTime = '';
+              this.closeTime = '';
+              this.content = '';
+              this.activityType = '';
+            } else {
+              throw msg;
+            }
           } catch (error) {
             this.$message.error(error || '修改失败');
           }
diff --git a/src/components/Enroll/EnrollDate.vue b/src/components/Enroll/EnrollDate.vue
new file mode 100644
index 0000000..dd5b29f
--- /dev/null
+++ b/src/components/Enroll/EnrollDate.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="main flex-1">
+    <div style="width:100%" v-if="lists && lists.length > 0">
+      <a-table
+        :columns="columns"
+        :data-source="lists"
+        :loading="loading"
+        :pagination="pagination"
+        :row-key="record => record.id"
+        :scroll="{ y: height }"
+        @change="handleTableChange"
+        bordered
+        class="white"
+      >
+        <template slot="id" slot-scope="text, record, index">
+          <span>{{ index + 1 }}</span>
+        </template>
+
+        <template slot="time" slot-scope="text, record">
+          <span v-if="record.releaseTime">{{ record.releaseTime}}</span>
+          <span v-if="record.closeTime">-{{record.closeTime}}</span>
+        </template>
+
+        <template slot="platforms" slot-scope="text, record">
+          <a-tag
+            :color="record.platforms === 0 ? 'green' : 'blue'"
+          >{{ record.platforms === 0 ? '绿谷' : '创时代' }}</a-tag>
+        </template>
+
+        <template slot="auditStatus" slot-scope="text, record">
+          <a-tag
+            :color="record.auditStatus === 2 ? 'green' : record.auditStatus === 1 ? 'red' : 'blue'"
+          >{{ record.auditStatus === 2 ? '已通过' : record.auditStatus === 1 ? '未通过' : '审核中' }}</a-tag>
+        </template>
+
+        <template slot="examine" slot-scope="text, record">
+          <div class="d-flex flex-column align-center">
+            <a-button
+              @click="handleApply(record, 2)"
+              size="small"
+              type="primary"
+              v-if="record.auditStatus !== 2"
+            >通过</a-button>
+            <a-button @click="handleApply(record, 1)" size="small" type="danger" v-else>不通过</a-button>
+            <a-textarea class="fill-width mt-3" placeholder="备注" v-model="record.applyRemark" />
+          </div>
+        </template>
+      </a-table>
+    </div>
+    <a-empty v-else />
+  </div>
+</template>
+
+<script>
+import { getAuditApply } from 'config/api';
+const columns = [
+  {
+    title: '序号',
+    align: 'center',
+    dataIndex: 'id',
+    key: 'id',
+    width: 80,
+    scopedSlots: { customRender: 'id' },
+  },
+  {
+    title: '企业名',
+    align: 'center',
+    dataIndex: 'companyName',
+    key: 'companyName',
+  },
+  {
+    title: '申请人姓名',
+    align: 'center',
+    dataIndex: 'contactName',
+    key: 'contactName',
+  },
+  {
+    title: '联系方式',
+    align: 'center',
+    dataIndex: 'contactPhone',
+    key: 'contactPhone',
+  },
+  {
+    title: '申请时间',
+    align: 'center',
+    dataIndex: 'time',
+    key: 'time',
+  },
+  {
+    title: '申请平台',
+    align: 'center',
+    dataIndex: 'platforms',
+    key: 'platforms',
+    scopedSlots: { customRender: 'platforms' },
+  },
+  {
+    title: '审核状态',
+    align: 'center',
+    dataIndex: 'auditStatus',
+    key: 'auditStatus',
+    scopedSlots: { customRender: 'auditStatus' },
+  },
+  {
+    title: '备注',
+    align: 'center',
+    dataIndex: 'remark',
+    key: 'remark',
+    scopedSlots: { customRender: 'remark' },
+  },
+  {
+    title: '审核',
+    align: 'center',
+    dataIndex: 'examine',
+    key: 'examine',
+    scopedSlots: { customRender: 'examine' },
+  },
+];
+
+export default {
+  name: 'ActivityDate',
+  props: { lists: { type: Array, default: () => [] }, pagination: { type: Object, default: () => {} } },
+
+  data() {
+    return {
+      columns,
+      loading: false,
+      height: '',
+      editVisible: false,
+      editItem: null, // 修改的那条
+      spinning: false,
+    };
+  },
+
+  mounted() {
+    let th = 250;
+    let wh = window.innerHeight;
+    this.height = wh - th;
+    window.onresize = () => {
+      return (() => {
+        wh = window.innerHeight;
+        this.height = wh - th;
+      })();
+    };
+  },
+
+  methods: {
+    async closeModal() {
+      this.editVisible = false;
+      await this.$emit('getSelectTeam');
+    },
+
+    // 换页
+    handleTableChange(pagination) {
+      const { current, pageSize } = pagination;
+      const condition = { current, pageSize };
+      this.$emit('getSelectTeam', condition);
+    },
+
+    // 审核
+    async handleApply(record, auditStatus) {
+      try {
+        const params = { param: { applyId: record.applyActivityId, auditStatus, remark: record.applyRemark } };
+        const res = await getAuditApply(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.$message.success('审核成功');
+          this.$emit('getSelectTeam');
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.$message.error(error || '审核失败');
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="stylus"></style>
diff --git a/src/components/Enroll/EnrollSearch.vue b/src/components/Enroll/EnrollSearch.vue
new file mode 100644
index 0000000..8efe3c9
--- /dev/null
+++ b/src/components/Enroll/EnrollSearch.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="d-flex flex-wrap pb-3 align-center">
+    <!-- 审核状态 -->
+    <div class="ml-3 mb-3">
+      <a-select @change="getAuditStatus" placeholder="审核状态" style="width: 150px">
+        <a-select-option
+          :key="index"
+          :value="state.id"
+          v-for="(state, index) in status"
+        >{{ state.value }}</a-select-option>
+      </a-select>
+    </div>
+    <!-- 发布平台 -->
+    <div class="ml-3 mb-3">
+      <a-select @change="getPlatform" placeholder="发布平台" style="width: 150px">
+        <a-select-option
+          :key="platform.id"
+          :value="platform.id"
+          v-for="platform in platforms"
+        >{{ platform.value }}</a-select-option>
+      </a-select>
+    </div>
+    <!-- 单位名称 -->
+    <a-input class="ml-3 mb-3" placeholder="单位名称" style="width: 150px" v-model="companyName" />
+    <!-- 申请人姓名 -->
+    <a-input class="ml-3 mb-3" placeholder="申请人姓名" style="width: 150px" v-model="contactName" />
+    <!-- 联系方式 -->
+    <a-input class="ml-3 mb-3" placeholder="联系方式" style="width: 150px" v-model="contactPhone" />
+
+    <a-button @click="handleTableChange" class="ml-3 mb-3" type="primary">搜索</a-button>
+
+    <div class="flex-1"></div>
+    <!-- 导出 -->
+    <a-popover placement="bottom" trigger="click">
+      <template slot="content">
+        <div class="d-flex flex-column">
+          <a-select
+            @change="exportAuditStatus"
+            class="mb-3"
+            placeholder="审核状态"
+            style="width: 150px"
+          >
+            <a-select-option value>全部</a-select-option>
+            <a-select-option
+              :key="index"
+              :value="state.id"
+              v-for="(state, index) in status"
+            >{{ state.value }}</a-select-option>
+          </a-select>
+          <a-select @change="exportPlatform" class="mb-3" placeholder="发布平台" style="width: 150px">
+            <a-select-option value>全部</a-select-option>
+            <a-select-option
+              :key="platform.id"
+              :value="platform.id"
+              v-for="platform in platforms"
+            >{{ platform.value }}</a-select-option>
+          </a-select>
+          <a-button @click="handleExport" type="primary">导出</a-button>
+        </div>
+      </template>
+      <a-button type="primary">导出</a-button>
+    </a-popover>
+  </div>
+</template>
+
+<script>
+import { getExport } from 'config/api';
+
+export default {
+  name: 'ActivitySearch',
+  data() {
+    return {
+      status: [
+        {
+          id: 0,
+          value: '待审核',
+        },
+        {
+          id: 1,
+          value: '未通过',
+        },
+        {
+          id: 2,
+          value: '已通过',
+        },
+      ],
+      auditStatus: '', // 审核状态
+      exportStatus: '', // 导出审核状态
+      platforms: [
+        {
+          id: 0,
+          value: '绿谷',
+        },
+        {
+          id: 1,
+          value: '创时代',
+        },
+      ],
+      publishPlatform: '', // 发布平台
+      exportPublishPlatform: '', // 导出发布平台
+      companyName: '', // 单位名称
+      contactName: '', // 申请人姓名
+      contactPhone: '', // 联系方式
+    };
+  },
+
+  methods: {
+    // 审核状态
+    getAuditStatus(value) {
+      this.auditStatus = value;
+    },
+
+    // 导出的审核状态
+    exportAuditStatus(value) {
+      this.exportStatus = value;
+    },
+
+    // 发布平台
+    getPlatform(value) {
+      this.publishPlatform = value;
+    },
+
+    // 导出的发布平台
+    exportPlatform(value) {
+      this.exportPublishPlatform = value;
+    },
+
+    // 查询
+    async handleTableChange() {
+      const { auditStatus, publishPlatform, companyName, contactName, contactPhone } = this;
+      // 传参
+      const condition = {
+        auditStatus,
+        publishPlatform,
+        companyName,
+        contactName,
+        contactPhone,
+      };
+      await this.$emit('getSelectTeam', condition);
+    },
+
+    // 导出
+    async handleExport() {
+      try {
+        const { query } = this.$route;
+        const params = { param: { activityId: query.activityId, auditStatus: this.exportStatus, platforms: this.exportPublishPlatform } };
+        const res = await getExport(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.$message.success('导出成功');
+          window.location.href = data;
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.$message.error(error || '导出失败');
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="stylus"></style>
diff --git a/src/components/IndustryInfo/ActivityEdit.vue b/src/components/IndustryInfo/ActivityEdit.vue
index 1e560cf..0bee6fe 100644
--- a/src/components/IndustryInfo/ActivityEdit.vue
+++ b/src/components/IndustryInfo/ActivityEdit.vue
@@ -42,10 +42,15 @@
           label="时间"
         >
           <a-date-picker
-            :placeholder="editItem.time"
             @change="onChange"
             format="YYYY-MM-DD HH:mm:ss"
             show-time
+            v-decorator="[
+                      'time',
+                      {
+                        initialValue: editItem.time || '',
+                      },
+                    ]"
           />
         </a-form-item>
         <!-- 发布部门 -->
@@ -139,7 +144,7 @@ export default {
     // 举办时间
     onChange(value, dateString) {
       console.log('dateString: ', dateString);
-      // this.time = dateString;
+      this.time = dateString;
     },
 
     // 提交表单
diff --git a/src/components/Page/PageDate.vue b/src/components/Page/PageDate.vue
index 4b70613..0a942b2 100644
--- a/src/components/Page/PageDate.vue
+++ b/src/components/Page/PageDate.vue
@@ -1,49 +1,55 @@
 <template>
   <div class="main flex-1">
-    <div style="width:100%" v-if="lists && lists.length > 0">
-      <a-table
-        :columns="columns"
-        :data-source="lists"
-        :loading="loading"
-        :pagination="pagination"
-        :row-key="record => record.id"
-        :scroll="{ y: height }"
-        @change="handleTableChange"
-        @expand="getDetail"
-        bordered
-        class="white"
-      >
-        <template slot="id" slot-scope="text, record, index">
-          <span>{{ index + 1 }}</span>
-        </template>
+    <a-spin :spinning="showEdit">
+      <div style="width:100%" v-if="lists && lists.length > 0">
+        <a-table
+          :columns="columns"
+          :data-source="lists"
+          :loading="loading"
+          :pagination="pagination"
+          :row-key="record => record.id"
+          :scroll="{ y: height }"
+          @change="handleTableChange"
+          @expand="getDetail"
+          bordered
+          class="white"
+        >
+          <template slot="id" slot-scope="text, record, index">
+            <span>{{ index + 1 }}</span>
+          </template>
 
-        <template slot="edit" slot-scope="text, record">
-          <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
-          <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.length">
-            <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
-          </a-popconfirm>
-        </template>
+          <template slot="edit" slot-scope="text, record">
+            <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
+            <a-popconfirm
+              @confirm="() => onDelete(record.id)"
+              title="确定要删除这一条?"
+              v-if="lists.length"
+            >
+              <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
+            </a-popconfirm>
+          </template>
 
-        <div
-          class="d-flex flex-nowrap justify-space-between"
-          slot="expandedRowRender"
-          slot-scope="record"
-          style="margin: 0"
-        >
-          <div>
-            <a-spin :spinning="spinning" tip="详情加载中...">
-              内容：
-              <span v-dompurify-html="record.content" v-if="record.content"></span>
-              <span v-else>暂无内容</span>
-            </a-spin>
+          <div
+            class="d-flex flex-nowrap justify-space-between"
+            slot="expandedRowRender"
+            slot-scope="record"
+            style="margin: 0"
+          >
+            <div>
+              <a-spin :spinning="spinning" tip="详情加载中...">
+                内容：
+                <span v-dompurify-html="record.content" v-if="record.content"></span>
+                <span v-else>暂无内容</span>
+              </a-spin>
+            </div>
           </div>
-        </div>
-      </a-table>
-    </div>
-    <a-empty v-else />
+        </a-table>
+      </div>
+      <a-empty v-else />
 
-    <!-- 编辑 -->
-    <page-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" />
+      <!-- 编辑 -->
+      <page-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" />
+    </a-spin>
   </div>
 </template>
 
@@ -90,6 +96,7 @@ export default {
       editVisible: false,
       editItem: {}, // 修改的那条
       spinning: false,
+      showEdit: false,
     };
   },
 
@@ -106,7 +113,10 @@ export default {
   },
 
   methods: {
-    showEditModal(record) {
+    async showEditModal(record) {
+      this.showEdit = true;
+      await this.getDetail(true, record);
+      this.showEdit = false;
       this.editItem = record;
       this.editVisible = true;
     },
diff --git a/src/components/Policy/PolicyDate.vue b/src/components/Policy/PolicyDate.vue
index 64cba94..2aa4663 100644
--- a/src/components/Policy/PolicyDate.vue
+++ b/src/components/Policy/PolicyDate.vue
@@ -2,7 +2,14 @@
   <div class="main flex-1">
     <div style="width:100%" v-if="lists && lists.length > 0">
       <div class="mb-4">
-        <a-button :disabled="!hasSelected" :loading="loading" @click="start" type="primary">审核通过</a-button>
+        <a-button :disabled="!hasSelected" :loading="loading" @click="start(2)" type="primary">审核通过</a-button>
+        <a-button
+          :disabled="!hasSelected"
+          :loading="loading"
+          @click="start(1)"
+          class="ml-3"
+          type="danger"
+        >审核不通过</a-button>
         <span class="ml-2">
           <template v-if="hasSelected">{{ `选中 ${selectedRowKeys.length} 条` }}</template>
         </span>
@@ -11,8 +18,11 @@
         :columns="columns"
         :data-source="lists"
         :loading="loading"
+        :pagination="pagination"
         :row-key="record => record.id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :scroll="{ y: height }"
+        @change="handleTableChange"
         bordered
         class="white"
       >
@@ -20,27 +30,43 @@
           <span>{{ index + 1 }}</span>
         </template>
 
-        <template slot="tag" slot-scope="text, record">
-          <a-tag color="blue">{{ record.tag }}</a-tag>
+        <template slot="type" slot-scope="text, record">
+          <a-tag
+            color="blue"
+          >{{ record.type === 0 ? '申报通知' : record.type === 1 ? '公告公示' : record.type === 2 ? '政策动态' : record.type === 3 ? '申报指南' : '' }}</a-tag>
         </template>
 
-        <template slot="auditStatus" slot-scope="text, record">
-          <a-tag :color="record.auditStatus === '通过' ? 'green' : 'red'">{{ record.auditStatus }}</a-tag>
+        <template slot="status" slot-scope="text, record">
+          <a-tag
+            :color="record.status === 2 ? 'green' : record.status === 1 ? 'red' : 'blue'"
+          >{{ record.status === 2 ? '已通过' : record.status === 1 ? '未通过' : '审核中' }}</a-tag>
         </template>
 
         <template slot="edit" slot-scope="text, record">
           <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
-          <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.length">
-            <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
-          </a-popconfirm>
         </template>
 
-        <div slot="expandedRowRender" slot-scope="record" style="margin: 0">
-          <div class="d-flex flex-nowrap mb-2">
-            <div>发布时间：{{ record.releaseTime }}</div>
-            <div class="ml-8">截止时间：{{ record.deadline }}</div>
+        <div
+          class="d-flex flex-column"
+          slot="expandedRowRender"
+          slot-scope="record"
+          style="margin: 0"
+        >
+          <div class="mb-3">
+            <span class="font-bold-14">原文链接：</span>
+            {{ record.titleUrl }}
+          </div>
+          <div class="mb-3">
+            <span class="font-bold-14">简介：</span>
+            <br />
+            <span v-if="record.intro">{{ record.intro }}</span>
+            <span v-else>暂无内容</span>
+          </div>
+          <div>
+            <span class="font-bold-14">详情：</span>
+            <span v-dompurify-html="record.content" v-if="record.content"></span>
+            <span v-else>暂无内容</span>
           </div>
-          <div>原文链接：{{ record.content }}</div>
         </div>
       </a-table>
     </div>
@@ -52,8 +78,8 @@
 </template>
 
 <script>
-import PolicyEdit from "components/Policy/PolicyEdit.vue";
-// import { delTeam } from 'config/api';
+import PolicyEdit from 'components/Policy/PolicyEdit.vue';
+import { upPolicy } from 'config/api';
 
 const columns = [
   {
@@ -61,6 +87,7 @@ const columns = [
     align: 'center',
     dataIndex: 'id',
     key: 'id',
+    width: 80,
     scopedSlots: { customRender: 'id' },
   },
   {
@@ -72,80 +99,58 @@ const columns = [
   {
     title: '发布部门',
     align: 'center',
-    dataIndex: 'department',
-    key: 'department',
+    dataIndex: 'publishDepartName',
+    key: 'publishDepartName',
   },
   {
     title: '政策类型',
     align: 'center',
-    dataIndex: 'policyType',
-    key: 'policyType',
+    dataIndex: 'type',
+    key: 'type',
+    width: 100,
+    scopedSlots: { customRender: 'type' },
   },
   {
-    title: '标签',
+    title: '状态',
     align: 'center',
-    dataIndex: 'tag',
-    key: 'tag',
-    scopedSlots: { customRender: 'tag' },
+    dataIndex: 'status',
+    key: 'status',
+    width: 100,
+    scopedSlots: { customRender: 'status' },
   },
   {
-    title: '审核状态',
+    title: '发布时间',
     align: 'center',
-    dataIndex: 'auditStatus',
-    key: 'auditStatus',
-    scopedSlots: { customRender: 'auditStatus' },
+    dataIndex: 'publishTime',
+    key: 'publishTime',
   },
   {
     title: '编辑',
     align: 'center',
     dataIndex: 'edit',
     key: 'edit',
+    width: 80,
     scopedSlots: { customRender: 'edit' },
   },
 ];
 
-const lists = [
-  {
-    id:'001',
-    title:'标题一',
-    department:'部门一',
-    releaseTime: '2020/11/18 08:00',
-    deadline: '2020/11/18 18:00',
-    policyType: '新闻',
-    tag: '新闻',
-    auditStatus: '通过',
-    link: 'http://localhost:8080/',
-  },
-  {
-    id:'002',
-    title:'标题二',
-    department:'部门二',
-    releaseTime: '2020/11/18 08:00',
-    deadline: '2020/11/18 18:00',
-    policyType: '政治',
-    tag: '政治',
-    auditStatus: '未通过',
-    link: 'http://localhost:8080/'
-  }
-];
-
 export default {
-  name: "PolicyDate",
+  name: 'PolicyDate',
+  props: { lists: { type: Array, default: () => [] }, pagination: { type: Object, default: () => {} } },
+
   components: {
     PolicyEdit,
   },
   data() {
-    this.cacheData = lists.map(item => ({ ...item }));
     return {
       columns,
-      lists,
       loading: false,
       selectedRowKeys: [],
       editingKey: '',
       height: '',
       editVisible: false,
       editItem: null, // 修改的那条
-    }
+    };
   },
 
   computed: {
@@ -155,57 +160,68 @@ export default {
   },
 
   mounted() {
-    this.height = document.getElementsByClassName('main')[0].offsetHeight - 150;
+    let th = 300;
+    let wh = window.innerHeight;
+    this.height = wh - th;
+    window.onresize = () => {
+      return (() => {
+        wh = window.innerHeight;
+        this.height = wh - th;
+      })();
+    };
   },
 
   methods: {
-    start() {
-      this.loading = true;
-      // ajax request after empty completing
-      setTimeout(() => {
-        this.loading = false;
-        this.selectedRowKeys = [];
-      }, 1000);
-    },
+    // 选中
     onSelectChange(selectedRowKeys) {
       console.log('selectedRowKeys changed: ', selectedRowKeys);
       this.selectedRowKeys = selectedRowKeys;
     },
 
-    showEditModal(record){
+    // 换页
+    handleTableChange(pagination) {
+      const { current, pageSize } = pagination;
+      const condition = { current, pageSize };
+      this.$emit('getSelectTeam', condition);
+    },
+
+    // 审批
+    async start(state) {
+      try {
+        this.loading = true;
+        const params = { param: { ids: this.selectedRowKeys, status: state } };
+        const res = await upPolicy(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          this.$message.success('审批成功');
+          this.$emit('getSelectTeam');
+          setTimeout(() => {
+            this.loading = false;
+            this.selectedRowKeys = [];
+          }, 1000);
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.$message.error(error || '审批失败');
+      }
+    },
+
+    showEditModal(record) {
       console.log('record: ', record);
       this.editItem = record;
       this.editVisible = true;
     },
 
-    closeModal(){
+    closeModal() {
       this.editVisible = false;
     },
 
-    // 删除
-    async onDelete(teamId) {
-      try {
-        // const params = { param: { teamId } };
-        // const res = await delTeam(params);
-        // const { data, msg, code } = res.data;
-        // if (code === 200) {
-        //   this.$message.success('删除成功');
-        //   const arr = [...this.lists];
-        //   this.lists = arr.filter(item => item.id !== teamId);
-        //   // TODO: 填到列表中
-        // } else {
-        //   throw msg;
-        // }
-      } catch (error) {
-        this.$message.error(error || '删除失败');
-      }
-    },
-
     // 打开报名
-    openSignUp(){
+    openSignUp() {
       const { query } = this.$route;
       this.$router.push({ path: '/sign-up', query });
-    }
+    },
   },
 };
 </script>
diff --git a/src/components/Policy/PolicySearch.vue b/src/components/Policy/PolicySearch.vue
index 9c1a605..6bbc8b6 100644
--- a/src/components/Policy/PolicySearch.vue
+++ b/src/components/Policy/PolicySearch.vue
@@ -1,16 +1,47 @@
 
 
 <template>
-  <div class="d-flex flex-wrap pb-3">
-    <div>
-      <!-- 标题 -->
-      <a-input @change="handleChangeTitle" placeholder="标题" style="width: 150px" v-model="title" />
-      <a-button @click="handleTableChange" class="mx-2" type="primary">搜索</a-button>
-    </div>
+  <div>
+    <div class="d-flex flex-nowrap">
+      <!-- 输入框 -->
+      <a-select @change="changeType" class="mb-3" placeholder="类型" style="width: 80px">
+        <a-select-option
+          :key="index"
+          :value="type.code"
+          v-for="(type, index) in types"
+        >{{ type.value }}</a-select-option>
+      </a-select>
+      <a-input class="mb-3" placeholder="标题" style="width: 200px" v-model="options.input" />
 
-    <div class="flex-1"></div>
+      <!-- 发布时间 -->
+      <a-range-picker
+        @change="onChangeTime"
+        class="ml-3 mb-3 flex-1"
+        format="YYYY-MM-DD HH:mm:ss"
+        show-time
+      />
+    </div>
 
-    <a-button @click="showModal" class="editable-add-btn" type="primary">增加</a-button>
+    <!-- 是否勾选 -->
+    <div class="d-flex flex-nowrap ml-3">
+      <div class="d-flex flex-nowrap align-center">
+        <a-checkbox @change="onChangeBw" class="mb-3">国家</a-checkbox>
+        <a-checkbox @change="onChangeSx" class="mb-3">山西省</a-checkbox>
+        <a-checkbox @change="onChangeZg" class="mb-3">山西省综改区</a-checkbox>
+        <a-checkbox @change="onChangeTy" class="mb-3">太原市</a-checkbox>
+      </div>
+      <!-- 状态 -->
+      <a-select @change="changeState" class="ml-3 mb-3" placeholder="状态" style="width: 150px">
+        <a-select-option
+          :key="index"
+          :value="state.id"
+          v-for="(state, index) in policyStatus"
+        >{{ state.value }}</a-select-option>
+      </a-select>
+      <a-button @click="handleTableChange" class="ml-3" type="primary">搜索</a-button>
+      <div class="flex-1"></div>
+      <a-button @click="showModal" class="editable-add-btn" type="primary">增加</a-button>
+    </div>
 
     <!-- 添加 -->
     <policy-add :visible="visible" @closeModal="closeModal" />
@@ -29,7 +60,26 @@ export default {
   data() {
     return {
       visible: false,
-      title: '',
+      types: [
+        { code: 'title', value: '标题' },
+        { code: 'area', value: '地区/发布部门' },
+      ],
+      policyStatus: [
+        { id: 0, value: '审核中' },
+        { id: 1, value: '未通过' },
+        { id: 2, value: '已通过' },
+      ],
+      options: {
+        bw: 0,
+        sx: 0,
+        zg: 0,
+        ty: 0,
+        input: '',
+        status: '',
+        code: '',
+        startTime: '',
+        endTime: '',
+      },
     };
   },
   methods: {
@@ -41,26 +91,45 @@ export default {
       this.visible = false;
     },
 
-    // 标题
-    handleChangeTitle(value) {
-      console.log('value: ', value);
-      this.title = value;
+    // 勾选
+    onChangeBw(e) {
+      if (e.target.checked) {
+        this.options.bw = 1;
+      }
+    },
+    onChangeSx(e) {
+      if (e.target.checked) {
+        this.options.sx = 1;
+      }
+    },
+    onChangeZg(e) {
+      if (e.target.checked) {
+        this.options.zg = 1;
+      }
+    },
+    onChangeTy(e) {
+      if (e.target.checked) {
+        this.options.ty = 1;
+      }
+    },
+    // 类型
+    changeType(value) {
+      this.options.code = value;
+    },
+    // 状态
+    changeState(value) {
+      this.options.status = value;
+    },
+    // 发布时间
+    onChangeTime(dates, dateStrings) {
+      this.options.startTime = dateStrings[0];
+      this.options.endTime = dateStrings[1];
     },
 
+    // 搜索
     async handleTableChange() {
-      try {
-        // const params = { param: {publishingPlatform: this.publishingPlatform} };
-        // const res = await selLikeTeam(params);
-        // const { data, msg, code } = res.data;
-        // if (code === 200) {
-        //   console.log('搜索结果',data);
-        //   // TODO: 填到列表中
-        // } else {
-        //   throw msg;
-        // }
-      } catch (error) {
-        this.$message.error(error);
-      }
+      const { options } = this;
+      await this.$emit('getSelectTeam', options);
     },
   },
 };
diff --git a/src/config/api.js b/src/config/api.js
index 2603a1d..ab65b53 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -59,9 +59,21 @@ export const saveActivity = params => axios.post(`${activity}/save`, params);
 // 修改活动公告
 export const updateActivity = params => axios.post(`${activity}/update`, params);
 
+// 查看活动下所有申请的人员列表
+export const getQueryApply = params => axios.post(`${activity}/query/apply`, params);
+
+// 后台审批加入的申请
+export const getAuditApply = params => axios.post(`${activity}/audit/apply`, params);
+
+// 导出活动下报名的人员列表（EXCEL）
+export const getExport = params => axios.post(`${activity}/export`, params);
+
 // 查询创新政策
 export const selLikePolicyBack = params => axios.post(`${policy}/policy/selLikePolicyBack`, params);
 
+// 政策审批
+export const upPolicy = params => axios.post(`${policy}/policy/upPolicy`, params);
+
 // 合作意向列表查询
 export const getCreatingPlatformSearch = params => axios.post(`${creatingPlatform}/search`, params);
 
diff --git a/src/plugins/ant-design-vue.js b/src/plugins/ant-design-vue.js
index bc05ad7..5ba1b63 100644
--- a/src/plugins/ant-design-vue.js
+++ b/src/plugins/ant-design-vue.js
@@ -23,6 +23,7 @@ import {
   Checkbox,
   Spin,
   Tooltip,
+  Popover,
 } from 'ant-design-vue';
 import { ConfigProvider } from 'ant-design-vue';
 Vue.component(ConfigProvider.name, ConfigProvider);
@@ -47,6 +48,7 @@ Vue.use(Cascader);
 Vue.use(Checkbox);
 Vue.use(Spin);
 Vue.use(Tooltip);
+Vue.use(Popover);
 
 Vue.prototype.$message = message;
 Vue.prototype.$notification = notification;
diff --git a/src/router/index.js b/src/router/index.js
index d48f8d4..d83ca5e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,12 +41,18 @@ const routes = [
     name: 'CommunicationCommunity',
     component: () => import(/* webpackChunkName: "communication-community" */ 'views/CommunicationCommunity/CommunicationCommunity.vue'),
   },
-  // 活动公告
+  // 活动公告--活动通知
   {
     path: '/event-announcement',
     name: 'EventAnnouncement',
     component: () => import(/* webpackChunkName: "event-announcement" */ 'views/EventAnnouncement/EventAnnouncement.vue'),
   },
+  // 活动公告--活动报名
+  {
+    path: '/event-registration',
+    name: 'EventRegistration',
+    component: () => import(/* webpackChunkName: "event-registration" */ 'views/EventRegistration/EventRegistration.vue'),
+  },
   // 创新政策
   {
     path: '/innovation-policy',
diff --git a/src/views/EventRegistration/EventRegistration.vue b/src/views/EventRegistration/EventRegistration.vue
new file mode 100644
index 0000000..59dbf53
--- /dev/null
+++ b/src/views/EventRegistration/EventRegistration.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="pa-3 white fill-height d-flex flex-column">
+    <enroll-search @getSelectTeam="getSelectTeam" />
+    <enroll-date :lists="lists" :pagination="pagination" @getSelectTeam="getSelectTeam" />
+  </div>
+</template>
+
+<script>
+import EnrollSearch from 'components/Enroll/EnrollSearch.vue';
+import EnrollDate from 'components/Enroll/EnrollDate.vue';
+import { getQueryApply } from 'config/api';
+
+export default {
+  name: 'InnovationPolicy',
+  components: {
+    EnrollSearch,
+    EnrollDate,
+  },
+
+  data() {
+    return {
+      lists: [],
+      pagination: { current: 1, pageSize: 10 },
+    };
+  },
+
+  created() {
+    this.getSelectTeam();
+  },
+
+  methods: {
+    /**
+     * 后台查看活动下所有申请的人员列表
+     * @param { String } activityId 活动id
+     */
+    async getSelectTeam(condition) {
+      try {
+        const { query } = this.$route;
+        const params = {
+          param: {
+            activityId: query.activityId,
+            pageNum: (condition && condition.current) || 1,
+            pageSize: (condition && condition.pageSize) || 10,
+          },
+        };
+        if (condition) {
+          if (condition.auditStatus) {
+            params.param.auditStatus = condition.auditStatus;
+          }
+          if (condition.publishPlatform) {
+            params.param.publishPlatform = condition.publishPlatform;
+          }
+          if (condition.companyName) {
+            params.param.companyName = condition.companyName;
+          }
+          if (condition.contactName) {
+            params.param.contactName = condition.contactName;
+          }
+          if (condition.contactPhone) {
+            params.param.contactPhone = condition.contactPhone;
+          }
+        }
+        const res = await getQueryApply(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          let arr = data.list;
+          arr.forEach(item => {
+            item.applyRemark = '';
+          });
+          this.lists = [...arr];
+          const paper = { ...this.pagination };
+          paper.current = data.pageNum;
+          paper.total = +data.total;
+          paper.pageSize = data.pageSize;
+          this.pagination = paper;
+        } else {
+          throw msg || '获取失败';
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/InnovationPolicy/InnovationPolicy.vue b/src/views/InnovationPolicy/InnovationPolicy.vue
index 852e9c0..20962a3 100644
--- a/src/views/InnovationPolicy/InnovationPolicy.vue
+++ b/src/views/InnovationPolicy/InnovationPolicy.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
-    <policy-search />
-    <policy-date />
+    <policy-search @getSelectTeam="getSelectTeam" />
+    <policy-date :lists="lists" :pagination="pagination" @getSelectTeam="getSelectTeam" />
   </div>
 </template>
 
@@ -17,6 +17,13 @@ export default {
     PolicyDate,
   },
 
+  data() {
+    return {
+      lists: [],
+      pagination: { current: 1, pageSize: 10 },
+    };
+  },
+
   created() {
     this.getSelectTeam();
   },
@@ -26,12 +33,52 @@ export default {
      * 查询创新政策
      * @param { String } competeTimeId 第几届信息的id
      */
-    async getSelectTeam() {
+    async getSelectTeam(condition) {
       try {
-        const params = { param: {} };
+        const params = {
+          param: {
+            pageNum: (condition && condition.current) || 1,
+            pageSize: (condition && condition.pageSize) || 10,
+          },
+        };
+        if (condition) {
+          if (condition.bw) {
+            params.param.bw = condition.bw;
+          }
+          if (condition.sx) {
+            params.param.sx = condition.sx;
+          }
+          if (condition.ty) {
+            params.param.ty = condition.ty;
+          }
+          if (condition.zg) {
+            params.param.zg = condition.zg;
+          }
+          if (condition.code) {
+            params.param.code = condition.code;
+          }
+          if (condition.endTime) {
+            params.param.endTime = condition.endTime;
+          }
+          if (condition.input) {
+            params.param.input = condition.input;
+          }
+          if (condition.startTime) {
+            params.param.startTime = condition.startTime;
+          }
+          if (condition.status) {
+            params.param.status = condition.status;
+          }
+        }
         const res = await selLikePolicyBack(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
+          this.lists = data.list;
+          const paper = { ...this.pagination };
+          paper.current = data.pageNum;
+          paper.total = +data.total;
+          paper.pageSize = data.pageSize;
+          this.pagination = paper;
         } else {
           throw msg || '获取失败';
         }