Merge remote-tracking branch 'origin/feature/lc_majorization'

# Conflicts: # public/index.html
5 years ago · c9c346aa6e
50 changed files with 247 additions and 72 deletions
--- a/public/index.html
+++ b/public/index.html
@ -36,13 +36,15 @@
  <!-- 开发环境 -->
  <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
  <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    // window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://eug-test.elinkit.com.cn/js/epdc-api'
+    // window.SITE_CONFIG['apiURL'] = 'https://epdc-jinshui.elinkservice.cn/epdc-api'
  </script>
  <% } %>
  <!-- 集成测试环境 -->
  <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
  <script>
-    window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://eug-test.elinkit.com.cn/js/epdc-api'
  </script>
  <% } %>
  <!-- 验收测试环境 -->
@ -63,4 +65,4 @@
  <div id="app"></div>
 </body>

-</html>
+</html>
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@ -35,7 +35,10 @@ export default {
  },
  methods: {
    // 获取数据列表
-    getDataList () {
+    getDataList ( pageReset = true) {
+      if (pageReset) {
+        this.page = 1
+      }
      this.dataListLoading = true
      this.$http.get(
        this.mixinViewModuleOptions.getDataListURL,
@ -85,7 +88,7 @@ export default {
    // 分页, 当前页
    pageCurrentChangeHandle (val) {
      this.page = val
-      this.getDataList()
+      this.getDataList(false)
    },
    // 新增 / 修改
    addOrUpdateHandle (id) {
--- a/src/views/modules/analysis/user/gridopening.vue
+++ b/src/views/modules/analysis/user/gridopening.vue
@ -60,6 +60,7 @@
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
        <el-table-column label="序号"
+                         align="center"
                         width="70px">
          <template slot-scope="scope">
            {{scope.$index+1}}
--- a/src/views/modules/api/imgconfig-add-or-update.vue
+++ b/src/views/modules/api/imgconfig-add-or-update.vue
@ -39,6 +39,15 @@
      <el-form-item label="备注" prop="remark">
        <el-input type="textarea" autosize  v-model="dataForm.remark" maxlength="200" placeholder="请输入备注"></el-input>
      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select v-model="dataForm.enableFlag" placeholder="是否启用" clearable>
+          <el-option v-for="item in enableFlagArr"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
      </el-form>
    <template slot="footer">
      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@ -71,7 +80,17 @@ export default {
      optionImgType: [],
      // 图片
      loading: false,
-      uploadUrl: ''
+      uploadUrl: '',
+      enableFlagArr: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ]
    }
  },
  computed: {
--- a/src/views/modules/api/imgconfig.vue
+++ b/src/views/modules/api/imgconfig.vue
@ -24,6 +24,7 @@
      </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="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="imgType" label="类型" :formatter="imgTypeFormat" header-align="center" align="center"></el-table-column>
        <el-table-column prop="imgCode" label="图片编码" header-align="center" align="center"></el-table-column>
        <el-table-column align="center" label="图片" :show-overflow-tooltip="true" prop="imgUrl">
@ -45,6 +46,7 @@
        <el-table-column prop="sort" 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="remark" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" :formatter="enableFlagFormat"></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('api:imgconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -109,6 +111,16 @@ export default {
          return this.optionImgType[property].dictName
        }
      }
+    },
+    enableFlagFormat (row) {
+      let enableFlag = row.enableFlag
+      if (enableFlag === '1') {
+        return '是'
+      } else if (enableFlag === '0') {
+        return '否'
+      } else {
+        return '未知'
+      }
    }
  }
 }
--- a/src/views/modules/api/residentconfig.vue
+++ b/src/views/modules/api/residentconfig.vue
@ -24,6 +24,7 @@
      </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="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="residentType" label="配置类型" header-align="center" align="center" :formatter="imgTypeFormat"></el-table-column>
        <el-table-column prop="residentCode" label="配置编码" header-align="center" align="center"></el-table-column>
        <el-table-column prop="residentValue" label="配置内容" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/api/scanswitch.vue
