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

修改流动党员报道列表展示字段，增加组织关系所在党支部和组织关系地址；

release/epdc
luyan 2 years ago
parent
87833322b5
commit
2c1fe26623
2 changed files with 29 additions and 34 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. 28
      src/views/modules/user/flowparty-detail.vue
  2. 23
      src/views/modules/user/flowparty.vue

28
src/views/modules/user/flowparty-detail.vue
View File

@ -14,35 +14,29 @@
<el-form-item label="居民住址" prop="address" v-if="dataForm.address">
<span>{{dataForm.address}}</span>
</el-form-item>
<el-form-item label="自由职业者" prop="freelance">
<!-- <el-form-item label="自由职业者" prop="freelance">
<span v-if="dataForm.freelance === 0">否</span>
<span v-if="dataForm.freelance === 1">是</span>
</el-form-item> -->
<el-form-item label="党员属性" prop="party">
<span v-if="dataForm.party === 0">流入党员</span>
<span v-if="dataForm.party === 1">流出党员</span>
</el-form-item>
<el-form-item label="是否党员" prop="party">
<span v-if="dataForm.party === 0">否</span>
<span v-if="dataForm.party === 1">是</span>
</el-form-item>
<template v-if="dataForm.party === 1">
<el-form-item label="入党时间" prop="partyDate" v-if="dataForm.partyDate">
<span>{{dataForm.partyDate}}</span>
</el-form-item>
</template>
<el-form-item label="现属党支部" prop="partyName" v-if="dataForm.partyName">
<el-form-item label="组织关系党支部" prop="partyName" v-if="dataForm.partyName">
<span>{{dataForm.partyName}}</span>
</el-form-item>
<template v-if="dataForm.freelance == 0">
<el-form-item label="现工作单位" prop="workUnit" v-if="dataForm.workUnit">
<el-form-item label="组织关系地址" prop="partyName" v-if="dataForm.partyName">
<span>{{dataForm.partyAddr}}</span>
</el-form-item>
<el-form-item label="现职工作单位" prop="workUnit" v-if="dataForm.workUnit">
<span>{{dataForm.workUnit}}</span>
</el-form-item>
<el-form-item label="单位地址" prop="workAddr" v-if="dataForm.workAddr">
<el-form-item label="现职单位地址" prop="workAddr" v-if="dataForm.workAddr">
<span>{{dataForm.workAddr}}</span>
</el-form-item>
</template>
<template v-if="dataForm.freelance == 1">
<el-form-item label="现工作单位" prop="workUnit" v-if="dataForm.workUnit">
<span>{{dataForm.workUnit}}</span>
</el-form-item>
</template>
<el-form-item label="所属社区" prop="allDeptIds" v-if="dataForm.allDeptIds">
<span>{{dataForm.parentDeptNames}}</span>
</el-form-item>

23
src/views/modules/user/flowparty.vue
View File

@ -15,7 +15,7 @@
<el-form-item label="联系电话" label-width="70px">
<el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
</el-form-item>
<el-form-item label="是否党员" label-width="70px">
<el-form-item label="党员属性" label-width="70px">
<el-select v-model="dataForm.party" placeholder="请选择" clearable>
<el-option v-for="item in partyOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.party">
@ -45,15 +45,16 @@
<el-table-column prop="name" label="姓名" header-align="center" align="center" width="80"></el-table-column>
<el-table-column prop="idCard" label="身份证号码" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="mobile" label="电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="freelance" label="自由职业者" header-align="center" align="center" width="100"
:formatter="fomartFreelance"></el-table-column>
<el-table-column prop="party" label="是否党员" header-align="center" align="center" width="100"
<!-- <el-table-column prop="freelance" label="自由职业者" header-align="center" align="center" width="100"
:formatter="fomartFreelance"></el-table-column> -->
<el-table-column prop="party" label="党员属性" header-align="center" align="center" width="100"
:formatter="fomartParty"></el-table-column>
<el-table-column prop="partyDate" label="入党时间" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="partyName" label="现属党支部" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="workUnit" label="工作单位名称" header-align="center" align="center"
<el-table-column prop="partyName" label="组织关系党支部" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="partyName" label="组织关系地址" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="workUnit" label="现职单位名称" header-align="center" align="center"
width="150"></el-table-column>
<el-table-column prop="workAddr" label="工作单位地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="workAddr" label="现职单位地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="parentDeptNames" label="所属社区" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="status" label="审核状态" header-align="center" align="center" width="80"
:formatter="formatStatus"></el-table-column> -->
@ -122,10 +123,10 @@ export default {
partyOptions: [
{
value: 0,
label: '否'
label: '流入党员'
}, {
value: 1,
label: '是'
label: '流出党员'
}
]
}
@ -176,9 +177,9 @@ export default {
if (row.party === undefined && row.party === '') {
return ''
} else if (row.party === 0) {
return '否'
return '流入党员'
} else {
return '是'
return '流出党员'
}
},
// 审核驳回

Write Preview
Loading…
Cancel
Save