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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/mixins/view-module.js
  2. 2
      src/views/modules/communityParty/members/cpts/points.vue
  3. 185
      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

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

@ -42,18 +42,17 @@ export default {
methods: {
// 获取数据列表
query () {
this.dataListLoading = true
this.$http.get(
this.mixinViewModuleOptions.getDataListURL,
{
params: {
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.post = true
this.$http.post(
this.mixinViewModuleOptions.getDataListURL,
params
).then(({ data: res }) => {
this.dataListLoading = false
if (res.code !== 0) {

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

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

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

@ -2,42 +2,56 @@
<!-- <el-card shadow="never" class="aui-card--fill"> -->
<div class="mod-rent__rentDeath resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
label-width="100px"
>
<el-form-item prop="mySelectOrg" label="所属党组织">
<el-cascader
style="width: 300px"
v-model="mySelectOrg"
:options="orgList"
placeholder="请选择党组织"
:props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
:props="{
checkStrictly: true,
label: 'partyOrgName',
value: 'id',
children: 'children'
}"
@change="handleChangeOrg"
clearable />
clearable
/>
</el-form-item>
<el-form-item label="姓名"
prop="name">
<el-input v-model="dataForm.name"
<el-form-item label="姓名" prop="name">
<el-input
v-model="dataForm.name"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名">
placeholder="请输入姓名"
>
</el-input>
</el-form-item>
<el-form-item label="手机"
prop="mobile">
<el-input v-model="dataForm.mobile"
<el-form-item label="手机" prop="mobile">
<el-input
v-model="dataForm.mobile"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入手机">
placeholder="请输入手机"
>
</el-input>
</el-form-item>
<el-form-item label="身份证"
prop="idCard">
<el-input v-model="dataForm.idCard"
<el-form-item label="身份证" prop="idCard">
<el-input
v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入身份证"
>
</el-input>
</el-form-item>
<br />
@ -46,36 +60,112 @@
v-model="dataForm.year"
type="year"
placeholder="选择年"
value-format="yyyy">
value-format="yyyy"
>
</el-date-picker>
</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-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>
</el-card>
<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
class="resi-table"
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
:height="tableHeight"
>
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号" header-align="center" align="center" width="50px">
<el-table-column
label="序号"
header-align="center"
align="center"
width="50px"
>
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="year" label="年度" header-align="center" align="center"></el-table-column>
<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 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-column
prop="year"
label="年度"
header-align="center"
align="center"
></el-table-column>
<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
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"
@ -84,7 +174,8 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
</el-card>
</div>
@ -93,6 +184,7 @@
<script>
import mixinViewModule from '@/mixins/view-module'
import { mapGetters } from 'vuex'
export default {
mixins: [mixinViewModule],
data() {
@ -103,6 +195,7 @@
},
mySelectOrg: '',
orgList: [],
searchH: 0,
dataForm: {
id: '',
orgId: '',
@ -113,9 +206,23 @@
}
}
},
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) {
@ -136,12 +243,17 @@
},
// 获取党组织列表
getOrgList() {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
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(() => {})
})
.catch(() => {})
},
// 党组织选中事件
handleChangeOrg(e) {
@ -150,12 +262,12 @@
} else {
this.dataForm.orgId = ''
}
},
}
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
@import '@/assets/scss/buttonstyle.scss';
.resi-container .resi-card-table {
::v-deep .el-table th {
@ -179,7 +291,6 @@
.form-wr {
.input-width {
width: 260px;
}
.input-width-textarea {
width: 500px;

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

@ -29,6 +29,11 @@
<span class="item-field">活动标题：</span>
<span>{{ info.title }}</span>
</div>
<div class="item">
<span class="item-field">活动目标：</span>
<span>{{ info.target }}</span>
</div>
<div class="item">
<span class="item-field">活动内容：</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) {
console.log('click-row----', val)
if (!val.icResiUser) {
return this.$message.warning('该党员居民信息未完善')
}
this.$router.push({
path: `/main-shuju/visual-basicinfo-people/${val.userId}`,
path: `/main-shuju/visual-basicinfo-people/${val.icResiUser}`,
});
},
handleCascader(val) {

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

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

Write Preview
Loading…
Cancel
Save