+++ b/src/views/modules/api/scanswitch.vue
@ -31,6 +31,11 @@
                         header-align="center"
                         align="center"
                         width="50"></el-table-column>
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="versionNum"
                         label="版本号"
                         header-align="center"
--- a/src/views/modules/custom/archives.vue
+++ b/src/views/modules/custom/archives.vue
@ -40,6 +40,9 @@
        <el-form-item>
          <el-button  type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
        </el-form-item>
+        <el-form-item>
+          <el-button  type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
        <el-form-item>
          <el-button type="info"
                     @click="exportMoudleHandle()">导出模板</el-button>
@ -58,7 +61,14 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column label="序号"
+                         align="center"
+                         width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
        <el-table-column prop="dept" label="归属部门" header-align="center" align="center"></el-table-column>
        <el-table-column prop="archivesNum" label="档号" header-align="center" align="center"></el-table-column>
        <el-table-column prop="docNum" label="文号" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/custom/archivesdept-add-or-update.vue
+++ b/src/views/modules/custom/archivesdept-add-or-update.vue
@ -17,6 +17,15 @@
                           label="描述文字"></el-input-number>
        </template>
      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select v-model="dataForm.enableFlag" placeholder="是否启用" clearable>
+          <el-option v-for="item in enableFlagArr"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
    </el-form>
    <template slot="footer">
      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@ -42,7 +51,17 @@ export default {
        createdTime: '',
        updatedBy: '',
        updatedTime: ''
-      }
+      },
+      enableFlagArr: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ]
    }
  },
  computed: {
@ -51,25 +70,7 @@ export default {
        dept: [
          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
        ],
-        deptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
+        enableFlag: [
          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
        ]
      }
--- a/src/views/modules/custom/archivesdept.vue
+++ b/src/views/modules/custom/archivesdept.vue
@ -45,6 +45,7 @@
                         label="归属部门排序"
                         header-align="center"
                         align="center"></el-table-column>
+        <el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" :formatter="enableFlagFormat"></el-table-column>
        <el-table-column :label="$t('handle')"
                         fixed="right"
                         header-align="center"
@ -97,6 +98,16 @@ export default {
  },
  components: {
    AddOrUpdate
+  },
+  methods: {
+    enableFlagFormat: function (row, column) {
+      let enableFlag = row.enableFlag
+      if (enableFlag === '0') {
+        return '否'
+      } else if (enableFlag === '1') {
+        return '是'
+      }
+    }
  }
 }
 </script>
--- a/src/views/modules/custom/deptinfo.vue
+++ b/src/views/modules/custom/deptinfo.vue
@ -17,6 +17,7 @@
      </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="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="deptName" 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="sort" label="排序" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/custom/module.vue
+++ b/src/views/modules/custom/module.vue
@ -20,6 +20,7 @@
      </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="40"></el-table-column>
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="name" label="模块名称" header-align="center" align="center"></el-table-column>
        <el-table-column prop="moduleCode" label="模块编码" header-align="center" align="center" width="170"></el-table-column>
        <el-table-column prop="moduleCategory" label="模块分类" header-align="center" align="center" :formatter="moduleTypeFormat"></el-table-column>
--- a/src/views/modules/custom/reportissue.vue
+++ b/src/views/modules/custom/reportissue.vue
@ -48,6 +48,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="content" label="举报问题描述" show-overflow-tooltip header-align="center" align="center"></el-table-column>
        <el-table-column prop="createdTime" label="提交时间" width="200px" header-align="center" align="center"></el-table-column>
        <el-table-column prop="anonymousFlag" label="是否匿名" width="120px" header-align="center" align="center" :formatter="anonymousFlagFormat"></el-table-column>
