新增功能:教代会意见需要导出
bug修改: 1、无法导出未体检人员 2、品牌活动加了微信二维码,无法删除
This commit is contained in:
@@ -356,9 +356,15 @@ module.exports = {
|
||||
|
||||
handleRemove(file, fileList) {
|
||||
if (this.upload_result_category === "interval") {
|
||||
// interval 模式下父组件接收的是逗号拼接字符串,删除文件后也必须同步回写,
|
||||
// 否则表单仍会保留删除前的旧值,提交时会把已删除文件再次带给后端。
|
||||
if (this.upload_result_type === "id") {
|
||||
const resultArrayValue = fileList.map((e) => e.response.data)
|
||||
this.$emit("update:value", resultArrayValue.length > 0 ? resultArrayValue.join(",") : undefined)
|
||||
}
|
||||
if (this.upload_result_type === "url") {
|
||||
const resultArrayValue = fileList.map((e) => e.response.data)
|
||||
this.$emit("update:value", resultArrayValue.length > 0 ? resultArrayValue.join(",") : undefined)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+58
-2
@@ -20,11 +20,24 @@ layout("/layouts/platform.html"){
|
||||
<search-item label="姓名/工号">
|
||||
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
|
||||
</search-item>
|
||||
<search-item label="流程名称">
|
||||
<el-select v-model="pageForm.taskName" clearable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in taskNameOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
<el-card shadow="never">
|
||||
<table-tool :columns.sync="tableColumns"></table-tool>
|
||||
<table-tool :columns.sync="tableColumns">
|
||||
<el-button type="primary" size="small" @click="exportData">导出
|
||||
</el-button>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" @sort-change="pageOrder" ref="tableRef" row-key="id" style="width: 100%">
|
||||
<el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
|
||||
<el-table-column
|
||||
@@ -35,6 +48,7 @@ layout("/layouts/platform.html"){
|
||||
:fixed="column.fixed"
|
||||
show-overflow-tooltip
|
||||
v-for="column in tableColumns"
|
||||
v-if="column.visible !== false"
|
||||
>
|
||||
<template v-if="column.prop === 'instanceState'" scope="{row}">
|
||||
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
|
||||
@@ -78,19 +92,60 @@ layout("/layouts/platform.html"){
|
||||
{label: "记录人所属讨论组", prop: "suggestUserDelegationName"},
|
||||
{label: "届次", prop: "sessionName"},
|
||||
{label: "代表团", prop: "delegationName"},
|
||||
{label: "当前节点", prop: "curTaskName"},
|
||||
{label: "流程状态", prop: "instanceState"}
|
||||
],
|
||||
pageForm: {},
|
||||
sessionOptions: [],
|
||||
taskNameOptions: [
|
||||
{
|
||||
value: 'schoolAudit',
|
||||
label: '校工会审核'
|
||||
}, {
|
||||
value: 'startTask',
|
||||
label: '撰写意见'
|
||||
}, {
|
||||
value: 'slave_reply',
|
||||
label: '协办单位答复'
|
||||
}, {
|
||||
value: 'master_reply',
|
||||
label: '主办单位答复'
|
||||
}, {
|
||||
value: 'feedback',
|
||||
label: '代表评价'
|
||||
}, {
|
||||
value: 'schoolSubmit',
|
||||
label: '校工会提交'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
methods: {
|
||||
openView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
})
|
||||
},
|
||||
|
||||
exportData() {
|
||||
this.$downLoad(loc() + "/exportData", {
|
||||
sessionId: this.pageForm.sessionId,
|
||||
name: this.pageForm.name,
|
||||
createUserKeyword: this.pageForm.createUserKeyword,
|
||||
taskName: this.pageForm.taskName,
|
||||
pageOrderName: this.pageForm.pageOrderName,
|
||||
pageOrderBy: this.pageForm.pageOrderBy,
|
||||
tableColumns: JSON.stringify(this.tableColumns.filter(function (item) {
|
||||
return item.visible !== false
|
||||
}).map(function (item) {
|
||||
return {
|
||||
label: item.label,
|
||||
prop: item.prop
|
||||
}
|
||||
}))
|
||||
})
|
||||
},
|
||||
|
||||
// 教代会
|
||||
async meetingChange(val) {
|
||||
this.doSearch()
|
||||
@@ -108,6 +163,7 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
},
|
||||
created() {
|
||||
this.pageData()
|
||||
|
||||
Reference in New Issue
Block a user