Skip to content

Chatopera OpenSource / ferry_web

Go to a project
Commit 476bd6e2 by Mr. Lan
Options

添加邮件通知。

parent 8ec90f5f
Inline Side-by-side
Showing with 60 additions and 48 deletions
src/views/process/admin/classify.vue
...@@ -173,10 +173,10 @@ export default { ...@@ -173,10 +173,10 @@ export default {
this.open = true this.open = true
}, },
handleEdit(row) { handleEdit(row) {
this.dialogFormVisibleName = 2
this.ruleForm.id = row.id this.ruleForm.id = row.id
this.ruleForm.name = row.name this.ruleForm.name = row.name
this.open = true this.open = true
this.dialogFormVisibleName = 2
}, },
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
......
src/views/process/admin/process-manager.vue
...@@ -84,42 +84,59 @@ ...@@ -84,42 +84,59 @@
@pagination="getList" @pagination="getList"
/> />
<el-dialog :title="dialogFormVisibleName===1?'新建模版':'编辑模版'" :visible.sync="open" :fullscreen="true" style="margin-top: 0"> <el-dialog :title="dialogProcessVisibleName===1?'新建流程':'编辑流程'" :visible.sync="open" :fullscreen="true" style="margin-top: 0">
<div class="tpl-create-content"> <div class="tpl-create-content">
<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px"> <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="ruleForm.name" placeholder="请输入流程名称" style="width: 100%" /> <el-input v-model="ruleForm.name" placeholder="请输入流程名称" style="width: 100%" />
</el-form-item> </el-form-item>
<el-form-item label="分类" prop="classify"> <el-row>
<el-select v-model="ruleForm.classify" filterable placeholder="请选择流程分类" style="width: 100%"> <el-col :span="12">
<el-option <el-form-item label="分类" prop="classify">
v-for="item in classifyListData" <el-select v-model="ruleForm.classify" filterable placeholder="请选择流程分类" style="width: 100%">
:key="item.id" <el-option
:label="item.name" v-for="item in classifyListData"
:value="item.id" :key="item.id"
/> :label="item.name"
</el-select> :value="item.id"
</el-form-item> />
<el-form-item label="模版" prop="tpls"> </el-select>
<el-select v-model="ruleForm.tpls" filterable multiple placeholder="请选择模版" style="width: 100%"> </el-form-item>
<el-option </el-col>
v-for="item in templates" <el-col :span="12">
:key="item.id" <el-form-item label="模版" prop="tpls">
:label="item.name" <el-select v-model="ruleForm.tpls" filterable multiple placeholder="请选择模版" style="width: 100%">
:value="item.id" <el-option
/> v-for="item in templates"
</el-select> :key="item.id"
</el-form-item> :label="item.name"
<el-form-item label="任务"> :value="item.id"
<el-select v-model="ruleForm.task" multiple filterable placeholder="请选择流程任务" style="width: 100%"> />
<el-option </el-select>
v-for="(item, index) in taskListData" </el-form-item>
:key="index" </el-col>
:label="item.name" </el-row>
:value="item.full_name" <el-row>
/> <el-col :span="12">
</el-select> <el-form-item label="通知">
</el-form-item> <el-select v-model="ruleForm.notice" multiple filterable clearable placeholder="请选择流程任务" style="width: 100%">
<el-option label="邮件" :value="1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务">
<el-select v-model="ruleForm.task" multiple filterable clearable placeholder="请选择流程任务" style="width: 100%">
<el-option
v-for="(item, index) in taskListData"
:key="index"
:label="item.name"
:value="item.full_name"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="流程" prop="structure"> <el-form-item label="流程" prop="structure">
<div style="border-radius: 4px; overflow:hidden"> <div style="border-radius: 4px; overflow:hidden">
<div> <div>
...@@ -168,7 +185,6 @@ export default { ...@@ -168,7 +185,6 @@ export default {
}, },
data() { data() {
return { return {
dialogFormVisibleName: 1,
queryParams: {}, queryParams: {},
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -197,14 +213,7 @@ export default { ...@@ -197,14 +213,7 @@ export default {
per_page: 10 per_page: 10
}, },
lang: 'zh', lang: 'zh',
ruleForm: { ruleForm: {},
id: undefined,
name: '',
structure: '',
tpls: [],
classify: '',
task: []
},
rules: { rules: {
name: [ name: [
{ required: true, message: '请输入流程名称', trigger: 'blur' } { required: true, message: '请输入流程名称', trigger: 'blur' }
...@@ -296,7 +305,8 @@ export default { ...@@ -296,7 +305,8 @@ export default {
tpls: [], tpls: [],
structure: { 'edges': [], 'nodes': [], 'groups': [] }, structure: { 'edges': [], 'nodes': [], 'groups': [] },
classify: '', classify: '',
task: [] task: [],
notice: [1]
} }
this.dialogProcessVisibleName = 1 this.dialogProcessVisibleName = 1
this.open = true this.open = true
...@@ -306,6 +316,7 @@ export default { ...@@ -306,6 +316,7 @@ export default {
}) })
}, },
handleEdit(row) { handleEdit(row) {
this.dialogProcessVisibleName = 2
this.getProcessInitData() this.getProcessInitData()
this.wfdDesignRefresh = false this.wfdDesignRefresh = false
processDetails({ processDetails({
...@@ -317,9 +328,9 @@ export default { ...@@ -317,9 +328,9 @@ export default {
tpls: response.data.tpls, tpls: response.data.tpls,
structure: response.data.structure, structure: response.data.structure,
classify: response.data.classify, classify: response.data.classify,
task: response.data.task task: response.data.task,
notice: response.data.notice
} }
this.dialogProcessVisibleName = 2
this.open = true this.open = true
this.wfdDesignRefresh = false this.wfdDesignRefresh = false
this.$nextTick(() => { this.$nextTick(() => {
...@@ -389,7 +400,8 @@ export default { ...@@ -389,7 +400,8 @@ export default {
tpls: this.ruleForm.tpls, tpls: this.ruleForm.tpls,
structure: this.$refs.wfd.graph.save(), structure: this.$refs.wfd.graph.save(),
classify: this.ruleForm.classify, classify: this.ruleForm.classify,
task: this.ruleForm.task task: this.ruleForm.task,
notice: this.ruleForm.notice
}).then(response => { }).then(response => {
this.getList() this.getList()
this.open = false this.open = false
......
src/views/process/admin/task-manager.vue
...@@ -246,6 +246,7 @@ export default { ...@@ -246,6 +246,7 @@ export default {
this.open = true this.open = true
}, },
handleEdit(row) { handleEdit(row) {
this.dialogFormVisibleName = 2
taskDetails({ taskDetails({
file_name: row.full_name file_name: row.full_name
}).then(response => { }).then(response => {
...@@ -255,7 +256,6 @@ export default { ...@@ -255,7 +256,6 @@ export default {
classify: row.classify, classify: row.classify,
content: response.data content: response.data
} }
this.dialogFormVisibleName = 2
this.open = true this.open = true
}) })
}, },
......
src/views/process/admin/template-manager.vue
...@@ -215,6 +215,7 @@ export default { ...@@ -215,6 +215,7 @@ export default {
}) })
}, },
handleEdit(row) { handleEdit(row) {
this.dialogFormVisibleName = 2
templateDetails({ templateDetails({
template_id: row.id template_id: row.id
}).then(response => { }).then(response => {
...@@ -224,7 +225,6 @@ export default { ...@@ -224,7 +225,6 @@ export default {
remarks: response.data.remarks, remarks: response.data.remarks,
form_structure: response.data.remarks form_structure: response.data.remarks
} }
this.dialogFormVisibleName = 2
this.open = true this.open = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.makingform.setJSON(response.data.form_structure) this.$refs.makingform.setJSON(response.data.form_structure)
......
src/views/process/list/all.vue
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<span v-if="scope.row.is_end===0">{{ scope.row.principals }}</span> <span v-if="scope.row.is_end===0">{{ scope.row.principals }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="优先级" :show-overflow-tooltip="true" width="120" align="center"> <el-table-column label="优先级" :show-overflow-tooltip="true" width="120" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.priority===2"> <span v-if="scope.row.priority===2">
<el-tag type="warning">紧急</el-tag> <el-tag type="warning">紧急</el-tag>
......
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