--- a/src/views/modules/custom/specialuser.vue
+++ b/src/views/modules/custom/specialuser.vue
@ -33,6 +33,7 @@
      </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="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="suVillage" label="所属村庄" header-align="center" align="center" width="150"></el-table-column>
        <el-table-column prop="suName" label="姓名" header-align="center" align="center"></el-table-column>
        <el-table-column prop="suBirthday" label="出生日期" header-align="center" align="center" :formatter="dateFormatter" width="100"></el-table-column>
--- a/src/views/modules/events/category.vue
+++ b/src/views/modules/events/category.vue
@ -20,6 +20,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
+        <!-- <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> -->
        <table-tree-column prop="categoryName" :label="$t('dept.name')" header-align="center"></table-tree-column>
        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
--- a/src/views/modules/events/eventtag.vue
+++ b/src/views/modules/events/eventtag.vue
@ -13,6 +13,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
        <el-table-column show-overflow-tooltip prop="tagName" label="标签名称" header-align="center" align="center"></el-table-column>
        <el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" width="80" :formatter="enableFlagFormat"></el-table-column>
        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
--- a/src/views/modules/group/gridpartymembergroup.vue
+++ b/src/views/modules/group/gridpartymembergroup.vue
@ -11,7 +11,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
+        <el-table-column type="index" width="50" label="序号" align="center"></el-table-column>
        <el-table-column prop="district" label="市区" header-align="center" align="center"></el-table-column>
        <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
        <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@ -34,6 +34,7 @@
                style="width: 100%;">
        <el-table-column type="index"
                         width="50"
+                         align="center"
                         label="序号"></el-table-column>
        <el-table-column prop="groupName"
                         label="社群名称"
--- a/src/views/modules/group/topic-list.vue
+++ b/src/views/modules/group/topic-list.vue
@ -38,7 +38,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="关键词" prop="keyword">
-          <el-input v-model.trim="dataForm.keyword" placeholder="" clearable ></el-input>
+          <el-input v-model.trim="dataForm.keyword" placeholder="请输入" clearable ></el-input>
        </el-form-item>
        <el-form-item label="排序方式">
          <el-select v-model="dataForm.orderType" clearable
--- a/src/views/modules/heart/actapplyinfo.vue
+++ b/src/views/modules/heart/actapplyinfo.vue
@ -1,11 +1,45 @@
 <template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-news__actapplyinfo}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model.trim="dataForm.actTitle"
+                    placeholder="志愿服务标题"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="dataForm.actContacts"
+                    placeholder="联系人"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="dataForm.actTel"
+                    placeholder="联系电话"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button v-if="$hasPermission('news:archivesdept:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:archivesdept:delete')"
+                     type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="actTitle" label="志愿服务标题" header-align="center" align="center" show-overflow-tooltip></el-table-column>
        <el-table-column prop="actStatus" label="活动状态" header-align="center" align="center" :formatter="formatActStatus"></el-table-column>
        <el-table-column prop="createdTime" label="申请时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actContacts" label="联系人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actTel" 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  type="text" size="small"  @click="phraseDetailHandle(scope.row.id)">查看</el-button>
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@ -50,6 +50,11 @@
                         header-align="center"
                         align="center"
                         width="50"></el-table-column>
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="phrase"
                         label="常用语" show-overflow-tooltip
                         header-align="center"
--- a/src/views/modules/news/banner.vue
+++ b/src/views/modules/news/banner.vue
@ -23,6 +23,11 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column show-overflow-tooltip
                         prop="title"
                         label="标题"
--- a/src/views/modules/news/newscategory.vue
+++ b/src/views/modules/news/newscategory.vue
@ -15,7 +15,8 @@
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
          <el-table-column
            label="序号"
-            width="70px">
+            align="center"
+            width="50px">
        <template slot-scope="scope">
            {{scope.$index+1}}
        </template>
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@ -96,6 +96,7 @@
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
        <el-table-column label="序号"
