Browse Source

Merge branch 'feature/dev_party_mange' into dev

test
13176889840 4 years ago
parent
commit
35f58137da
  1. 167
      src/mixins/view-post.js
  2. 17
      src/views/components/resiForm.vue
  3. 13
      src/views/main-shuju/main-navbar.vue
  4. 2
      src/views/modules/communityParty/members/index.vue
  5. 4
      src/views/modules/partymember/icpartymemberpoint.vue
  6. 7
      src/views/modules/visual/communityParty/community.vue
  7. 4
      src/views/modules/visual/communityParty/dialogInfo.vue

167
src/mixins/view-post.js

@ -0,0 +1,167 @@
import Cookies from 'js-cookie'
import qs from 'qs'
export default {
data () {
/* eslint-disable */
return {
// 设置属性
mixinViewModuleOptions: {
createdIsNeed: true, // 此页面是否在创建时,调用查询数据列表接口?
activatedIsNeed: false, // 此页面是否在激活(进入)时,调用查询数据列表接口?
getDataListURL: '', // 数据列表接口,API地址
getDataListIsPage: false, // 数据列表接口,是否需要分页?
deleteURL: '', // 删除接口,API地址
deleteIsBatch: false, // 删除接口,是否需要批量?
deleteIsBatchKey: 'id', // 删除接口,批量状态下由那个key进行标记操作?比如:pid,uid...
exportURL: '' // 导出接口,API地址
},
// 默认属性
dataForm: {}, // 查询条件
dataList: [], // 数据列表
order: '', // 排序,asc/desc
orderField: '', // 排序,字段
page: 1, // 当前页码
limit: 10, // 每页数
total: 0, // 总条数
dataListLoading: false, // 数据列表,loading状态
dataListSelections: [], // 数据列表,多选项
addOrUpdateVisible: false // 新增/更新,弹窗visible状态
}
/* eslint-enable */
},
created () {
if (this.mixinViewModuleOptions.createdIsNeed) {
this.query()
}
},
activated () {
if (this.mixinViewModuleOptions.activatedIsNeed) {
this.query()
}
},
methods: {
// 获取数据列表
query () {
this.dataListLoading = true
const params = {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
this.$http.post(
this.mixinViewModuleOptions.getDataListURL,
params
).then(({ data: res }) => {
this.dataListLoading = false
if (res.code !== 0) {
this.dataList = []
this.total = 0
return this.$message.error(res.msg)
}
this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
this.dataList.forEach(item => {
if (item.gender) {
item.gender = item.gender == '0' ? '女' : item.gender == '1' ? '男' : item.gender
}
})
}).catch(() => {
this.dataListLoading = false
})
},
// 多选
dataListSelectionChangeHandle (val) {
this.dataListSelections = val
},
// 排序
dataListSortChangeHandle (data) {
if (!data.order || !data.prop) {
this.order = ''
this.orderField = ''
return false
}
this.order = data.order.replace(/ending$/, '')
this.orderField = data.prop.replace(/([A-Z])/g, '_$1').toLowerCase()
this.query()
},
// 分页, 每页条数
pageSizeChangeHandle (val) {
this.page = 1
this.limit = val
this.query()
},
// 分页, 当前页
pageCurrentChangeHandle (val) {
this.page = val
this.query()
},
getDataList: function () {
this.page = 1
this.query()
},
// 新增 / 修改
addOrUpdateHandle (id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.dataForm.id = id
this.$refs.addOrUpdate.init()
})
},
// 删除
deleteHandle (id) {
if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
return this.$message({
message: this.$t('prompt.deleteBatch'),
type: 'warning',
duration: 500
})
}
this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'),
type: 'warning'
}).then(() => {
this.$http.delete(
`${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id}`,
this.mixinViewModuleOptions.deleteIsBatch ? {
'data': id ? [id] : this.dataListSelections.map(item => item[this.mixinViewModuleOptions.deleteIsBatchKey])
} : {}
).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.query()
}
})
}).catch(() => {})
}).catch(() => {})
},
// 导出
exportHandle () {
var params = qs.stringify({
'token': localStorage.getItem('token'),
...this.dataForm
})
window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
},
// 时间段控件取值变化事件-清空一个其他都清空
changeTime (dateValue) {
var startTimeIsNull = this.dataForm.startTime === '' || this.dataForm.startTime === 'null' || this.dataForm.startTime === null
var endTimeIsNull = this.dataForm.endTime === '' || this.dataForm.endTime === 'null' || this.dataForm.endTime === null
if (dateValue === null || dateValue === '' || dateValue === 'null') {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
} else if (startTimeIsNull || endTimeIsNull) {
this.dataForm.startTime = dateValue
this.dataForm.endTime = dateValue
}
}
}
}

