Commit 24615c2f by YuleiLan

添加任务管理。

parent 02a14710
......@@ -69,6 +69,7 @@
"tui-editor": "1.3.3",
"viewerjs": "^1.6.1",
"vue": "2.6.10",
"vue-codemirror": "^4.0.6",
"vue-codemirror-lite": "^1.0.4",
"vue-count-to": "1.0.13",
"vue-cropper": "^0.5.0",
......
......@@ -45,10 +45,10 @@
:filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
@change="(e) => onChange('assignValue', e)"
>
<el-option v-for="user in users" :key="user.id" :label="user.nickname===''?user.username:user.nickname" :value="user.id" />
<el-option v-for="user in users" :key="user.userId" :label="user.nickName===''?user.username:user.nickName" :value="user.userId" />
</el-select>
</div>
<div v-else-if="model.assignType === 'persongroup'" class="panelRow">
<!-- <div v-else-if="model.assignType === 'persongroup'" class="panelRow">
<div>{{ i18n['handleNode.assignType.persongroup.title'] }}</div>
<el-select
style="width:90%; font-size:12px"
......@@ -62,7 +62,7 @@
>
<el-option v-for="group in groups" :key="group.id" :label="group.nickname===''?group.name:group.nickname" :value="group.id" />
</el-select>
</div>
</div> -->
<div v-else-if="model.assignType === 'department'" class="panelRow">
<div>{{ i18n['handleNode.assignType.department.title'] }}</div>
<el-select
......
......@@ -45,10 +45,10 @@
:filter-method="(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0"
@change="(e) => onChange('assignValue', e)"
>
<el-option v-for="user in users" :key="user.id" :label="user.nickname===''?user.username:user.nickname" :value="user.id" />
<el-option v-for="user in users" :key="user.userId" :label="user.nickName===''?user.username:user.nickName" :value="user.userId" />
</el-select>
</div>
<div v-else-if="model.assignType === 'persongroup'" class="panelRow">
<!-- <div v-else-if="model.assignType === 'persongroup'" class="panelRow">
<div>{{ i18n['userTask.assignType.persongroup.title'] }}</div>
<el-select
style="width:90%; font-size:12px"
......@@ -62,7 +62,7 @@
>
<el-option v-for="group in groups" :key="group.id" :label="group.nickname===''?group.name:group.nickname" :value="group.id" />
</el-select>
</div>
</div> -->
<div v-else-if="model.assignType === 'department'" class="panelRow">
<div>{{ i18n['userTask.assignType.department.title'] }}</div>
<el-select
......
......@@ -25,6 +25,11 @@ import * as filters from './filters' // global filters
import Pagination from '@/components/Pagination'
// 代码编辑器
import VueCodeMirror from 'vue-codemirror'
import 'codemirror/lib/codemirror.css'
Vue.use(VueCodeMirror)
// 全局方法挂载
Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm
......
......@@ -52,7 +52,7 @@
<el-table v-loading="loading" border :data="classifyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" prop="id" width="120" />
<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" width="150" />
<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="创建者" prop="create_name" :show-overflow-tooltip="true" width="150" />
<el-table-column label="创建时间" align="center" prop="create_time" width="180">
<template slot-scope="scope">
......@@ -113,7 +113,7 @@ import {
} from '@/api/process/admin/classify'
export default {
name: 'Role',
name: 'Classify',
data() {
return {
dialogFormVisibleName: 1,
......
......@@ -52,7 +52,7 @@
<el-table v-loading="loading" border :data="processValueList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" prop="id" width="120" />
<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" width="150" />
<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="创建者" prop="create_name" :show-overflow-tooltip="true" width="150" />
<el-table-column label="创建时间" align="center" prop="create_time" width="180" />
<el-table-column label="更新时间" align="center" prop="update_time" width="180" />
......@@ -127,7 +127,6 @@
v-if="wfdDesignRefresh"
ref="wfd"
:users="users"
:groups="groups"
:departments="departments"
:tasks="taskListData"
:data="ruleForm.structure"
......@@ -160,8 +159,10 @@ import {
import { classifyList } from '@/api/process/admin/classify'
import { templateList } from '@/api/process/admin/template'
import { listUser } from '@/api/system/sysuser'
export default {
name: 'Role',
name: 'Process',
components: {
'WfdDesign': () => import('@/components/wfd/components/Wfd')
},
......@@ -242,6 +243,24 @@ export default {
this.templates = response.data.data
})
},
// 获取用户
getUsers() {
listUser({
pageSize: 999999
}).then(response => {
this.users = response.data.list
console.log(this.users)
})
},
// 获取部门
// getDepartments() {
// departmentList({
// page: 1,
// per_page: 99999
// }).then(response => {
// this.departments = response.data.data
// })
// },
/** 查询流程列表 */
getList() {
this.loading = true
......@@ -255,9 +274,13 @@ export default {
this.loading = false
})
},
handleCreate() {
getProcessInitData() {
this.getClassifyList()
this.getTemplates()
this.getUsers()
},
handleCreate() {
this.getProcessInitData()
this.ruleForm = {
id: undefined,
name: '',
......@@ -274,8 +297,7 @@ export default {
})
},
handleEdit(row) {
this.getClassifyList()
this.getTemplates()
this.getProcessInitData()
this.wfdDesignRefresh = false
processDetails({
processId: row.id
......
......@@ -52,7 +52,7 @@
<el-table v-loading="loading" border :data="tplList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" prop="id" width="120" />
<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" width="150" />
<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="创建者" prop="create_name" :show-overflow-tooltip="true" width="150" />
<el-table-column label="创建时间" align="center" prop="create_time" width="180" />
<el-table-column label="更新时间" align="center" prop="update_time" width="180" />
......@@ -145,7 +145,7 @@ Vue.use(GenerateForm)
Vue.use(MakingForm)
export default {
name: 'Role',
name: 'Template',
data() {
return {
dialogFormVisibleName: 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment