diff --git a/ruoyi-ui/src/views/szxc/activily/index.vue b/ruoyi-ui/src/views/szxc/activily/index.vue
index f8356fd..261bad0 100644
--- a/ruoyi-ui/src/views/szxc/activily/index.vue
+++ b/ruoyi-ui/src/views/szxc/activily/index.vue
@@ -100,43 +100,38 @@
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="45" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="负责人" align="center" prop="leader" />
-      <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="活动状态" align="center" prop="status">
+      <el-table-column label="标题" align="center" prop="title" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="负责人" align="center" prop="leader" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="联系电话" align="center" prop="phone" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="活动状态" align="center" prop="status" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.szxc_hd_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="活动介绍" align="center" prop="content" />
-      <el-table-column label="开始时间" align="center" prop="startTime">
+      <el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="活动介绍" align="center" prop="content" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="开始时间" align="center" prop="startTime" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime">
+      <el-table-column label="结束时间" align="center" prop="endTime" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="备注" align="center" prop="remark" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['szxc:activily:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['szxc:activily:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit"
+            @click="handleUpdate(scope.row)" v-hasPermi="['szxc:activily:edit']" >修改</el-button>
+
+          <el-button size="mini" type="text" icon="el-icon-delete"
+            @click="handleDelete(scope.row)" v-hasPermi="['szxc:activily:remove']">删除</el-button>
+
+          <el-button size="mini" type="text" icon="el-icon-document-copy"
+                     @click="handleDetails(scope.row)">报名详情</el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -208,11 +203,120 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="活动报名详情" :visible.sync="apply.visible" width="1000px" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="applyAdd"
+            v-hasPermi="['szxc:bankinfo:add']"
+          >添加</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="apply.loading" :data="apply.list" border>
+        <el-table-column label="ID" align="center" prop="id" width="80"/>
+        <el-table-column label="报名人" align="center" prop="name" />
+        <el-table-column label="身份证号" align="center" prop="cardId" />
+        <el-table-column label="手机号" align="center" prop="phone" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="applyUpdate(scope.row)"
+              v-hasPermi="['szxc:bankinfo:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="applyDelete(scope.row)"
+              v-hasPermi="['szxc:bankinfo:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 添加或修改活动报名对话框 -->
+    <el-dialog title="添加活动报名" :visible.sync="apply.open" width="500px" append-to-body>
+      <el-form ref="applyForm" :model="apply.form" :rules="apply.rules" label-width="90px">
+        <el-form-item label="报名人" prop="name">
+          <el-input readonly
+                    placeholder="请选择报名人"
+                    v-model="apply.form.name">
+            <el-button slot="append" icon="el-icon-search" @click="nameSelect"></el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardId">
+          <el-input v-model="apply.form.cardId" placeholder="请输入身份证号" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="apply.form.phone" placeholder="请输入手机号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="applySubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="选择居民" :visible.sync="jmin.visible" width="1000px" append-to-body>
+      <el-form :model="jmin.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
+        <el-form-item label="身份证号" prop="cardId">
+          <el-input
+            v-model="jmin.queryParams.cardId"
+            placeholder="请输入身份证号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="jmin.queryParams.name"
+            placeholder="请输入姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="jminQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-alert title="双击选择户主" type="warning" :closable="false"></el-alert>
+      <el-table v-loading="jmin.loading" :data="jmin.list" border @cell-dblclick="jminDblclick">
+        <el-table-column label="姓名" align="center" prop="name" min-width="80"/>
+        <el-table-column label="身份证号" align="center" prop="cardId" min-width="180"/>
+        <el-table-column label="所属网格" align="center" prop="deptName" min-width="100"/>
+        <el-table-column label="性别" align="center" prop="sex">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="籍贯" align="center" prop="jg" min-width="180"/>
+        <el-table-column label="手机号" align="center" prop="phone" min-width="120"/>
+        <el-table-column label="现居住地" align="center" prop="currentAddress" min-width="180"/>
+      </el-table>
+      <pagination
+        v-show="jmin.total>0"
+        :total="jmin.total"
+        :page.sync="jmin.queryParams.pageNum"
+        :limit.sync="jmin.queryParams.pageSize"
+        @pagination="getlistJminfo"
+      />
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listActivily, getActivily, delActivily, addActivily, updateActivily } from "@/api/szxc/activily";
+import { listApply, delApply, addApply, updateApply } from "@/api/szxc/apply";
+import { listJminfo } from "@/api/szxc/jminfo";
 import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -220,7 +324,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Activily",
   components: { Treeselect },
