commit
This commit is contained in:
+4
-3
@@ -64,7 +64,7 @@ layout("/layouts/platform.html"){
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="typeName" label="慰问类型"></el-table-column>
|
<el-table-column prop="typeName" label="慰问类型"></el-table-column>
|
||||||
<!-- <el-table-column prop="createTime" label="申请时间"></el-table-column>-->
|
<!-- <el-table-column prop="createTime" label="申请时间"></el-table-column>-->
|
||||||
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
|
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
|
||||||
<el-table-column prop="instanceState" label="流程状态">
|
<el-table-column prop="instanceState" label="流程状态">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
@@ -151,6 +151,7 @@ layout("/layouts/platform.html"){
|
|||||||
this.showApprovalForm = true
|
this.showApprovalForm = true
|
||||||
this.formData = {
|
this.formData = {
|
||||||
processTaskId: row.taskId,
|
processTaskId: row.taskId,
|
||||||
|
userId: row.certifierUserId,
|
||||||
taskName: row.curTaskName
|
taskName: row.curTaskName
|
||||||
}
|
}
|
||||||
this.$refs.condolenceInfoRef.onOpen(row)
|
this.$refs.condolenceInfoRef.onOpen(row)
|
||||||
@@ -197,11 +198,11 @@ layout("/layouts/platform.html"){
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
queryCondolenceType() {
|
queryCondolenceType() {
|
||||||
this.$axios.post('/platform/condolence/type/queryCondolenceType')
|
this.$axios.post("/platform/condolence/type/queryCondolenceType")
|
||||||
.then((resp) => {
|
.then((resp) => {
|
||||||
this.typeOptions = resp.data
|
this.typeOptions = resp.data
|
||||||
})
|
})
|
||||||
},
|
}
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
+7
-5
@@ -27,8 +27,9 @@ layout("/layouts/platform_h5.html"){
|
|||||||
</van-sticky>
|
</van-sticky>
|
||||||
|
|
||||||
|
|
||||||
<table-list api="/platform/condolence/helpUserSign/pageData" :page_form.sync="pageForm" ref="tableListRef" @ready="onReady">
|
<table-list api="/platform/condolence/helpUserSign/pageData" :page_form.sync="pageForm" ref="tableListRef"
|
||||||
<template v-slot="{index,row}">
|
@ready="onReady">
|
||||||
|
<template v-slot="{index,row}">
|
||||||
<table-column label="慰问对象">{{row.helpUserName}}</table-column>
|
<table-column label="慰问对象">{{row.helpUserName}}</table-column>
|
||||||
<table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
|
<table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
|
||||||
<table-column label="申请人">{{row.applyUserName}}</table-column>
|
<table-column label="申请人">{{row.applyUserName}}</table-column>
|
||||||
@@ -106,7 +107,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
approvalText: "0",
|
approvalText: "0",
|
||||||
approval: false,
|
approval: false,
|
||||||
year: new Date().getFullYear(),
|
year: new Date().getFullYear(),
|
||||||
type: null,
|
type: null
|
||||||
},
|
},
|
||||||
typeOptions: [],
|
typeOptions: [],
|
||||||
formData: {},
|
formData: {},
|
||||||
@@ -137,12 +138,13 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$refs.infoRef.onOpen(row)
|
this.$refs.infoRef.onOpen(row)
|
||||||
this.formData = {
|
this.formData = {
|
||||||
processTaskId: row.taskId,
|
processTaskId: row.taskId,
|
||||||
|
userId: row.certifierUserId,
|
||||||
taskName: row.curTaskName
|
taskName: row.curTaskName
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async handleTaskAction(val) {
|
async handleTaskAction(val) {
|
||||||
try {
|
try {
|
||||||
await this.$refs.formRef.validate();
|
await this.$refs.formRef.validate()
|
||||||
this.$dialog.confirm({
|
this.$dialog.confirm({
|
||||||
title: "提示",
|
title: "提示",
|
||||||
message: "您确定要提交吗?"
|
message: "您确定要提交吗?"
|
||||||
@@ -167,7 +169,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
async queryCondolenceType() {
|
async queryCondolenceType() {
|
||||||
const res = await this.$axios.post('/platform/condolence/type/queryCondolenceType')
|
const res = await this.$axios.post("/platform/condolence/type/queryCondolenceType")
|
||||||
return res.data
|
return res.data
|
||||||
},
|
},
|
||||||
doSearch() {
|
doSearch() {
|
||||||
|
|||||||
Reference in New Issue
Block a user