+                         align="center"
                         width="50px">
          <template slot-scope="scope">
            {{scope.$index+1}}
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@ -37,6 +37,11 @@
        <el-table-column type="selection"
                         header-align="center"
                         align="center"></el-table-column>
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="noticeTitle"
                         label="通知标题"
                         header-align="center"
--- a/src/views/modules/partygroup/partygroupguide.vue
+++ b/src/views/modules/partygroup/partygroupguide.vue
@ -30,6 +30,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="content" label="内容" header-align="center" align="center" min-width="250" show-overflow-tooltip></el-table-column>
        <el-table-column prop="dayOfWeek" :formatter="dayOfWeekFormat" label="显示时间" header-align="center" align="center"></el-table-column>
        <el-table-column prop="partyGroupName" label="党群名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
--- a/src/views/modules/points/points-grid.vue
+++ b/src/views/modules/points/points-grid.vue
@ -26,6 +26,11 @@
                @selection-change="dataListSelectionChangeHandle"
                @sort-change="dataListSortChangeHandle"
                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="allDeptNames"
                         label="部门名称"
                         header-align="center"
--- a/src/views/modules/points/points-statistics.vue
+++ b/src/views/modules/points/points-statistics.vue
@ -35,6 +35,11 @@
                @selection-change="dataListSelectionChangeHandle"
                @sort-change="dataListSortChangeHandle"
                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="operationDesc"
                         label="积分类别"
                         header-align="center"
--- a/src/views/modules/points/user.vue
+++ b/src/views/modules/points/user.vue
@ -27,6 +27,7 @@
        @selection-change="dataListSelectionChangeHandle"
        @sort-change="dataListSortChangeHandle"
        style="width: 100%;">
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="realName" label="姓名" header-align="center" align="center" :formatter="realNameFormat"></el-table-column>
        <el-table-column prop="mobile" label="手机号" sortable="custom" header-align="center" align="center"></el-table-column>
        <el-table-column prop="communityName" label="所属社区" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@ -53,6 +53,11 @@
                         header-align="center"
                         align="center"
                         width="50"></el-table-column> -->
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="street"
                         label="街道"
                         header-align="center"
--- a/src/views/modules/sys/modulemacode.vue
+++ b/src/views/modules/sys/modulemacode.vue
@ -31,6 +31,10 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
+        <el-table-column type="index"
+                         label="序号"
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="moduleMaCode"
                         label="所属模块"
                         header-align="center"
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@ -81,11 +81,12 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
-                         width="50"></el-table-column>
+                         width="50"></el-table-column> -->
        <el-table-column label="序号"
+                         align="center"
                         width="50px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
        <el-table-column prop="realName"
                         label="真实姓名"
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@ -26,17 +26,17 @@
        <br>
        <el-form-item label="姓名">
          <el-input v-model.trim="dataForm.realName"
-                    placeholder=""
+                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="手机号">
          <el-input v-model.trim="dataForm.mobile"
-                    placeholder=""
+                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="身份证号">
          <el-input v-model.trim="dataForm.identityNo"
-                    placeholder=""
+                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
        <br>
@ -66,9 +66,14 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
+                         width="50"></el-table-column> -->
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
                         width="50"></el-table-column>
        <el-table-column prop="realName"
                         label="姓名"
--- a/src/views/modules/user/houseFamilyInfo.vue
+++ b/src/views/modules/user/houseFamilyInfo.vue
@ -4,7 +4,7 @@
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
        <el-form-item label="户主姓名">
          <el-input v-model.trim="dataForm.residentsName"
-                    placeholder=""
+                    placeholder="请输入户主姓名"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="家庭类别" prop="familyCategory">
--- a/src/views/modules/user/housebusinessinfo.vue
+++ b/src/views/modules/user/housebusinessinfo.vue
@ -4,17 +4,17 @@
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
        <el-form-item label="经营者姓名">
          <el-input v-model.trim="dataForm.legalRepresentative"
-                    placeholder=""
+                    placeholder="请输入经营者姓名"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="企业名称">
          <el-input v-model.trim="dataForm.enterpriseName"
