diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue
index 0788c694..581a7652 100755
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@@ -52,7 +52,7 @@
- {{item.tagName}}
+ {{item.tagName}}
@@ -144,11 +144,10 @@ export default {
return this.$message.error(res.msg)
}
this.tagOptions = res.data
- console.log(this.tagOptions)
}).catch(() => {})
},
getStreetList () {
- this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+ this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -192,6 +191,7 @@ export default {
...this.dataForm,
...res.data
}
+ this.dataForm.tagIds = res.data.tagIdsNew
this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index d00adf1f..4165e05e 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -85,10 +85,7 @@
{{ $t('deleteBatch') }}
- {{ $t('import') }}
-
-
- {{ $t('export') }}
+ {{ $t('export') }}
@@ -137,7 +134,8 @@ export default {
getDataListURL: '/app-user/partymembers/page',
getDataListIsPage: true,
deleteURL: '/app-user/partymembers',
- deleteIsBatch: true
+ deleteIsBatch: true,
+ exportURL: '/app-user/partymembers/export'
},
dataForm: {
id: '',
@@ -174,7 +172,7 @@ export default {
this.dataForm.endTime = this.timeRange[1]
},
getStreetList () {
- this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+ this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -220,12 +218,9 @@ export default {
return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
},
formatRegist: function (row, column) {
- console.log(row.registFlag)
return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
},
importData () {
- },
- exportData () {
}
}
}
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index 81f633b1..b2c4bed0 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -22,6 +22,16 @@
:value="item.id">
+
+
+
+
+
+
{{dataForm.street}} -
@@ -29,108 +39,19 @@
{{dataForm.grid}}
-
+ {{dataForm.address}}
+
是否通过审核
- 是
- 否
+ 是
+ 否
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{item.tagName}}
+
@@ -148,55 +69,29 @@ export default {
visible: false,
dataForm: {
id: '',
- nickname: '',
- mobile: '',
- password: '',
- registerTime: '',
- faceImg: '',
- sex: '',
- birthday: '',
- email: '',
- telephone: '',
- zipCode: '',
- profession: '',
- hobbies: '',
- userSign: '',
- invitationCode: '',
- lastLoginTime: '',
- lastLoginIp: '',
- lastLongitude: '',
- lastLatitude: '',
- realName: '',
- identityNo: '',
- address: '',
- wxOpenId: '',
- registerWay: '',
- registerSource: '',
- phoneProvince: '',
- phoneCity: '',
- phoneCarrier: '',
- points: '',
- inviteUserId: '',
- revision: '',
- gridId: '',
- createdBy: '',
- createdTime: '',
- updatedBy: '',
- updatedTime: '',
- delFlag: '',
- partyFlag: ''
+ partyFlag: '',
+ cadreFlag: '',
+ pass: '',
+ street: '',
+ community: '',
+ grid: '',
+ tagIds: []
},
- radio: '0',
partyFlagOptions: [{
id: '0',
name: '不是'
}, {
id: '1',
name: '是'
+ }],
+ cadreOptions: [{
+ cadreFlag: '1',
+ cadreTitle: '是'
}, {
- id: '1',
- name: '全部'
- }]
+ cadreFlag: '0',
+ cadreTitle: '否'
+ }],
+ tagOptions: []
}
},
computed: {
@@ -208,54 +103,6 @@ export default {
mobile: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- password: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- registerTime: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- faceImg: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- sex: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- birthday: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- email: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- telephone: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- zipCode: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- profession: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- hobbies: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- userSign: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- invitationCode: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- lastLoginTime: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- lastLoginIp: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- lastLongitude: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- lastLatitude: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
realName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
@@ -265,53 +112,14 @@ export default {
address: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- wxOpenId: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
partyFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
registerWay: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- registerSource: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- phoneProvince: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- phoneCity: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- phoneCarrier: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- points: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- inviteUserId: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- revision: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
gridId: [
{ 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: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- delFlag: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
@@ -325,6 +133,15 @@ export default {
this.getInfo()
}
})
+ this.getTagOptions()
+ },
+ getTagOptions () {
+ this.$http.get(`/app-user/usertag/list`).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.tagOptions = res.data
+ }).catch(() => {})
},
// 获取信息
getInfo () {
@@ -338,13 +155,13 @@ export default {
}
}).catch(() => {})
},
- // 表单提交
+ // 审核
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
- this.$http[!this.dataForm.id ? 'post' : 'put']('/epdc/user/', this.dataForm).then(({ data: res }) => {
+ this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/user/audit/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 15f0ecb2..6132236e 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -38,7 +38,6 @@
-
@@ -86,8 +85,8 @@
-
-
+
+
@@ -97,7 +96,7 @@
审核
- {{ $t('delete') }}
+
@@ -118,7 +117,6 @@
已审核用户
-
-
@@ -215,12 +212,12 @@
-
+
未通过用户
-
-
@@ -326,12 +321,12 @@
-
+