From 12ab52e9490034843b72f1399da666108cabbe4f Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 20 七月 2023 14:40:45 +0800
Subject: [PATCH] 提交被覆盖的前端代码，流程模板、流程阶段、流程审批页面
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 202 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 149 insertions(+), 53 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 279b8d1..22644e7 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -1,20 +1,30 @@
<template>
- <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true">
- <div>
- <el-tag v-for="tag in tags" :key="tag" closable disable-transitions effect="dark" @click="handleClickTag(tag)"
- @close="handleCloseTag(tag)">
- <span> {{ tag.name }}</span>
- </el-tag>
- </div>
-
+ <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" width="30%">
+ <el-tag v-for="tag in tags" :key="tag" closable disable-transitions effect="Plain" size="medium"
+ @click="handleClickTag(tag)" @close="handleCloseTag(tag)">
+ <span> {{ tag.name }}</span>
+ </el-tag>
<el-divider v-if="tags.length !== 0"></el-divider>
+ <el-form :model="saveParam" class="demo-form-inline" label-position="left" label-width="auto" :rules="rules">
+ <el-form-item label="娴佺▼妯℃澘">
+ <el-input placeholder="娴佺▼妯℃澘" v-model="saveParam.modelName" disabled></el-input>
+ </el-form-item>
+ <el-form-item label="娴佺▼鍚嶇О" prop="processName">
+ <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.processName">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="娴佺▼鎻忚堪">
+ <el-input placeholder="娴佺▼鎻忚堪" type="textarea" :rows="4" v-model="saveParam.processDesc">
+ </el-input>
+ </el-form-item>
+ </el-form>
+ <el-divider></el-divider>
<div class="btns-icon">
- <el-button type="primary" icon="el-icon-star-off" @click="handleCollect"></el-button>
- <!-- <el-button type="primary" icon="el-icon-refresh" ></el-button> -->
+ <el-button icon="el-icon-star-off" circle @click="handleCollect"></el-button>
</div>
- <el-form :model="saveParam" class="demo-form-inline" label-position="left">
+ <el-form :model="collectParam" class="demo-form-inline" label-position="left" label-width="auto">
<el-form-item :label="item.taskName" v-for="(item, index) in initFrom" :key="index">
- <el-select style="width: 50%;" v-model="saveParam.flowTaskUsers[index]['userId']"
+ <el-select style="width: 80%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
:placeholder="item.taskName" @change="handleSelect($event, index)">
<el-option :label="key.userNames" :value="key.userId" v-for="(key, keyi) in typeName"
:key="keyi"></el-option>
@@ -40,57 +50,108 @@
// 鏍囬
title: {
typeof: String,
- default: '浜哄憳璁剧疆'
+ default: '娴佺▼瀹℃壒'
},
- // 妯℃澘id
- code: {
- typeof: String,
- default: ''
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
+ // flowTemplate锛�
+ // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
+ parameter: {
+ typeof: Object,
+ default: () => { }
},
- // 妯℃澘鐢ㄩ��
- type: {
- typeof: String,
- default: ''
+ parameterKeys: {
+ typeof: Object,
+ default: () => {
+ return {
+ ids: 'ids',
+ flowTemplate: 'flowTemplate',
+ code: 'code',
+ type: 'type'
+ }
+ }
}
+
},
watch: {
visible(n) {
this.dialogVisible = n;
+ if (n) {
+ this.apiInit()
+ this.apiDict()
+ }
},
dialogVisible(n) {
this.$emit('update:visible', n)
},
+ users:{
+ handler(val){
+ console.log('鐩戝惉users',val)
+ this.collectParam.flowTaskUsers = val
+ },
+ deep:true,
+ immediate:true
+ },
+ parameter:{
+ handler(newval,oldval){
+ console.log('瀛�',newval)
+ }
+ }
},
data() {
return {
dialogVisible: this.visible,
+ isCollent: false,
initFrom: [],
tags: [],
typeName: [],
- saveParam: {},
+ collectParam: {},
+ saveParam: this.setSaveParam(),
users: [],
-
+ rules: {
+ processName: [
+ { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+ { min: 1, max: 20, message: '闀垮害鍦� 3 鍒� 20 涓瓧绗�', trigger: 'blur' }
+ ]
+ }
}
},
+
mounted() {
- this.apiInit()
- this.apiDict()
+ console.log('---',this.parameter)
},
- methods: {
+ created() {
+ console.log('parameter',this.parameter)
+ },
+ methods: {
+ setSaveParam() {
+ return {
+ processName: this.parameter[this.parameterKeys.flowTemplate],
+ topName: this.title,
+ ids: this.parameter[this.parameterKeys.ids],
+ vars:this.parameter['vars']
+ }
+ },
+ userIndex(arr1) {
+ return this.initFrom.findIndex(i => i.taskId === arr1)
+ },
async apiInit() {
- const response = await personnelInit({ type: this.type, templateId: this.code })
+ const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code]})
if (response.status === 200) {
console.log(response)
this.initFrom = response.data.data.user
this.tags = response.data.data.collect
- const { modelKey, templateId } = response.data.data.flow
+ const { modelKey, templateId, modelName } = response.data.data.flow
let flowTaskUsers = response.data.data.user
- this.saveParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
- this.handleClickTag(this.tags[0])
+ this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
+ this.users = response.data.data.user
+ console.log(this.collectParam)
+ this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
+ if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
async apiDict() {
const response = await personnelDict()
+ console.log(response)
if (response.status === 200) {
console.log(response)
const data = response.data.data
@@ -108,15 +169,15 @@
cancelButtonText: '鍙栨秷',
}).then(async ({ value }) => {
console.log(this.users)
- this.saveParam.flowTaskUsers = this.users
- this.saveParam = { ...this.saveParam, name: value }
- console.log(this.saveParam)
- const response = await personnelCollect(this.saveParam)
+ this.collectParam.flowTaskUsers = this.users
+ this.collectParam = { ...this.collectParam, name: value }
+ console.log(this.collectParam)
+ const response = await personnelCollect(this.collectParam)
+ console.log(response)
if (response.status === 200) {
this.$nextTick(() => {
this.apiInit()
})
- console.log(response)
}
}).catch(() => {
@@ -127,6 +188,7 @@
if (response.status === 200) {
console.log(response)
this.apiInit()
+ this.isCollent = true
this.$message({
type: 'success',
message: response.data.msg
@@ -135,27 +197,61 @@
},
async apiSave() {
try {
- const { modelKey, templateId } = this.saveParam
- const response = await personnelSave({ modelKey, templateId })
- if (response.status === 200) {
- console.log(response)
+ const len = this.collectParam.flowTaskUsers.length
+ console.log(this.collectParam.flowTaskUsers)
+ console.log(len == 0)
+ console.log(len != this.initFrom.length)
+ if (len == 0 && len != this.initFrom.length) {
this.$message({
- type: 'success',
- message: response.data.msg
- });
- this.done()
+ type: "error",
+ message: "璇烽�夋嫨鑺傜偣锛�"
+ });
+ } else {
+ const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids} = this.saveParam
+ const vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,...vars}
+ const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
+ if (response.status === 200) {
+ console.log(response)
+ this.$message({
+ type: 'success',
+ message: response.data.msg
+ });
+ this.done()
+ }
}
+
} catch {
console.error('鎺ュ彛璋冪敤澶辫触')
}
},
handleClickTag(event) {
- console.log(event)
- const flowTaskUsers = event.flowTaskUsers
- this.saveParam.flowTaskUsers = flowTaskUsers.map(item => {
- const { taskId, taskName, userId, userName } = item
- return { taskId, taskName, userId, userName }
+ console.log(event.flowTaskUsers)
+
+ console.log(this.collectParam.flowTaskUsers)
+ let flowTaskUsers = this.collectParam.flowTaskUsers
+ this.collectParam.flowTaskUsers = flowTaskUsers.map((item, index) => {
+ for (let i = 0; i < event.flowTaskUsers.length; i++) {
+ if (item.taskId == event.flowTaskUsers[i].taskId) {
+ item['userName'] = event.flowTaskUsers[i]['userName']
+ item['userId'] = event.flowTaskUsers[i]['userId']
+ }
+ }
+ return item
})
+ this.users = this.collectParam.flowTaskUsers
+ // const flowTaskUsers = event.flowTaskUsers//collet.flowTaskUsers
+ // let tasks = this.collectParam.flowTaskUsers;//user
+ // for (let i = 0; i < tasks.length; i++) {
+ // let thisFlowTaskUsers = tasks[i];
+ // for (let j = 0; j < flowTaskUsers.length; j++) {
+ // let thisFflowTaskUsers = flowTaskUsers[j];
+ // if (thisFlowTaskUsers.taskId == thisFflowTaskUsers.taskId) {
+ // thisFlowTaskUsers['userName'] = thisFflowTaskUsers.userName;
+ // thisFlowTaskUsers['userId'] = thisFflowTaskUsers.userId;
+ // }
+ // }
+ // }
+ // this.collectParam.flowTaskUsers = {...this.collectParam.flowTaskUsers,userId,userName}
},
handleCloseTag(event) {
console.log(event)
@@ -164,9 +260,10 @@
handleSelect(event, index) {
const res = this.typeName.find(item => item.userId === event)
const { userName } = res
- let users = { ... this.saveParam.flowTaskUsers[index], userName }
- console.log(users)
- this.users[index] = users
+ console.log(this.users)
+ this.$set(this.users, index, { ... this.collectParam.flowTaskUsers[index], userName })
+ // this.users[index] = { ... this.collectParam.flowTaskUsers[index], userName }
+ console.log(this.users)
},
done() {
this.dialogVisible = false
@@ -175,7 +272,6 @@
this.done()
},
handleConfirm() {
- console.log(this.users)
console.log(this.saveParam)
this.apiSave()
}
@@ -207,4 +303,4 @@
justify-content: end;
padding-bottom: 10px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3