-                    placeholder=""
+                    placeholder="请输入企业名称"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="企业注册号">
          <el-input v-model.trim="dataForm.socialUniformCode"
-                    placeholder=""
+                    placeholder="请输入企业注册号"
                    clearable></el-input>
        </el-form-item>
        <br>
--- a/src/views/modules/user/housinginformation.vue
+++ b/src/views/modules/user/housinginformation.vue
@ -4,17 +4,17 @@
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
        <el-form-item label="房屋地址">
          <el-input v-model.trim="dataForm.houseAddress"
-                    placeholder=""
+                    placeholder="请输入地址"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="产权人">
          <el-input v-model.trim="dataForm.propertyOwner"
-                    placeholder=""
+                    placeholder="请输入产权人"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="联系电话">
          <el-input v-model.trim="dataForm.propertyOwnerMobile"
-                    placeholder=""
+                    placeholder="请输入联系电话"
                    clearable></el-input>
        </el-form-item>
        <br>
--- a/src/views/modules/user/party-wait-authentication.vue
+++ b/src/views/modules/user/party-wait-authentication.vue
@ -81,11 +81,12 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
-                         width="50"></el-table-column>
+                         width="50"></el-table-column> -->
        <el-table-column label="序号"
+                         align="center"
                         width="50px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
        <el-table-column prop="realName"
                         label="姓名"
@ -114,7 +115,7 @@
                         align="center"
                         min-width="180"
                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="updatedTime"
+        <el-table-column prop="createdTime"
                         label="提交时间"
                         header-align="center"
                         align="center"
--- a/src/views/modules/user/partyauthenticationfailed.vue
+++ b/src/views/modules/user/partyauthenticationfailed.vue
@ -42,9 +42,14 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
+                         width="50"></el-table-column> -->
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
                         width="50"></el-table-column>
        <el-table-column prop="realName"
                         label="姓名"
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@ -61,17 +61,17 @@
        <br>
        <el-form-item label="姓名">
          <el-input v-model.trim="dataForm.realName"
-                    placeholder=""
+                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="手机号">
          <el-input v-model.trim="dataForm.mobile"
-                    placeholder=""
+                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="身份证号">
          <el-input v-model.trim="dataForm.identityNo"
-                    placeholder=""
+                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
        <!-- <el-form-item label="职务">
@ -139,6 +139,11 @@
                         header-align="center"
                         align="center"
                         width="50"></el-table-column>
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="realName"
                         label="姓名"
                         header-align="center"
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@ -81,11 +81,12 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
-                         width="50"></el-table-column>
+                         width="50"></el-table-column> -->
        <el-table-column label="序号"
+                         align="center"
                         width="50px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
        <el-table-column prop="realName"
                         label="真实姓名"
--- a/src/views/modules/user/pointsgrade.vue
+++ b/src/views/modules/user/pointsgrade.vue
@ -7,6 +7,7 @@
        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="grade" label="等级系数" header-align="center" align="center"></el-table-column>
        <el-table-column prop="points" label="积分系数" header-align="center" align="center"></el-table-column>
        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/user/populationMotorVehicle.vue
+++ b/src/views/modules/user/populationMotorVehicle.vue
@ -14,7 +14,7 @@
        </el-form-item>
        <el-form-item label="车主姓名">
          <el-input v-model.trim="dataForm.residentsName"
-                    placeholder=""
+                    placeholder="请输入车主姓名"
                    clearable></el-input>
        </el-form-item>
        <el-form-item>
--- a/src/views/modules/user/populationinformation.vue
+++ b/src/views/modules/user/populationinformation.vue
@ -4,17 +4,17 @@
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
        <el-form-item label="姓名">
          <el-input v-model.trim="dataForm.residentsName"
-                    placeholder=""
+                    placeholder="请输入姓名"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="联系电话">
          <el-input v-model.trim="dataForm.residentsPhone"
