Merge remote-tracking branch 'origin/dev_1114' into dev_1114

src/views/modules/api/scanswitch-add-or-update.vue

@@ -8,10 +8,27 @@
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="扫码开关 0关1开"
-                    prop="scanSwitch">
-        <el-input v-model="dataForm.scanSwitch"
-                  placeholder="扫码开关 0关1开"></el-input>
+      <el-form-item label="版本号"
+                    prop="versionNum">
+        <el-input v-model="dataForm.versionNum"
+                  placeholder="版本号"></el-input>
+      </el-form-item>
+      <el-form-item label="扫码开关" prop="scanFlag">
+        <el-select v-model="dataForm.scanFlag" placeholder="扫码开关">
+          <el-option v-for="item in scanFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维护状态" prop="maintainFlag">
+        <el-select v-model="dataForm.maintainFlag" placeholder="维护状态">
+          <el-option v-for="item in maintainFlagArr" :key="item.maintainValue" :label="item.maintainName" :value="item.maintainValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维护信息"
+                    prop="maintainInfo">
+        <el-input v-model="dataForm.maintainInfo"
+                  placeholder="维护信息"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -30,19 +47,36 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        scanSwitch: '',
+        versionNum: '',
+        maintainInfo: '',
+        scanFlag: '',
+        maintainFlag: '',
         delFlag: '',
         creator: '',
         createdTime: '',
         updater: '',
         updatedTime: ''
-      }
+      },
+      scanFlagArr: [
+        { dictValue: 0, dictName: '关闭扫码' },
+        { dictValue: 1, dictName: '开启扫码' }
+      ],
+      maintainFlagArr: [
+        { maintainValue: 0, maintainName: '关闭维护' },
+        { maintainValue: 1, maintainName: '开启维护' }
+      ]
     }
   },
   computed: {
     dataRule () {
       return {
-        scanSwitch: [
+        scanFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        maintainFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        versionNum: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         delFlag: [

src/views/modules/api/scanswitch.vue

@@ -35,8 +35,22 @@
                          label="id"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="scanSwitch"
-                         label="开关状态：0-需要扫码；1-不需要扫码"
+        <el-table-column prop="versionNum"
+                         label="版本号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="scanFlag"
+                         label="开关状态"
+                         header-align="center"
+                         align="center"
+                         :formatter="stateFormat"></el-table-column>
+        <el-table-column prop="maintainFlag"
+                         label="维护状态"
+                         header-align="center"
+                         align="center"
+                         :formatter="maintainStateFormat"></el-table-column>
+        <el-table-column prop="maintainInfo"
+                         label="维护信息"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="createdBy"
@@ -107,6 +121,22 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    stateFormat (row, column) {
+      if (row.scanFlag === 0) {
+        return '关闭扫码'
+      } else {
+        return '开启扫码'
+      }
+    },
+    maintainStateFormat (row, column) {
+      if (row.maintainFlag === 0) {
+        return '关闭维护'
+      } else {
+        return '开启维护'
+      }
+    }
   }
 }
 </script>

src/views/modules/events/issue-close-detail-view.vue

@@ -17,7 +17,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:">
@@ -43,7 +43,7 @@
                     </el-form-item>
                 </el-form>
                 <div class="container">
-                    <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.issueAddress}}</div>
+                    <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.address}}</div>
                     <div id="map"></div>
                 </div>
             </div>
@@ -160,9 +160,9 @@ export default {
   filters: {
     formatState (item) {
       if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS.length > 0) {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
           return '吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS.length === 0) {
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
           return '关闭'

src/views/modules/events/issue-process-detail-view.vue

@@ -16,7 +16,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="distributeTime">

src/views/modules/events/issue-reject-detail-view.vue

@@ -17,7 +17,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">

src/views/modules/events/issue-review-detail-view.vue

@@ -16,7 +16,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
@@ -131,9 +131,20 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.categoryOptions = res.data
+        var data = res.data
+        this.getSelectedNode(data, data)
+        this.categoryOptions = data
       }).catch(() => { })
     },
