public/bpmnjs/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/api/activiti/historyFormdata.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/api/workflow/leave.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/activiti/task/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/workflow/leave/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/workflow/leave/leaveHistoryForm.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
public/bpmnjs/index.js
@@ -75,8 +75,10 @@ instanceId }; let token = localStorage.getItem("Authorization"); _jquery.default.ajax({ url: localStorage.getItem("VUE_APP_BASE_API") + '/activitiHistory/gethighLine', url: localStorage.getItem("VUE_APP_BASE_API") + '/wf/history/getHighLine?Authorization='+token, // url: 'http://localhost:8080/activitiHistory/gethighLine', type: 'GET', data: param1, src/api/activiti/historyFormdata.js
@@ -2,7 +2,7 @@ // 查询请假详细 export function historyFromData(instanceId) { return request({ url: '/historyFromData/ByInstanceId/' + instanceId, url: '/wf/history/formData/ByInstanceId/' + instanceId, method: 'get' }) } src/api/workflow/leave.js
@@ -20,7 +20,7 @@ // 查询请假详细 export function getLeave(id) { return request({ url: '/wf/leave/' + id, url: '/wf/leave/view/' + id, method: 'get' }) } src/views/activiti/task/index.vue
@@ -17,7 +17,7 @@ type="text" icon="el-icon-edit" @click="examineAndApprove (scope.row)" v-hasPermi="['workflow:leave:edit']" v-hasPermi="['wf:task:**']" >审批 </el-button> </template> @@ -178,7 +178,7 @@ /** 提交按钮 */ submitForm() { formDataSave(this.id,this.form.formData).then(response => { this.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功"); this.open = false; this.getList(); }); src/views/workflow/leave/index.vue
@@ -90,7 +90,7 @@ <el-table-column label="原因" align="center" prop="reason"/> <el-table-column label="开始时间" align="center" prop="leave_start_time" width="180"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.leaveStartTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.leave_start_time, '{y}-{m}-{d}') }}</span> </template> </el-table-column> <el-table-column label="结束时间" align="center" prop="leave_end_time" width="180"> @@ -235,6 +235,7 @@ import leaveHistoryForm from "./leaveHistoryForm"; import {getToken} from "@/utils/auth"; export default { name: 'Leave', @@ -404,14 +405,13 @@ }, /** 进度查看 */ checkTheSchedule(row) { getDefinitionsByInstanceId(row.instanceId).then(response => { let data = response.data getDefinitionsByInstanceId(row.instance_id).then(response => { let data = response.data; localStorage.setItem("Authorization", getToken()); // this.url = '/bpmnjs/index.html?type=lookBpmn&deploymentFileUUID='+data.deploymentID+'&deploymentName='+ encodeURI(data.resourceName); this.modelerUrl = '/bpmnjs/index.html?type=lookBpmn&instanceId=' + row.instanceId + '&deploymentFileUUID=' + data.deploymentID + '&deploymentName=' + encodeURI(data.resourceName); this.modelVisible = true this.modelerUrl = '/bpmnjs/index.html?type=lookBpmn&instanceId=' + row.instance_id + '&deploymentFileUUID=' + data.deploymentID + '&deploymentName=' + encodeURI(data.resourceName); this.modelVisible = true; }) }, /** 提交按钮 */ submitForm() { @@ -419,15 +419,15 @@ if (valid) { if (this.form.id != null) { updateLeave(this.form).then(response => { this.msgSuccess('修改成功') this.open = false this.getList() this.$modal.msgSuccess('修改成功'); this.open = false; this.getList(); }) } else { addLeave(this.form).then(response => { this.msgSuccess('新增成功') this.open = false this.getList() this.$modal.msgSuccess('新增成功'); this.open = false; this.getList(); }) } } src/views/workflow/leave/leaveHistoryForm.vue
@@ -1,7 +1,7 @@ <template> <div> <div> <h2>请假人:{{form.createName}}</h2> <h2>请假人:{{form.create_name}}</h2> <el-form label-width="80px"> <el-form-item label="请假类型" > <el-input v-model="form.type"/> @@ -13,10 +13,10 @@ <el-input v-model="form.reason" /> </el-form-item> <el-form-item label="开始时间"> <el-input v-model="form.leaveStartTime"/> <el-input v-model="form.leave_start_time"/> </el-form-item> <el-form-item label="结束时间"> <el-input v-model="form.leaveEndTime"/> <el-input v-model="form.leave_end_time"/> </el-form-item> </el-form> </div>