Commit 519a4a16fc64fbbe20ca85478715b06046c93436
1 parent
5022ed25
流程详情页 70% - 审批表单
Showing
2 changed files
with
31 additions
and
4 deletions
yudao-admin-ui/src/views/bpm/processInstance/detail.vue
| 1 | <template> | 1 | <template> |
| 2 | <div class="app-container"> | 2 | <div class="app-container"> |
| 3 | - <!-- TODO 审批信息 --> | 3 | + <!-- 审批信息 --> |
| 4 | + <el-card class="box-card" v-loading="processInstanceLoading"> | ||
| 5 | + <div slot="header" class="clearfix"> | ||
| 6 | + <span class="el-icon-picture-outline">审批任务【TODO】</span> | ||
| 7 | + </div> | ||
| 8 | + <el-col :span="16" :offset="6" > | ||
| 9 | + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | ||
| 10 | + <el-row> | ||
| 11 | + <el-col :span="12"> | ||
| 12 | + <el-form-item label="审批建议" prop="comment"> | ||
| 13 | + <el-input type="textarea" v-model="form.comment" placeholder="请输入审批建议" /> | ||
| 14 | + </el-form-item> | ||
| 15 | + </el-col> | ||
| 16 | + </el-row> | ||
| 17 | + </el-form> | ||
| 18 | + <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px;"> | ||
| 19 | + <el-button icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">通过</el-button> | ||
| 20 | + <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">不通过</el-button> | ||
| 21 | + <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button> | ||
| 22 | + <el-button icon="el-icon-edit-outline" type="info" size="mini" @click="handleDelegate">委派</el-button> | ||
| 23 | + <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button> | ||
| 24 | + </div> | ||
| 25 | + </el-col> | ||
| 26 | + </el-card> | ||
| 4 | <!-- 申请信息 --> | 27 | <!-- 申请信息 --> |
| 5 | <el-card class="box-card" v-loading="processInstanceLoading"> | 28 | <el-card class="box-card" v-loading="processInstanceLoading"> |
| 6 | <div slot="header" class="clearfix"> | 29 | <div slot="header" class="clearfix"> |
| @@ -92,6 +115,12 @@ export default { | @@ -92,6 +115,12 @@ export default { | ||
| 92 | historicTasksLoad: true, | 115 | historicTasksLoad: true, |
| 93 | historicTasks: [], | 116 | historicTasks: [], |
| 94 | 117 | ||
| 118 | + // 审批表单 | ||
| 119 | + form: {}, | ||
| 120 | + rules: { | ||
| 121 | + comment: [{ required: true, message: "审批建议不能为空", trigger: "blur" }], | ||
| 122 | + }, | ||
| 123 | + | ||
| 95 | // 数据字典 | 124 | // 数据字典 |
| 96 | categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY), | 125 | categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY), |
| 97 | }; | 126 | }; |
| @@ -174,8 +203,6 @@ export default { | @@ -174,8 +203,6 @@ export default { | ||
| 174 | ...JSON.parse(row.formConf), | 203 | ...JSON.parse(row.formConf), |
| 175 | fields: decodeFields(row.formFields) | 204 | fields: decodeFields(row.formFields) |
| 176 | } | 205 | } |
| 177 | - | ||
| 178 | - | ||
| 179 | } else if (row.formCustomCreatePath) { | 206 | } else if (row.formCustomCreatePath) { |
| 180 | this.$router.push({ path: row.formCustomCreatePath}); | 207 | this.$router.push({ path: row.formCustomCreatePath}); |
| 181 | // 这里暂时无需加载流程图,因为跳出到另外个 Tab; | 208 | // 这里暂时无需加载流程图,因为跳出到另外个 Tab; |
yudao-admin-ui/src/views/bpm/task/done.vue
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | <el-table-column label="任务编号" align="center" prop="id" width="320" fixed /> | 21 | <el-table-column label="任务编号" align="center" prop="id" width="320" fixed /> |
| 22 | <el-table-column label="任务名称" align="center" prop="name" width="200" /> | 22 | <el-table-column label="任务名称" align="center" prop="name" width="200" /> |
| 23 | <el-table-column label="所属流程" align="center" prop="processInstance.name" width="200" /> | 23 | <el-table-column label="所属流程" align="center" prop="processInstance.name" width="200" /> |
| 24 | - <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" /> | 24 | + <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" width="120" /> |
| 25 | <el-table-column label="结果" align="center" prop="result"> | 25 | <el-table-column label="结果" align="center" prop="result"> |
| 26 | <template slot-scope="scope"> | 26 | <template slot-scope="scope"> |
| 27 | <span> | 27 | <span> |