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

bug

master
qushutong 6 years ago
parent
2c70a5d41b f4e784193a
commit
0ba54cdbcb
3 changed files with 79 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      public/index.html
  2. 130
      src/views/modules/user/partymembers-add-or-update.vue
  3. 19
      src/views/modules/user/user-add-or-update.vue

6
public/index.html
View File

@ -13,8 +13,8 @@
window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态） window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态）
window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象 window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象
'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径） 'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径）
'params': {}, // 参数, 由 this.$route.params 自动赋值 'params': {}, // 参数, 由 this.$route.params 自动赋值
'query': {}, // 查询参数, 由 this.$route.query 自动赋值 'query': {}, // 查询参数, 由 this.$route.query 自动赋值
'menuId': '', // 菜单id（用于选中侧边栏菜单，与this.$store.state.sidebarMenuActiveName进行匹配） 'menuId': '', // 菜单id（用于选中侧边栏菜单，与this.$store.state.sidebarMenuActiveName进行匹配）
'title': '', // 标题 'title': '', // 标题
'isTab': true, // 是否通过tab展示内容? 'isTab': true, // 是否通过tab展示内容?
@ -33,7 +33,7 @@
<% } %> <% } %>
<!-- 集成测试环境 --> <!-- 集成测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
<script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080';</script> <script>window.SITE_CONFIG['apiURL'] = 'https://epdc.elinkchina.com.cn';</script>
<% } %> <% } %>
<!-- 验收测试环境 --> <!-- 验收测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>

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

@ -1,64 +1,88 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible"
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"> :title="!dataForm.id ? $t('add') : $t('update')"
<el-form-item label="姓名" prop="realName"> :close-on-click-modal="false"
<el-input v-model="dataForm.realName" placeholder="姓名"></el-input> :close-on-press-escape="false">
<el-form :model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="姓名"
prop="realName">
<el-input v-model="dataForm.realName"
placeholder="姓名"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号"
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input> prop="mobile">
<el-input v-model="dataForm.mobile"
placeholder="手机号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="identityNo"> <el-form-item label="身份证号"
<el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input> prop="identityNo">
<el-input v-model="dataForm.identityNo"
placeholder="身份证号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="街道党工委" prop="streetId"> <el-form-item label="街道党工委"
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> prop="streetId">
<el-option <el-select v-model="dataForm.streetId"
v-for="item in streetOptions" placeholder="请选择"
:key="item.id" @change="getCommunityList">
:label="item.name" <el-option v-for="item in streetOptions"
:value="item.id"> :key="item.id"
</el-option> :label="item.name"
</el-select> :value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区党委" prop="communityId"> <el-form-item label="社区党委"
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> prop="communityId">
<el-option <el-select v-model="dataForm.communityId"
v-for="item in communityOptions" placeholder="请选择"
:key="item.id" @change="getGridList">
:label="item.name" <el-option v-for="item in communityOptions"
:value="item.id"> :key="item.id"
:label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格党支部" prop="gridId"> <el-form-item label="网格党支部"
<el-select v-model="dataForm.gridId" placeholder="请选择" @change="evaluation"> prop="gridId">
<el-option <el-select v-model="dataForm.gridId"
v-for="item in gridOptions" placeholder="请选择"
:key="item.id" @change="evaluation">
:label="item.name" <el-option v-for="item in gridOptions"
:value="item.id"> :key="item.id"
:label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="干部下沉" prop="cadreFlag"> <el-form-item label="干部下沉"
<el-select v-model="dataForm.cadreFlag" placeholder="请选择"> prop="cadreFlag">
<el-option <el-select v-model="dataForm.cadreFlag"
v-for="item in cadreOptions" placeholder="请选择">
:key="item.cadreFlag" <el-option v-for="item in cadreOptions"
:label="item.cadreTitle" :key="item.cadreFlag"
:value="item.cadreFlag"> :label="item.cadreTitle"
:value="item.cadreFlag">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="用户角色" prop="tagIds"> <el-form-item label="用户标签"
prop="tagIds">
<el-checkbox-group v-model="dataForm.tagIds"> <el-checkbox-group v-model="dataForm.tagIds">
<el-checkbox v-for="item in tagOptions" :key="item.tagName" :label="item.id">{{item.tagName}}</el-checkbox> <el-checkbox v-for="item in tagOptions"
:key="item.tagName"
:label="item.id">{{item.tagName}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button> <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> <el-button type="primary"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@ -86,13 +110,7 @@ export default {
streetOptions: [], streetOptions: [],
communityOptions: [], communityOptions: [],
gridOptions: [], gridOptions: [],
cadreOptions: [{ cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
cadreFlag: '1',
cadreTitle: '是'
}, {
cadreFlag: '0',
cadreTitle: '否'
}],
tagOptions: [] tagOptions: []
} }
}, },
@ -144,7 +162,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.tagOptions = res.data this.tagOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
@ -152,7 +170,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
let choosenItem = this.streetOptions.filter(item => item.id === this.dataForm.streetId)[0] let choosenItem = this.streetOptions.filter(item => item.id === this.dataForm.streetId)[0]
@ -164,7 +182,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0] let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0]
@ -175,7 +193,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
evaluation () { evaluation () {
let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0] let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0]
@ -197,14 +215,14 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
}).catch(() => {}) }).catch(() => { })
}, },
// 表单提交 // 表单提交
dataFormSubmitHandle: debounce(function () { dataFormSubmitHandle: debounce(function () {
@ -225,7 +243,7 @@ export default {
this.$emit('refreshDataList') this.$emit('refreshDataList')
} }
}) })
}).catch(() => {}) }).catch(() => { })
}) })
}, 1000, { 'leading': true, 'trailing': false }) }, 1000, { 'leading': true, 'trailing': false })
} }

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

@ -93,20 +93,8 @@ export default {
tagIds: [], tagIds: [],
registTime: '' registTime: ''
}, },
partyFlagOptions: [{ partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
id: '0', cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
name: '不是'
}, {
id: '1',
name: '是'
}],
cadreOptions: [{
cadreFlag: '1',
cadreTitle: '是'
}, {
cadreFlag: '0',
cadreTitle: '否'
}],
tagOptions: [] tagOptions: []
} }
}, },
@ -131,9 +119,6 @@ export default {
partyFlag: [ partyFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
registerWay: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
gridId: [ gridId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],

Write Preview
Loading…
Cancel
Save