-  dicts: ['szxc_hd_status'],
+  dicts: ['szxc_hd_status', 'sys_user_sex'],
   data() {
     return {
       // 遮罩层
@@ -286,7 +390,53 @@ export default {
         endTime: [
           { required: true, message: "结束时间不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 活动报名
+      apply: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 弹出层标题
+        title: '',
+        // 添加弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 居民信息
+        selectedRow: null,
+        // 表单校验
+        rules: {
+          name: [
+            { required: true, message: "报名人不能为空", trigger: "blur" }
+          ],
+          cardId: [
+            { required: true, message: "身份证号不能为空", trigger: "blur" }
+          ],
+          phone: [
+            { required: true, message: "手机号不能为空", trigger: "blur" }
+          ],
+        },
+      },
+      // 居民信息
+      jmin: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+          off: '0',
+          cardId: '',
+          name: ''
+        },
+        // 查询列表
+        list: []
+      },
     };
   },
   created() {
@@ -407,7 +557,105 @@ export default {
       this.download('szxc/activily/export', {
         ...this.queryParams
       }, `activily_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 参与详情 */
+    handleDetails(row){
+      this.apply.selectedRow = row;
+      this.apply.visible = true;
+      this.getlistApply();
+    },
+    /** 查询活动报名列表 */
+    getlistApply() {
+      listApply({
+        pageNum: 1,
+        pageSize: 100000000,
+        ysId: this.apply.selectedRow.id
+      }).then(response => {
+        this.apply.list = response.rows
+      });
+    },
+    // 添加活动报名
+    applyAdd(){
+      this.resetForm("applyForm");
+      this.apply.form = {
+        id: null,
+        gyId: this.apply.selectedRow.id,
+        jmId: null,
+        cardId: null,
+        name: null,
+        phone: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        userId: null
+      };
+      this.apply.title = '添加活动报名';
+      this.apply.open = true;
+    },
+    /** 修改按钮操作 */
+    applyUpdate(row) {
+      this.apply.form = row;
+      this.apply.title = '修改活动报名';
+      this.apply.open = true;
+    },
+    /** 删除按钮操作 */
+    applyDelete(row) {
+      this.$modal.confirm('是否确认ID为【"' + row.id + '"】的数据项？').then(function() {
+        return delApply(row.id);
+      }).then(() => {
+        this.getlistApply();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    // 添加活动报名
+    applySubmit(){
+      this.$refs["applyForm"].validate(valid => {
+        if (valid) {
+          if (this.apply.form.id != null) {
+            updateApply(this.apply.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.apply.open = false;
+              this.getlistApply();
+            });
+          } else {
+            this.apply.form.defaultCard = '1'
+            addApply(this.apply.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.apply.open = false;
+              this.getlistApply();
+            });
+          }
+        }
+      });
+    },
+    // 点击选择居民
+    nameSelect(){
+      this.jmin.visible = true;
+      this.getlistJminfo()
+    },
+    /** 查询居民信息列表 */
+    getlistJminfo() {
+      this.jmin.loading = true;
+      listJminfo(this.jmin.queryParams).then(response => {
+        this.jmin.list = response.rows;
+        this.jmin.total = response.total;
+        this.jmin.loading = false;
+      });
+    },
+    // 居民查询
+    jminQuery(){
+      this.jmin.queryParams.pageNum = 1;
+      this.getlistJminfo();
+    },
+    // 居民选择 选中数据
+    jminDblclick(row) {
+      this.apply.form.jmId = row.id;
+      this.apply.form.name = row.name;
+      this.apply.form.cardId = row.cardId;
+      this.apply.form.phone = row.phone;
+      this.jmin.visible = false
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/szxc/yscentre/index.vue b/ruoyi-ui/src/views/szxc/yscentre/index.vue
index fca179f..0cb9d8d 100644
--- a/ruoyi-ui/src/views/szxc/yscentre/index.vue
+++ b/ruoyi-ui/src/views/szxc/yscentre/index.vue
@@ -418,17 +418,17 @@ export default {
         selectedRow: null,
         // 表单校验
         rules: {
-          cardNum: [
-            { required: true, message: "银行卡号不能为空", trigger: "blur" }
+          voteName: [
+            { required: true, message: "投票人不能为空", trigger: "blur" }
           ],
-          bankNum: [
-            { required: true, message: "银行行号不能为空", trigger: "blur" }
+          cardId: [
+            { required: true, message: "身份证号不能为空", trigger: "blur" }
           ],
-          bankName: [
-            { required: true, message: "银行名称不能为空", trigger: "blur" }
+          vote: [
+            { required: true, message: "议事结果不能为空", trigger: "blur" }
           ],
-          bankAddress: [
-            { required: true, message: "开户行不能为空", trigger: "blur" }
+          opinion: [
+            { required: true, message: "意见建议不能为空", trigger: "blur" }
           ],
         },
       },