elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

dd

shibei_master
13176889840 3 years ago
parent
8de16eb6c1
commit
03592d0d29
6 changed files with 329 additions and 205 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. 21
      src/mixins/view-module.js
  2. 4
      src/views/modules/communityParty/members/cpts/points.vue
  3. 495
      src/views/modules/partymember/icpartymemberpoint.vue
  4. 5
      src/views/modules/visual/communityParty/dialogInfo.vue
  5. 5
      src/views/modules/visual/communityParty/party.vue
  6. 4
      src/views/modules/visual/communityParty/unitInfo.vue

21
src/mixins/view-module.js
View File

@ -42,18 +42,17 @@ export default {
methods: { methods: {
// 获取数据列表 // 获取数据列表
query () { query () {
this.dataListLoading = true const params = {
this.$http.get( order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
this.post = true
this.$http.post(
this.mixinViewModuleOptions.getDataListURL, this.mixinViewModuleOptions.getDataListURL,
{ params
params: {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}
).then(({ data: res }) => { ).then(({ data: res }) => {
this.dataListLoading = false this.dataListLoading = false
if (res.code !== 0) { if (res.code !== 0) {

4
src/views/modules/communityParty/members/cpts/points.vue
View File

@ -4,7 +4,8 @@
<el-form label-width="140px" :model="form" :inline="true" <el-form label-width="140px" :model="form" :inline="true"
:disabled="disabled" :rules="rules" ref="ruleForm" :disabled="disabled" :rules="rules" ref="ruleForm"
class="form-wr"> class="form-wr">
<el-form-item label="评分周期" prop="year"> <div>
<el-form-item label="评分周期" prop="year">
<div class="flex-div"> <div class="flex-div">
<!-- <div class="mr10">评分周期</div> --> <!-- <div class="mr10">评分周期</div> -->
<div class="mr10"> <div class="mr10">
@ -39,6 +40,7 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
</div>
<el-form-item label="基础积分分值" prop="basePoint"> <el-form-item label="基础积分分值" prop="basePoint">
<el-input v-model="form.basePoint" type="number" placeholder="请输入" class="input-width" clearable /> <el-input v-model="form.basePoint" type="number" placeholder="请输入" class="input-width" clearable />
</el-form-item> </el-form-item>

495
src/views/modules/partymember/icpartymemberpoint.vue
View File

@ -1,228 +1,339 @@
<template> <template>
<!-- <el-card shadow="never" class="aui-card--fill"> --> <!-- <el-card shadow="never" class="aui-card--fill"> -->
<div class="mod-rent__rentDeath resi-container"> <div class="mod-rent__rentDeath resi-container">
<el-card ref="searchCard" class="search-card"> <el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form
<el-form-item prop="mySelectOrg" label="所属党组织"> :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
label-width="100px"
>
<el-form-item prop="mySelectOrg" label="所属党组织">
<el-cascader <el-cascader
style="width:300px" style="width: 300px"
v-model="mySelectOrg" v-model="mySelectOrg"
:options="orgList" :options="orgList"
placeholder="请选择党组织" placeholder="请选择党组织"
:props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }" :props="{
@change="handleChangeOrg" checkStrictly: true,
clearable /> label: 'partyOrgName',
</el-form-item> value: 'id',
<el-form-item label="姓名" children: 'children'
prop="name"> }"
<el-input v-model="dataForm.name" @change="handleChangeOrg"
size="small" clearable
class="list_item_width_1" />
clearable </el-form-item>
placeholder="请输入姓名"> <el-form-item label="姓名" prop="name">
<el-input
v-model="dataForm.name"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机" <el-form-item label="手机" prop="mobile">
prop="mobile"> <el-input
<el-input v-model="dataForm.mobile" v-model="dataForm.mobile"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入手机"> placeholder="请输入手机"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="身份证" prop="idCard">
prop="idCard"> <el-input
<el-input v-model="dataForm.idCard" v-model="dataForm.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<br/> <br />
<el-form-item label="评分年度" prop="year"> <el-form-item label="评分年度" prop="year">
<el-date-picker <el-date-picker
v-model="dataForm.year" v-model="dataForm.year"
type="year" type="year"
placeholder="选择年" placeholder="选择年"
value-format="yyyy"> value-format="yyyy"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()" size="small">{{ $t('query') }}</el-button> <el-button
class="diy-button--search"
@click="getDataList()"
size="small"
>{{ $t('query') }}</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button> <el-button class="diy-button--reset" size="small" @click="resetForm"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>--> class="resi-table"
<el-table-column label="序号" header-align="center" align="center" width="50px"> v-loading="dataListLoading"
<template slot-scope="scope"> :data="dataList"
{{scope.$index+1}} border
</template> @selection-change="dataListSelectionChangeHandle"
</el-table-column> style="width: 100%"
<el-table-column prop="year" label="年度" header-align="center" align="center"></el-table-column> :height="tableHeight"
<el-table-column prop="partyOrg" label="所属党组织" header-align="center" align="center"></el-table-column> >
<el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column> <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column> <el-table-column
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column> label="序号"
<el-table-column prop="totalScore" label="总分" header-align="center" align="center"></el-table-column> header-align="center"
<el-table-column prop="basePoint" label="基础积分分值" header-align="center" align="center"></el-table-column> align="center"
<el-table-column prop="reviewPoint" label="民主评议积分分值" header-align="center" align="center"></el-table-column> width="50px"
<el-table-column prop="inspirePoint" label="激励积分分值" header-align="center" align="center"></el-table-column> >
<el-table-column prop="warnPoint" label="警示扣分分值" header-align="center" align="center"></el-table-column> <template slot-scope="scope">
<el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column> {{ scope.$index + 1 }}
</el-table> </template>
<el-pagination </el-table-column>
:current-page="page" <el-table-column
:page-sizes="[10, 20, 50, 100]" prop="year"
:page-size="limit" label="年度"
:total="total" header-align="center"
layout="total, sizes, prev, pager, next, jumper" align="center"
@size-change="pageSizeChangeHandle" ></el-table-column>
@current-change="pageCurrentChangeHandle"> <el-table-column
</el-pagination> prop="partyOrg"
</el-card> label="所属党组织"
</div> header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="name"
label="姓名"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="idCard"
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="totalScore"
label="总分"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="basePoint"
label="基础积分分值"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="reviewPoint"
label="民主评议积分分值"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="inspirePoint"
label="激励积分分值"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="warnPoint"
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>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
</el-card>
</div>
<!-- </el-card> --> <!-- </el-card> -->
</template> </template>
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
export default { import { mapGetters } from 'vuex'
mixins: [mixinViewModule], export default {
data () { mixins: [mixinViewModule],
return { data() {
mixinViewModuleOptions: { return {
getDataListURL: '/resi/partymember/icPartyMemberPoint/getList', mixinViewModuleOptions: {
getDataListIsPage: true getDataListURL: '/resi/partymember/icPartyMemberPoint/getList',
}, getDataListIsPage: true
mySelectOrg: '',
orgList: [],
dataForm: {
id: '',
orgId: '',
name: '',
idCard: '',
mobile: '',
year: ''
}
}
},
created() {
this.getOrgList()
}, },
methods: { mySelectOrg: '',
resetForm(formName) { orgList: [],
for(const n in this.dataForm) { searchH: 0,
this.dataForm[n] = '' dataForm: {
} id: '',
this.getDataList() orgId: '',
this.mySelectOrg = '' name: '',
}, idCard: '',
handleSizeChange (val) { mobile: '',
console.log(`每页 ${val} 条`) year: ''
this.pageSize = val
this.getDataList()
},
handleCurrentChange (val) {
console.log(`当前页: ${val}`)
this.currentPage = val
this.getDataList()
},
// 获取党组织列表
getOrgList() {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.orgList = res.data
}).catch(() => {})
},
// 党组织选中事件
handleChangeOrg(e) {
if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
} else {
this.dataForm.orgId = ''
}
},
} }
} }
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
const _h = this.clientHeight - 230 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},
created() {
this.getOrgList()
},
mounted() {
this.$nextTick(() => {
this.searchH = this.$refs.searchCard.$el.offsetHeight
console.log('tableHeight', this.tableHeight)
})
},
methods: {
resetForm(formName) {
for (const n in this.dataForm) {
this.dataForm[n] = ''
}
this.getDataList()
this.mySelectOrg = ''
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`)
this.pageSize = val
this.getDataList()
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`)
this.currentPage = val
this.getDataList()
},
// 获取党组织列表
getOrgList() {
return this.$http
.get('/resi/partymember/icPartyOrg/getTreelist', {
params: { agencyId: localStorage.getItem('agencyId') }
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.orgList = res.data
})
.catch(() => {})
},
// 党组织选中事件
handleChangeOrg(e) {
if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
} else {
this.dataForm.orgId = ''
}
}
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss"; @import '@/assets/scss/buttonstyle.scss';
.resi-container .resi-card-table { .resi-container .resi-card-table {
::v-deep .el-table th { ::v-deep .el-table th {
color: #fff; color: #fff;
background-color: rgba(33, 149, 254, 1); background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1); // border-right: 1px solid rgba(33, 149, 254, 1);
}
} }
.resi-table { }
::v-deep .el-button--text { .resi-table {
text-decoration: underline; ::v-deep .el-button--text {
} text-decoration: underline;
::v-deep .btn-color-del {
margin-left: 10px;
color: rgba(213, 16, 16, 1);
}
::v-deep .btn-color-edit {
color: rgba(0, 167, 169, 1);
}
} }
.form-wr { ::v-deep .btn-color-del {
.input-width { margin-left: 10px;
width: 260px; color: rgba(213, 16, 16, 1);
}
} ::v-deep .btn-color-edit {
.input-width-textarea { color: rgba(0, 167, 169, 1);
width: 500px; }
} }
.imsg-list { .form-wr {
display: flex; .input-width {
align-items: center; width: 260px;
.imgs-item {
position: relative;
margin-right: 10px;
.el-icon-delete {
position: absolute;
top: 0;
right: 0;
font-size: 18px;
color: red;
z-index: 3;
cursor: pointer;
}
}
}
} }
.div-content { .input-width-textarea {
width: 100%; width: 500px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.resi-row-btn { .imsg-list {
display: flex; display: flex;
margin-bottom: 13px; align-items: center;
.el-button { .imgs-item {
margin-left: 10px; position: relative;
border: 0; margin-right: 10px;
.el-icon-delete {
position: absolute;
top: 0;
right: 0;
font-size: 18px;
color: red;
z-index: 3;
cursor: pointer;
}
} }
// .el-button--success {
// background: rgba(34, 193, 195, 1);
// }
// .el-button--warning {
// background: rgba(254, 179, 73, 1);
// }
// .el-button--danger {
// background: rgba(254, 98, 82, 1);
// }
} }
}
.div-content {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.resi-row-btn {
display: flex;
margin-bottom: 13px;
.el-button {
margin-left: 10px;
border: 0;
}
// .el-button--success {
// background: rgba(34, 193, 195, 1);
// }
// .el-button--warning {
// background: rgba(254, 179, 73, 1);
// }
// .el-button--danger {
// background: rgba(254, 98, 82, 1);
// }
}
</style> </style>

5
src/views/modules/visual/communityParty/dialogInfo.vue
View File

@ -29,6 +29,11 @@
<span class="item-field">活动标题：</span> <span class="item-field">活动标题：</span>
<span>{{ info.title }}</span> <span>{{ info.title }}</span>
</div> </div>
<div class="item">
<span class="item-field">活动目标：</span>
<span>{{ info.target }}</span>
</div>
<div class="item"> <div class="item">
<span class="item-field">活动内容：</span> <span class="item-field">活动内容：</span>
<span class="item-content" v-html="info.content"></span> <span class="item-content" v-html="info.content"></span>

5
src/views/modules/visual/communityParty/party.vue
View File

@ -815,8 +815,11 @@ export default {
}, },
handleClickRow(val) { handleClickRow(val) {
console.log('click-row----', val) console.log('click-row----', val)
if (!val.icResiUser) {
return this.$message.warning('该党员居民信息未完善')
}
this.$router.push({ this.$router.push({
path: `/main-shuju/visual-basicinfo-people/${val.userId}`, path: `/main-shuju/visual-basicinfo-people/${val.icResiUser}`,
}); });
}, },
handleCascader(val) { handleCascader(val) {

4
src/views/modules/visual/communityParty/unitInfo.vue
View File

@ -41,6 +41,10 @@
<span class="item-field">活动标题：</span> <span class="item-field">活动标题：</span>
<span>{{ info.title }}</span> <span>{{ info.title }}</span>
</div> </div>
<div class="item">
<span class="item-field">活动目标：</span>
<span>{{ info.target }}</span>
</div>
<div class="item"> <div class="item">
<span class="item-field">活动内容：</span> <span class="item-field">活动内容：</span>
<span class="item-content" v-html="info.content"></span> <span class="item-content" v-html="info.content"></span>

Write Preview
Loading…
Cancel
Save