+    getSelectedNode (nodeData, parent) {
+      nodeData.forEach(item => {
+        if ('children' in item && item.children.length === 0) {
+          delete item.children
+        } else if ('children' in item && item.children.length) {
+          this.getSelectedNode(item.children, item)
+        }
+      })
+    },
     initBmap (latitude, longitude) {
       this.map = new BMap.Map('map')
       const point = new BMap.Point(longitude, latitude)

src/views/modules/events/item-close-detail-view.vue

@@ -14,7 +14,7 @@
                           @click="clickImg(url)">
                 </el-image>
             </el-form-item>
-              <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+              <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
                   <div>{{dataForm.groupName}}</div>
               </el-form-item>
             <el-form-item label="上报时间:">
@@ -170,9 +170,9 @@ export default {
   filters: {
     formatState (item) {
       if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS.length > 0) {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
           return '吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS.length === 0) {
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
           return '关闭'

src/views/modules/events/item-deal-detail-view.vue

@@ -14,7 +14,7 @@
                       @click="clickImg(url)">
             </el-image>
           </el-form-item>
-          <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+          <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
             <div>{{dataForm.groupName}}</div>
           </el-form-item>
           <el-form-item label="上报时间:" prop="distributeTime">
@@ -221,9 +221,9 @@ export default {
   filters: {
     formatState (item) {
       if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS.length > 0) {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
           return '吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS.length === 0) {
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
           return '关闭'
@@ -316,6 +316,7 @@ export default {
           this.postDataForm.deptResultDTOS = []
           this.postDataForm.evaluateDeptDTOS = []
           this.getInfo()
+          this.getCommentList()
         }
       })
     },
@@ -352,7 +353,6 @@ export default {
           this.timeLineList.forEach((item, index) => {
             const oDiv = document.getElementById(`content${index}`)
             const oBorder = oDiv.parentNode.parentNode.parentNode.firstChild
-            console.log(111)
             if (item.type === 'issue' || item.type === 'issue-project') {
               oBorder.style.borderLeft = '1px solid #ffa546'
             } else if (item.type === 'project') {
@@ -427,16 +427,16 @@ export default {
       } else {
         this.postDataForm.deptResultDTOS = []
       }
-      if (this.postDataForm.handleAdvice === '') {
+      if (this.postDataForm.outHandleAdvice === '') {
         return this.$message.error('回复居民意见不能为空')
       }
-      if (this.postDataForm.handleAdvice.length > 500) {
+      if (this.postDataForm.outHandleAdvice.length > 500) {
         return this.$message.error('回复居民意见不能超过500字')
       }
-      if (this.postDataForm.outHandleAdvice === '') {
+      if (this.postDataForm.handleAdvice === '') {
         return this.$message.error('项目处理意见不能为空')
       }
-      if (this.postDataForm.outHandleAdvice > 500) {
+      if (this.postDataForm.handleAdvice > 500) {
         return this.$message.error('项目处理意见不能超过500字')
       }
       if (this.evaluateDeptDTOSVisible) {

src/views/modules/group/group.vue

@@ -140,7 +140,7 @@ export default {
         name: '审核不通过'
       }, {
         id: '10',
-        name: '审核通过'
+        name: '正常'
       }, {
         id: '15',
         name: '禁言'

src/views/modules/news/banner.vue

@@ -13,10 +13,10 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button type="primary"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -74,9 +74,9 @@
                          align="center"
                          width="150">
           <template slot-scope="scope">
-            <el-button type="text"
+            <!-- <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> -->
             <el-button type="text"
                        size="small"
                        @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>

src/views/modules/news/news.vue

@@ -6,12 +6,10 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item label="所属机构">
-          <el-cascader
-            v-model="deptIdList"
-            :options="options"
-            :props="{ checkStrictly: true }"
-            clearable
-          ></el-cascader>
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
         </el-form-item>
         <!--<el-form-item label="所属街道"
                       prop="deptId">
@@ -223,7 +221,7 @@ export default {
         }
         this.options = res.data.options
       })
-      .catch(() => {})
+      .catch(() => { })
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
@@ -398,6 +396,8 @@ export default {
     'deptIdList': function (val) {
       if (val.length !== 0) {
         this.dataForm.gridId = val[val.length - 1]
+      } else {
+        this.dataForm.gridId = ''
       }
     }
   }

src/views/modules/news/newsdraft.vue

@@ -6,12 +6,10 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item label="所属机构">
-          <el-cascader
-            v-model="deptIdList"
-            :options="options"
-            :props="{ checkStrictly: true }"
-            clearable
-          ></el-cascader>
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
         </el-form-item>
         <!--<el-form-item label="所属街道"
                       prop="deptId">
@@ -209,7 +207,7 @@ export default {
         }
         this.options = res.data.options
       })
-      .catch(() => {})
+      .catch(() => { })
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
@@ -355,6 +353,8 @@ export default {
     'deptIdList': function (val) {
       if (val.length !== 0) {
         this.dataForm.gridId = val[val.length - 1]
+      } else {
+        this.dataForm.gridId = ''
       }
     }
   }

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

@@ -7,7 +7,7 @@
              :rules="dataRule"
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="所属机构">
+      <el-form-item label="所属机构"  prop="allDeptIdsShow">
         <el-cascader
                 v-model="dataForm.allDeptIdsShow"
                 :options="options"
@@ -15,42 +15,6 @@
                 clearable
         ></el-cascader>
       </el-form-item>
-      <!--<el-form-item label="所属街道"
-                    prop="streetId">
-        <el-select v-model="dataForm.streetId"
-                   @change="changeStreet"
-                   placeholder="所属街道">
-          <el-option v-for="item in streetList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属社区"
-                    prop="communityId">
-        <el-select v-model="dataForm.communityId"
-                   @change="changeCommunity"
-                   placeholder="所属社区">
-          <el-option v-for="item in communityList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属网格"
-                    prop="gridId">
-        <el-select v-model="value"
-                   @change="changeGrid"
-                   placeholder="所属网格">
-          <el-option v-for="item in gridList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>-->
       <el-form-item label="通知标题"
                     prop="noticeTitle">
         <el-input v-model="dataForm.noticeTitle"
@@ -137,6 +101,9 @@ export default {
         streetId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        allDeptIdsShow: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         noticeTitle: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -240,8 +207,10 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      if ((this.dataForm.noticeContent).length > 10000) {
-        return this.$message.error('您输入的的内容已超过字数不能提交')
+      if (this.dataForm.noticeContent != null && this.dataForm.noticeContent !== undefined) {
+        if ((this.dataForm.noticeContent).length > 10000) {
+          return this.$message.error('您输入的的内容已超过字数不能提交')
+        }
       }
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {

src/views/modules/news/notice.vue

@@ -40,8 +40,7 @@
         <el-table-column prop="deptName"
                          label="通知所属部门"
                          header-align="center"
-                         align="center"
-                         :formatter="showDeptNameFormatter"></el-table-column>
+                         align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"

src/views/modules/user/fail-authentication.vue

@@ -27,7 +27,6 @@
                 </el-form-item>
                 <el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
                 <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-                <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
                 <div class="block">
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
@@ -43,7 +42,8 @@
                 <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="state" label="审核状态" :formatter="formatState"   header-align="center" align="center"></el-table-column>
+                <el-table-column prop="nickname" label="昵称" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="state" label="审核状态" v-if="false" :formatter="formatState"   header-align="center" align="center"></el-table-column>
                 <el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="address" label="居住地址" header-align="center" align="center"></el-table-column>
                 <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">

src/views/modules/user/hasAuthenticationpartymembers.vue

@@ -12,7 +12,7 @@
                        clearable>
           </el-cascader>
         </el-form-item>
-        <el-form-item label="注册状态">
+        <!-- <el-form-item label="注册状态">
           <el-select v-model="dataForm.registFlag"
                      clearable
                      placeholder="请选择">
@@ -22,7 +22,7 @@
                        :value="item.dictValue">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <br>
         <el-form-item label="姓名">
           <el-input v-model="dataForm.realName"

src/views/modules/user/partyauthenticationfailed.vue

@@ -1,38 +1,91 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-user__partyauthenticationfailed}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
-        <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-        <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
-        <span class="demonstration">认证时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.realName"
+                    placeholder="请输入"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile"
+                    placeholder="请输入"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input v-model="dataForm.identityNo"
+                    placeholder="请输入"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="认证时间">
+          <el-date-picker @change='setRegistTime'
+                          v-model="time"
+                          value-format="yyyy-MM-dd"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>&nbsp;
+          <el-form-item>
+            <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="realName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridName" label="认证网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="认证时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="realName"
+                         label="姓名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="identityNo"
+                         label="身份证号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="手机号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="所属网格"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="认证时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="address"
+                         label="居民住址"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <!-- <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('partyauthenticationfailed:view')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('partyauthenticationfailed:view')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.userId)">{{ $t('look') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 查看 -->
       <add-or-update v-if="addOrUpdateVisible"

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

@@ -102,12 +102,7 @@ export default {
         mobile: '',
         identityNo: '',
         cadreFlag: '',
-        streetId: '',
-        streetName: '',
-        communityId: '',
-        communityName: '',
         gridId: '',
-        gridName: '',
         tagIds: [],
         allDeptIds: []
       },

src/views/modules/user/partymembers.vue

@@ -47,7 +47,7 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="注册状态">
+        <!-- <el-form-item label="注册状态">
           <el-select v-model="dataForm.registFlag"
                      clearable
                      placeholder="请选择">
@@ -57,7 +57,7 @@
                        :value="item.dictValue">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <br>
         <el-form-item label="姓名">
           <el-input v-model="dataForm.realName"
@@ -74,16 +74,16 @@
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
-        <!-- <el-form-item label="职务">
-          <el-select v-model="dataForm.postId" placeholder="请选择">
-            <el-option
-              v-for="item in postOptions"
-              :key="item.dictValue"
-              :label="item.dictName"
-              :value="item.dictValue">
+        <el-form-item label="职务">
+          <el-select v-model="dataForm.postId"
+                     placeholder="请选择">
+            <el-option v-for="item in postOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
             </el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <br>
         <el-form-item label="注册时间">
           <el-date-picker v-model="timeRange"
@@ -165,9 +165,8 @@
                          label="角色"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="registFlag"
-                         label="注册状态"
-                         :formatter="formatRegist"
+        <el-table-column prop="partyOrganization"
+                         label="所在党委"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="registTime"

src/views/modules/user/pass-authentication.vue

@@ -27,7 +27,6 @@
                 </el-form-item>
                 <el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
                 <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-                <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
                 <div class="block">
                   <el-form-item label="是否是党员">
                     <el-select v-model="dataForm.partyFlag" clearable placeholder="请选择" >
@@ -45,9 +44,6 @@
                 <el-table-column label="序号" width="70px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
                 <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="partyFlag" label="是否党员" :formatter="formatPartyFlag" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="state" label="审核状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="address" label="居住地址" header-align="center" align="center"></el-table-column>
                 <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">

src/views/modules/user/unauthorized.vue

@@ -25,30 +25,29 @@
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
-                <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-                <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
-                <div class="block">
+                <el-form-item label="昵称"><el-input v-model="dataForm.nickname" placeholder="请输入" clearable></el-input></el-form-item>
+                <!-- <div class="block"> -->
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
                   <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
                   <el-form-item>
                     <el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
                   </el-form-item>
-                </div>
+                <!-- </div> -->
               </el-form>
               <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
                 <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
                 <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
-                <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="state" label="注册状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="myGridName" label="所属网格（街道-社区-网格）" header-align="center" align="center" v-if="false"></el-table-column>
+                <el-table-column prop="nickname" label="昵称" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="realName" label="真实姓名" header-align="center" align="center" v-if="false"></el-table-column>
+                <el-table-column prop="mobile" label="手机号" header-align="center" align="center" v-if="false"></el-table-column>
+                <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center" v-if="false"></el-table-column>
                 <el-table-column prop="registerTime" label="加入网格时间" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="myGridName" label="所属网格（街道-社区-网格）" header-align="center" align="center"></el-table-column>
-                <!--<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
+                <el-table-column prop="state" label="注册状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+                <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
                   <template slot-scope="scope"><el-button  type="text" size="small" @click="userDetailHandle(scope.row.id)">查看</el-button></template>
-                </el-table-column> -->
+                </el-table-column>
               </el-table>
               <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle"></el-pagination>
         <!-- 弹窗, 新增 / 修改 -->
@@ -84,7 +83,8 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '0'
+        state: '0',
+        nickname: ''
       },
       deptIdList: [],
       options: [],

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

@@ -89,6 +89,13 @@
           </el-table-column> -->
           <el-table-column prop="allDeptNames"
                            label="街道-社区-网格">
+            </el-table-column>
+          <el-table-column prop="grid"
+                           label="网格名称" v-if="false">
+          </el-table-column>
+          <el-table-column prop="leaderFlag"
+                           label="是否为网格长"
+                           :formatter="showLeaderFlagFormatter">
           </el-table-column>
         </el-table>
       </el-form-item>
@@ -234,6 +241,14 @@ export default {
         this.$refs.authenticateHistory.dataForm.userId = userId
         this.$refs.authenticateHistory.init()
       })
+    },
+    showLeaderFlagFormatter (row, column, cellValue, index) {
+      console.log(cellValue)
+      if (cellValue === '1') {
+        return '是'
+      } else {
+        return '否'
+      }
     }
   },
   components: {

src/views/modules/user/user-detail.vue

@@ -9,22 +9,22 @@
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="真实姓名"
-                    prop="realName">
+                    prop="realName" v-if="dataForm.realName">
         <span>{{dataForm.realName}}</span>
       </el-form-item>
       <el-form-item label="手机号"
-                    prop="mobile">
+                    prop="mobile" v-if="dataForm.mobile">
         <span>{{dataForm.mobile}}</span>
       </el-form-item>
       <el-form-item label="身份证号"
-                    prop="identityNo">
+                    prop="identityNo" v-if="dataForm.identityNo">
         <span>{{dataForm.identityNo}}</span>
       </el-form-item>
       <el-form-item label="居民住址"
-                    prop="address">
+                    prop="address" v-if="dataForm.address">
         <span>{{dataForm.address}}</span>
       </el-form-item>
-      <el-form-item label="是否党员"
+      <el-form-item label="是否党员" v-if="false"
                     prop="partyFlag">
         <span v-if="dataForm.partyFlag === '0'">否</span>
         <span v-if="dataForm.partyFlag === '1'">是</span>
@@ -41,11 +41,11 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="通过审核"
-                    prop="state">
+                    prop="state" v-if="dataForm.state==='3'||dataForm.state==='2'">
         <span v-if="dataForm.state === '3'">是</span>
         <span v-if="dataForm.state === '2'">否</span>
       </el-form-item>
-      <el-form-item v-if="dataForm.state === '2'"
+      <el-form-item v-if="dataForm.state === '2' && dataForm.remark"
                     label="审核备注"
                     prop="remark">
         <span>{{dataForm.remark}}</span>
@@ -62,9 +62,15 @@
           <el-table-column prop="grid"
                            label="网格">
           </el-table-column> -->
+          <el-table-column prop="id"
+                           label="主键" v-if="false">
+          </el-table-column>
           <el-table-column prop="allDeptNames"
                            label="街道-社区-网格">
           </el-table-column>
+          <el-table-column prop="grid"
+                           label="网格名称" v-if="false">
+          </el-table-column>
           <el-table-column prop="leaderFlag"
                            label="是否为网格长"
                            :formatter="showLeaderFlagFormatter">
@@ -119,6 +125,7 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           this.getInfo()
+          this.queryUserGridList()
         }
       })
       this.getTagOptions()
@@ -143,6 +150,9 @@ export default {
         }
         this.dataForm.tagIds = []
       }).catch(() => { })
+    },
+    // 获取用户网格列表
+    queryUserGridList () {
       this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)

src/views/modules/user/user-grid.vue

@@ -16,6 +16,7 @@
       >
       </el-table-column> -->
       <el-table-column prop="allDeptNames" label="街道-社区-网格"> </el-table-column>
+      <el-table-column prop="grid" label="网格名称" v-if="false"> </el-table-column>
       <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
         <template slot-scope="scope">
           <el-button  type="text" size="small" @click="unbindGridHandle(scope.row.id,scope.row.userId)">解除</el-button>

src/views/modules/user/wait-authentication.vue

@@ -26,24 +26,20 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
-                <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-                <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
-                <div class="block">
+                <!-- <div class="block"> -->
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
                   <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
                   <el-form-item>
                     <el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
                   </el-form-item>
-                </div>
+                <!-- </div> -->
               </el-form>
               <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
                 <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
                 <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
                 <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="state" label="注册状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="address" label="居住地址" header-align="center" align="center"></el-table-column>
                 <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">