From 14c20db6e07d7770fccb0b43e2cadd247c0e37a6 Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期二, 21 三月 2023 18:48:12 +0800
Subject: [PATCH] 添加activiti7若依界面 2
---
src/api/activiti/task.js | 8 ++--
src/views/workflow/leave/index.vue | 52 +++++++++++++-------------
src/api/workflow/leave.js | 18 ++++----
src/views/activiti/task/index.vue | 2
4 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/api/activiti/task.js b/src/api/activiti/task.js
index e35dd6c..dfd933b 100644
--- a/src/api/activiti/task.js
+++ b/src/api/activiti/task.js
@@ -3,7 +3,7 @@
// 鏌ヨtask鍒楄〃
export function listTask(query) {
return request({
- url: '/task/list',
+ url: '/wf/task/list',
method: 'get',
params: query
})
@@ -12,15 +12,15 @@
// 鏌ヨ琛ㄥ崟
export function formDataShow(taskID) {
return request({
- url: '/task/formDataShow/'+taskID,
+ url: '/wf/task/formDataShow/'+taskID,
method: 'get',
})
}
-// 鏌ヨ琛ㄥ崟
+// 淇濆瓨琛ㄥ崟
export function formDataSave(taskID,data) {
return request({
- url: '/task/formDataSave/'+taskID,
+ url: '/wf/task/formDataSave/'+taskID,
method: 'post',
data:data
})
diff --git a/src/api/workflow/leave.js b/src/api/workflow/leave.js
index 4d88512..d5763b3 100644
--- a/src/api/workflow/leave.js
+++ b/src/api/workflow/leave.js
@@ -3,7 +3,7 @@
// 鏌ヨ璇峰亣鍒楄〃
export function listLeave(query) {
return request({
- url: '/workflow/leave/list',
+ url: '/wf/leave/list',
method: 'get',
params: query
})
@@ -11,7 +11,7 @@
// 鏌ヨ璇峰亣鍒楄〃
export function listLeaveAll(query) {
return request({
- url: '/workflow/leave/listAll',
+ url: '/wf/leave/listAll',
method: 'get',
params: query
})
@@ -20,7 +20,7 @@
// 鏌ヨ璇峰亣璇︾粏
export function getLeave(id) {
return request({
- url: '/workflow/leave/' + id,
+ url: '/wf/leave/' + id,
method: 'get'
})
}
@@ -29,7 +29,7 @@
// 鏂板璇峰亣
export function addLeave(data) {
return request({
- url: '/workflow/leave',
+ url: '/wf/leave/add',
method: 'post',
data: data
})
@@ -38,8 +38,8 @@
// 淇敼璇峰亣
export function updateLeave(data) {
return request({
- url: '/workflow/leave',
- method: 'put',
+ url: '/wf/leave/edit',
+ method: 'post',
data: data
})
}
@@ -47,15 +47,15 @@
// 鍒犻櫎璇峰亣
export function delLeave(id) {
return request({
- url: '/workflow/leave/' + id,
- method: 'delete'
+ url: '/wf/leave/delete/' + id,
+ method: 'get'
})
}
// 瀵煎嚭璇峰亣
export function exportLeave(query) {
return request({
- url: '/workflow/leave/export',
+ url: '/wf/leave/export',
method: 'get',
params: query
})
diff --git a/src/views/activiti/task/index.vue b/src/views/activiti/task/index.vue
index fde88b4..a977981 100644
--- a/src/views/activiti/task/index.vue
+++ b/src/views/activiti/task/index.vue
@@ -117,7 +117,7 @@
getList() {
this.loading = true;
listTask(this.queryParams).then(response => {
- this.tastList = response.rows;
+ this.tastList = response.data;
this.total = response.total;
this.loading = false;
});
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index c583dd4..9f446d8 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -5,9 +5,9 @@
<el-select v-model="queryParams.type" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" clearable size="small">
<el-option
v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ :key="dict.dict_value"
+ :label="dict.dict_label"
+ :value="dict.dict_value"
/>
</el-select>
</el-form-item>
@@ -41,9 +41,9 @@
<el-select v-model="queryParams.state" placeholder="璇烽�夋嫨鐘舵��" clearable size="small">
<el-option
v-for="dict in stateOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ :key="dict.dict_value"
+ :label="dict.dict_label"
+ :value="dict.dict_value"
/>
</el-select>
</el-form-item>
@@ -88,14 +88,14 @@
<el-table-column label="璇峰亣绫诲瀷" align="center" prop="type" :formatter="typeFormat"/>
<el-table-column label="鏍囬" align="center" prop="title"/>
<el-table-column label="鍘熷洜" align="center" prop="reason"/>
- <el-table-column label="寮�濮嬫椂闂�" align="center" prop="leaveStartTime" width="180">
+ <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>
</template>
</el-table-column>
- <el-table-column label="缁撴潫鏃堕棿" align="center" prop="leaveEndTime" width="180">
+ <el-table-column label="缁撴潫鏃堕棿" align="center" prop="leave_end_time" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.leaveEndTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.leave_end_time, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
@@ -107,7 +107,7 @@
{{stateFormat(scope.row)}}
</div>
<div v-else>
- {{scope.row.taskName}}
+ {{scope.row.task_name}}
</div>
</template>
</el-table-column>
@@ -188,12 +188,12 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="璇峰亣绫诲瀷" prop="type">
- <el-select v-model="form.type" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" @change="chooseMedicine">
+ <el-select v-model="form.type" placeholder="璇峰亣绫诲瀷" @change="chooseMedicine">
<el-option
v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ :key="dict.dict_value"
+ :label="dict.dict_label"
+ :value="dict.dict_value"
></el-option>
</el-select>
</el-form-item>
@@ -205,7 +205,7 @@
</el-form-item>
<el-form-item label="寮�濮嬫椂闂�" prop="leaveStartTime">
<el-date-picker clearable size="small" style="width: 200px"
- v-model="form.leaveStartTime"
+ v-model="form.leave_start_time"
type="date"
value-format="yyyy-MM-dd"
placeholder="閫夋嫨寮�濮嬫椂闂�">
@@ -213,7 +213,7 @@
</el-form-item>
<el-form-item label="缁撴潫鏃堕棿" prop="leaveEndTime">
<el-date-picker clearable size="small" style="width: 200px"
- v-model="form.leaveEndTime"
+ v-model="form.leave_end_time"
type="date"
value-format="yyyy-MM-dd"
placeholder="閫夋嫨缁撴潫鏃堕棿">
@@ -297,10 +297,10 @@
reason: [
{required: true, message: '鍘熷洜涓嶈兘涓虹┖', trigger: 'blur'}
],
- leaveStartTime: [
+ leave_start_time: [
{required: true, message: '寮�濮嬫椂闂翠笉鑳戒负绌�', trigger: 'blur'}
],
- leaveEndTime: [
+ leave_end_time: [
{required: true, message: '缁撴潫鏃堕棿涓嶈兘涓虹┖', trigger: 'blur'}
]
}
@@ -320,7 +320,7 @@
getList() {
this.loading = true
listLeave(this.queryParams).then(response => {
- this.leaveList = response.rows
+ this.leaveList = response.data
this.total = response.total
this.loading = false
})
@@ -346,13 +346,13 @@
type: null,
title: null,
reason: null,
- leaveStartTime: null,
- leaveEndTime: null,
- instanceId: null,
+ leave_start_time: null,
+ leave_end_time: null,
+ instance_id: null,
state: null,
- createBy: null,
- createTime: null,
- updateTime: null
+ create_by: null,
+ create_time: null,
+ update_time: null
}
this.resetForm('form')
},
@@ -374,7 +374,7 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.createName = this.$store.getters.nickName
+ this.createName = this.$store.getters.nick_name
if (this.$store.getters.name != "admin") {
this.reset()
this.open = true
--
Gitblit v1.9.1