elink-star
/
epdc-admin-luzhou
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

网格改成支部。是否网格长列去掉

updateDept
zhaoyongnian 5 years ago
parent
eca295f0c1
commit
0fc9a2bd2c
14 changed files with 32 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/modules/user/alluser.vue
  2. 2
      src/views/modules/user/hasAuthenticationpartymembers.vue
  3. 2
      src/views/modules/user/party-review.vue
  4. 4
      src/views/modules/user/party-wait-authentication.vue
  5. 2
      src/views/modules/user/partyauthenticationfailed.vue
  6. 2
      src/views/modules/user/partymembers-add-or-update.vue
  7. 2
      src/views/modules/user/partymembers.vue
  8. 6
      src/views/modules/user/pass-authentication.vue
  9. 6
      src/views/modules/user/unauthorized.vue
  10. 10
      src/views/modules/user/user-add-or-update.vue
  11. 8
      src/views/modules/user/user-detail.vue
  12. 6
      src/views/modules/user/user-grid.vue
  13. 8
      src/views/modules/user/user.vue
  14. 2
      src/views/modules/user/wait-authentication.vue

4
src/views/modules/user/alluser.vue
View File

@ -113,7 +113,7 @@
header-align="center"
align="center" min-width=400></el-table-column>
<el-table-column prop="allDeptNames"
label="居住网格"
label="居住支部"
header-align="center"
align="center" min-width=200></el-table-column>
</el-table>
@ -314,7 +314,7 @@ export default {
this.$refs.userDetail.init()
})
},
// 管理网格
// 管理支部
userGridHandle (userId) {
this.userGridVisible = true
this.$nextTick(() => {

2
src/views/modules/user/hasAuthenticationpartymembers.vue
View File

@ -132,7 +132,7 @@
align="center"
width="180"></el-table-column>
<el-table-column prop="allDeptNames"
label="街道-社区-网格"
label="街道-社区-支部"
header-align="center"
align="center"
min-width="350"

2
src/views/modules/user/party-review.vue
View File

@ -62,7 +62,7 @@
label="街道-社区-支部">
</el-table-column>
<el-table-column prop="dept"
label="网格名称" v-if="false">
label="支部名称" v-if="false">
</el-table-column>
<!-- <el-table-column prop="leaderFlag"
label="是否为网格长"

4
src/views/modules/user/party-wait-authentication.vue
View File

@ -36,7 +36,7 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格"
<el-form-item label="支部"
v-if="false" label-width="70px">
<el-select v-model="dataForm.deptId"
clearable
@ -117,7 +117,7 @@
align="center"
width="200"></el-table-column>
<el-table-column prop="allDeptNames"
label="认证网格"
label="认证支部"
header-align="center"
align="center"
min-width="400"

2
src/views/modules/user/partyauthenticationfailed.vue
View File

@ -79,7 +79,7 @@
align="center"
width="150"></el-table-column>
<el-table-column prop="allDeptNames"
label="所属网格"
label="所属支部"
header-align="center"
align="center"
min-width="350"

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

@ -37,7 +37,7 @@
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="所属网格">
<el-form-item label="所属支部">
<el-cascader v-model="dataForm.allDeptIds"
:options="options"
clearable></el-cascader>

2
src/views/modules/user/partymembers.vue
View File

@ -163,7 +163,7 @@
align="center"
width="180"></el-table-column>
<el-table-column prop="allDeptNames"
label="街道-社区-网格"
label="街道-社区-支部"
min-width="300"
show-overflow-tooltip
header-align="center"

6
src/views/modules/user/pass-authentication.vue
View File

@ -36,7 +36,7 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格"
<el-form-item label="支部"
v-if="false">
<el-select v-model="dataForm.deptId"
clearable
@ -132,7 +132,7 @@
<template slot-scope="scope">
<el-button type="text"
size="small"
@click="userGridHandle(scope.row.id)">管理网格</el-button>
@click="userGridHandle(scope.row.id)">管理支部</el-button>
<el-button type="text"
size="small"
@click="userDetailHandle(scope.row.id)">查看</el-button>
@ -369,7 +369,7 @@ export default {
this.$refs.userDetail.init()
})
},
// 管理网格
// 管理支部
userGridHandle (userId) {
this.userGridVisible = true
this.$nextTick(() => {

6
src/views/modules/user/unauthorized.vue
View File

@ -36,7 +36,7 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格"
<el-form-item label="支部"
v-if="false">
<el-select v-model="dataForm.gridId"
clearable
@ -88,7 +88,7 @@
<el-table-column label="序号"
width="70px" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
<el-table-column prop="myGridName"
label="所属网格（街道-社区-网格）"
label="所属支部（街道-社区-支部）"
header-align="center"
align="center"
v-if="false"></el-table-column>
@ -111,7 +111,7 @@
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"

10
src/views/modules/user/user-add-or-update.vue
View File

@ -30,7 +30,7 @@
size="small"
@click="userAuthenticateHistoryListHandle(dataForm.id)">查看详情</el-button>
</el-form-item>
<el-form-item label="居住网格"
<el-form-item label="居住支部"
prop="allDeptNames">
<span>{{dataForm.allDeptNames}}</span>
</el-form-item>
@ -75,7 +75,7 @@
show-word-limit
placeholder="审核备注"></el-input>
</el-form-item>
<el-form-item label="扫码网格">
<el-form-item label="扫码支部">
<el-table :data="userGridList"
style="width: 100%">
<!-- <el-table-column prop="street"
@ -93,16 +93,16 @@
v-if="false">
</el-table-column> -->
<el-table-column prop="allDeptNames"
label="街道-社区-网格">
label="街道-社区-支部">
</el-table-column>
<el-table-column prop="dept"
label="部门名称"
v-if="false">
</el-table-column>
<el-table-column prop="leaderFlag"
<!-- <el-table-column prop="leaderFlag"
label="是否为网格长"
:formatter="showLeaderFlagFormatter">
</el-table-column>
</el-table-column> -->
</el-table>
</el-form-item>
<!-- <el-form-item label="用户标签"

8
src/views/modules/user/user-detail.vue
View File

@ -50,7 +50,7 @@
prop="remark">
<span>{{dataForm.remark}}</span>
</el-form-item>
<el-form-item label="扫码网格">
<el-form-item label="扫码支部">
<el-table :data="userGridList"
style="width: 100%">
<!-- <el-table-column prop="street"
@ -66,15 +66,15 @@
label="主键" v-if="false">
</el-table-column>
<el-table-column prop="allDeptNames"
label="街道-社区-网格">
label="街道-社区-支部">
</el-table-column>
<el-table-column prop="dept"
label="部门名称" v-if="false">
</el-table-column>
<el-table-column prop="leaderFlag"
<!-- <el-table-column prop="leaderFlag"
label="是否为网格长"
:formatter="showLeaderFlagFormatter">
</el-table-column>
</el-table-column> 2020- 10 -24 隐藏 -->
</el-table>
</el-form-item>
<!-- <el-form-item label="用户标签"

6
src/views/modules/user/user-grid.vue
View File

@ -1,7 +1,7 @@
<template>
<el-dialog
:visible.sync="visible"
title="扫码网格"
title="扫码支部"
:close-on-click-modal="false"
:close-on-press-escape="false">
<el-table :data="userGridList" style="width: 100%">
@ -15,7 +15,7 @@
:formatter="showLeaderFlagFormatter"
>
</el-table-column> -->
<el-table-column prop="allDeptNames" label="街道-社区-网格"> </el-table-column>
<el-table-column prop="allDeptNames" label="街道-社区-支部"> </el-table-column>
<el-table-column prop="dept" 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">
@ -116,7 +116,7 @@ export default {
}
},
unbindGridHandle (id) {
this.$confirm('确定解除网格关系?', '提示', {
this.$confirm('确定解除支部关系?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

8
src/views/modules/user/user.vue
View File

@ -17,7 +17,7 @@
<el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格">
<el-form-item label="支部">
<el-select v-model="dataForm.deptId" clearable placeholder="请选择">
<el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
@ -41,8 +41,8 @@
<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="myGridName" label="所属网格（街道-社区-网格）" 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="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">
<template slot-scope="scope"><el-button type="text" size="small" @click="userDetailHandle(scope.row.id)">查看</el-button></template>
</el-table-column> -->
@ -111,7 +111,7 @@
<el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格">
<el-form-item label="支部">
<el-select v-model="dataForm.deptId" clearable placeholder="请选择">
<el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>

2
src/views/modules/user/wait-authentication.vue
View File

@ -36,7 +36,7 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格"
<el-form-item label="支部"
v-if="false">
<el-select v-model="dataForm.deptId"
clearable

Write Preview
Loading…
Cancel
Save