-                    placeholder=""
+                    placeholder="请输入联系电话"
                    clearable></el-input>
        </el-form-item>
        <el-form-item label="身份证号">
          <el-input v-model.trim="dataForm.residentsIdentityNo"
-                    placeholder=""
+                    placeholder="请输入身份证号"
                    clearable></el-input>
        </el-form-item>
        <br>
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@ -52,7 +52,7 @@
                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="手机号" v-if="false">
          <el-input v-model.trim="dataForm.mobile"
                    placeholder="请输入"
                    clearable></el-input>
@ -81,12 +81,13 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
-                         width="50"></el-table-column>
+                         width="50"></el-table-column> -->
        <el-table-column label="序号"
-                         width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+                         align="center"
+                         width="50px"><template slot-scope="scope">{{(scope.$index+1)}}</template></el-table-column>
        <el-table-column prop="myGridName"
                         label="所属网格（街道-社区-网格）"
                         header-align="center"
@ -99,7 +100,7 @@
        <el-table-column prop="mobile"
                         label="手机号"
                         header-align="center"
-                         align="center"></el-table-column>
+                         align="center" v-if="false"></el-table-column>
        <el-table-column prop="realName"
                         label="真实姓名"
                         header-align="center"
@ -111,14 +112,14 @@
                         align="center"
                         v-if="false"></el-table-column>
        <el-table-column prop="createdTime"
-                         label="加入网格时间"
+                         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>
+                         align="center" v-if="false"></el-table-column>
        <el-table-column :label="$t('handle')"
                         fixed="right"
                         header-align="center"
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@ -97,6 +97,9 @@
                           label="是否为网格长"
                           :formatter="showLeaderFlagFormatter">
          </el-table-column>
+          <el-table-column prop="createdTime"
+                           label="加入网格时间">
+          </el-table-column>
        </el-table>
      </el-form-item>
      <!-- <el-form-item label="用户标签"
--- a/src/views/modules/user/user-detail.vue
+++ b/src/views/modules/user/user-detail.vue
@ -75,6 +75,9 @@
                           label="是否为网格长"
                           :formatter="showLeaderFlagFormatter">
          </el-table-column>
+          <el-table-column prop="createdTime"
+                           label="加入网格时间">
+          </el-table-column>
        </el-table>
      </el-form-item>
      <!-- <el-form-item label="用户标签"
@ -87,8 +90,7 @@
      </el-form-item> -->
    </el-form>
    <template slot="footer">
-      <el-button @click="visible = false"
-                 type="primary">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">关闭</el-button>
    </template>
  </el-dialog>
 </template>
--- a/src/views/modules/user/user-grid.vue
+++ b/src/views/modules/user/user-grid.vue
@ -17,6 +17,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 prop="createdTime" label="加入网格时间" > </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>
@ -24,9 +25,7 @@
      </el-table-column>
    </el-table>
    <template slot="footer">
-      <el-button @click="visible = false" type="primary">{{
-        $t("confirm")
-      }}</el-button>
+      <el-button @click="visible = false">关闭</el-button>
    </template>
  </el-dialog>
 </template>
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@ -17,6 +17,7 @@
      </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="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
        <el-table-column prop="tagName" label="标签名" header-align="center" align="center"></el-table-column>
        <el-table-column prop="tagDesc" label="标签描述" header-align="center" align="center"></el-table-column>
        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@ -36,6 +36,11 @@
                border
                @selection-change="dataListSelectionChangeHandle"
                style="width: 100%">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
        <el-table-column prop="realName"
                         label="姓名"
                         header-align="center"
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@ -57,7 +57,7 @@
                    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"
@ -74,18 +74,19 @@
                     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"
+        <!-- <el-table-column type="selection"
                         header-align="center"
                         align="center"
-                         width="50"></el-table-column>
+                         width="50"></el-table-column> -->
        <el-table-column label="序号"
+                         align="center"
                         width="50px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
        <el-table-column prop="realName"
                         label="真实姓名"