|
|
@@ -40,6 +40,14 @@
|
|
|
@action-event="handleAction"
|
|
|
@pagination-change="handlePaginationChange"
|
|
|
>
|
|
|
+ <template slot="position">
|
|
|
+ <ibps-user-selector
|
|
|
+ v-model="pos"
|
|
|
+ type="position"
|
|
|
+ readonly-text="text"
|
|
|
+ :multiple="true"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
<template
|
|
|
v-if="scope.row.fu_jian_"
|
|
|
slot="file"
|
|
|
@@ -168,7 +176,7 @@ import wordPng from '@/assets/images/icons/word.png'
|
|
|
import fileTraining from '@/views/component/fileTraining'
|
|
|
import UpdateFile from './updateFile'
|
|
|
import DataTemplateFormrenderDialog from '@/business/platform/data/templaterender/form/dialog.vue'
|
|
|
-
|
|
|
+import ibpsUserSelector from '@/business/platform/org/selector'
|
|
|
export default {
|
|
|
components: {
|
|
|
IbpsTypeTree,
|
|
|
@@ -176,7 +184,8 @@ export default {
|
|
|
UpdateFile,
|
|
|
'ibps-attachment': IbpsAttachment,
|
|
|
'file-lookup': fileTraining,
|
|
|
- DataTemplateFormrenderDialog
|
|
|
+ DataTemplateFormrenderDialog,
|
|
|
+ ibpsUserSelector
|
|
|
},
|
|
|
mixins: [FixHeight],
|
|
|
data () {
|
|
|
@@ -271,7 +280,8 @@ export default {
|
|
|
button_type: 'save',
|
|
|
label: '保存',
|
|
|
key: 'save'
|
|
|
- }]
|
|
|
+ }],
|
|
|
+ pos: ''
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -343,13 +353,16 @@ export default {
|
|
|
label: '上传时间',
|
|
|
fieldType: 'daterange',
|
|
|
width: 200
|
|
|
- }
|
|
|
+ },
|
|
|
+ { prop: 'org_name', label: '部门', fieldType: 'slot', slotName: 'position' },
|
|
|
+ { prop: 'biao_dan_ming_che', label: '表单名称', width: 150 },
|
|
|
+ { prop: 'shi_wu_shuo_ming_', label: '事务说明', width: 150 }
|
|
|
]
|
|
|
this.listConfig.columns = [
|
|
|
// { prop: 'fen_lei_', label: '表单分类', width: 120 },
|
|
|
{
|
|
|
prop: 'nian_du_',
|
|
|
- label: '记录月份',
|
|
|
+ label: '记录年份',
|
|
|
dateFormat: 'yyyy-MM',
|
|
|
width: 100
|
|
|
},
|
|
|
@@ -584,11 +597,20 @@ export default {
|
|
|
if (this.pageKey !== 'nbwj') {
|
|
|
if (this.$store.getters.deptList.length !== 0) {
|
|
|
// eslint-disable-next-line no-redeclare
|
|
|
- for (var i of this.$store.getters.deptList) {
|
|
|
- buMenWhere.push(
|
|
|
- `bian_zhi_bu_men_ like '%${i.positionId}%'`
|
|
|
- )
|
|
|
+ if (this.pos) {
|
|
|
+ for (var a of this.pos.split(',')) {
|
|
|
+ buMenWhere.push(
|
|
|
+ `bian_zhi_bu_men_ like '%${a}%'`
|
|
|
+ )
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ for (var b of this.$store.getters.deptList) {
|
|
|
+ buMenWhere.push(
|
|
|
+ `bian_zhi_bu_men_ like '%${b.positionId}%'`
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
oldRecordSql = `select wj.*,en.name_ AS org_name,ee.name_ as ry_name FROM t_ywyxjlb wj
|
|
|
left join ibps_party_employee ee on wj.bian_zhi_ren_ = ee.id_
|
|
|
LEFT JOIN ibps_party_entity en ON en.id_= bian_zhi_bu_men_
|