17
src/views/components/resiForm.vue

@ -509,6 +509,7 @@ export default {
this.form.GENDER = sex == 1 ? '1' : '2'
this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
this.form.IS_BDHJ = huji == _id ? '1' : ''
this.validateIdcard(this.form.ID_CARD)
console.log('age-----', age, _id)
},
handleOpenSearch () {
@ -670,6 +671,22 @@ export default {
if (this.supportAdd) newForm = this.handlerMuscForm()
return newForm
},
validateIdcard (idCard) {
this.$http
.post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1'
else this.form.IS_VOLUNTEER = '0'
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getGridList () {
const { user } = this.$store.state
console.log('agencyId', user)

13
src/views/main-shuju/main-navbar.vue

@ -164,7 +164,18 @@ export default {
// this.showHeader = false;
// }
this.changeCustomerName();
this.$store.state.mainShuju.menuList = window.SITE_CONFIG["menuShujuList"];
const customerId = localStorage.getItem("customerId");
let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
// 亿 -
if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
for (let index in siteconfigElement){
if (siteconfigElement[index].id == '6'){
let newMenuArr = siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
siteconfigElement[index].children = newMenuArr;
}
}
}
this.$store.state.mainShuju.menuList = siteconfigElement;
},
computed: {},
methods: {

2
src/views/modules/communityParty/members/index.vue

@ -483,7 +483,7 @@ export default {
handleTimeChange (val) {
if (val.length > 0) {
this.searchForm.rdsjStartDate = val[0]
this.searchForm.rdsjEndDate = val[0]
this.searchForm.rdsjEndDate = val[1]
} else {
this.searchForm.rdsjStartDate = ''
this.searchForm.rdsjEndDate = ''

4
src/views/modules/partymember/icpartymemberpoint.vue

@ -183,10 +183,10 @@
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import viewPost from '@/mixins/view-post'
import { mapGetters } from 'vuex'
export default {
mixins: [mixinViewModule],
mixins: [viewPost],
data() {
return {
mixinViewModuleOptions: {

7
src/views/modules/visual/communityParty/community.vue

@ -109,7 +109,7 @@
</div>
</div>
<div class="card-title mt20">
<div class="card-title mt40">
<div class="second-title mt0">
<div class="second-title-label">联建活动分类统计</div>
@ -1260,6 +1260,7 @@ export default {
}
.calc-h {
height: calc(100vh - 240px);
padding-bottom: 20px;
}
.wd50 {
width: 50%;
@ -1298,7 +1299,7 @@ export default {
.mt0 {
margin: 0;
}
.mt20 {
margin-top: 20px;
.mt40 {
margin-top: 40px;
}
</style>

4
src/views/modules/visual/communityParty/dialogInfo.vue

@ -46,11 +46,11 @@
<span class="item-field">活动时间</span>
<span>{{ info.activityTime }}</span>
</div>
<div class="item">
<!-- <div class="item">
<span class="item-field">活动坐标</span>
<span>经度{{ info.latitude }} <br />
纬度{{ info.longitude }}</span>
</div>
</div> -->
<div class="item">
<span class="item-field">活动地址</span>
<span>{{ info.address }}</span>

Loading…
Cancel
Save