Merge branch 'dev-shuju' into test

src/views/modules/communityParty/elegant/index.vue

@@ -127,7 +127,7 @@
       :close-on-click-modal="false"
       :before-close="handlerCancle"
     >
-      <el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
+      <el-form v-if="dialogVisible" label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
         <el-form-item label="所属网格" prop="gridId">
           <el-select v-model="form.gridId" filterable
           :disabled="disabled" placeholder="请选择" class="input-width" clearable>
@@ -258,7 +258,9 @@ export default {
         imageList: []
       },
       rules: {
-        categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
+        gridId: [{ required: true, message: '网格不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
       }
     }
   },