Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

src/views/modules/news/notice-add-or-update.vue

@@ -6,7 +6,6 @@
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="所属街道"
                     prop="streetId">

src/views/modules/user/user-add-or-update.vue

@@ -51,7 +51,7 @@
                     prop="address">
         <span>{{dataForm.address}}</span>
       </el-form-item>
-      <el-form-item label="是否通过审核"
+      <el-form-item label="通过审核"
                     prop="pass">
         <template>
           <el-radio v-model="dataForm.pass"
@@ -60,6 +60,10 @@
                     label="0">否</el-radio>
         </template>
       </el-form-item>
+      <el-form-item label="审核备注">
+        <el-input v-model="dataForm.remark"
+                  placeholder="审核备注"></el-input>
+      </el-form-item>
       <p></p>
       <el-form-item label="用户标签"
                     prop="tagIds">
@@ -93,7 +97,8 @@ export default {
         community: '',
         grid: '',
         tagIds: [],
-        registTime: ''
+        registTime: '',
+        remark: ''
       },
       partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],