From f6b61a485501f326debe52d77ea65d87fb34b37f Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 17:57:09 +0800
Subject: [PATCH] 完善集成日志查询
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 220 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 147 insertions(+), 73 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 279b8d1..64ec3ec 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" class="avue-dialog avue-dialog--top" top="-3%" 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: 100%;" 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>
@@ -29,70 +39,110 @@
</template>
<script>
import { personnelInit, personnelCollect, cancelCollect, personnelSave, personnelDict } from '@/api/template/setPersonnel.js'
+import { dateFormat } from "@/util/date";
export default {
name: 'SetPersonnel',
props: {
- // 鏄惁鎵撳紑
- visible: {
- typeof: Boolean,
- default: false
- },
- // 鏍囬
- title: {
- typeof: String,
- default: '浜哄憳璁剧疆'
- },
- // 妯℃澘id
- code: {
- typeof: String,
- default: ''
- },
- // 妯℃澘鐢ㄩ��
- type: {
- typeof: String,
- default: ''
+ // 鏄惁鎵撳紑
+ visible: {
+ typeof: Boolean,
+ default: false
+ },
+ // 鏍囬
+ title: {
+ typeof: String,
+ default: '娴佺▼瀹℃壒'
+ },
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
+ // flowTemplate锛�
+ // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
+ parameter: {
+ typeof: Object,
+ default: () => {
}
+ },
+ parameterKeys: {
+ typeof: Object,
+ default: () => {
+ return {
+ ids: 'ids',
+ processName: 'processName',
+ code: 'code',
+ type: 'type',
+ btmtype: 'btmtype'
+ }
+ }
+ }
},
watch: {
- visible(n) {
- this.dialogVisible = n;
+ visible(n) {
+ this.dialogVisible = n;
+ if (n) {
+ this.apiInit()
+ this.apiDict()
+ }
+ },
+ dialogVisible(n) {
+ this.$emit('update:visible', n)
+ },
+ users: {
+ handler(val) {
+ this.collectParam.flowTaskUsers = val
},
- dialogVisible(n) {
- this.$emit('update:visible', n)
+ deep: true,
+ immediate: true
+ },
+ parameter: {
+ handler(newval, oldval) {
+ this.saveParam = Object.assign({processName:'',processDesc: ''},newval) ;
},
+ deep: true,
+ immediate: true
+ }
},
data() {
return {
dialogVisible: this.visible,
+ isCollent: false,
initFrom: [],
tags: [],
typeName: [],
+ collectParam: {},
saveParam: {},
users: [],
-
+ rules: {
+ processName: [
+ { required: true, message: '娴佺▼鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+ { min: 3, max: 50, message: '闀垮害鍦� 3 鍒� 50 涓瓧绗�', trigger: 'blur' }
+ ]
+ }
}
},
+
mounted() {
- this.apiInit()
- this.apiDict()
},
- methods: {
+ created() {
+ },
+ methods: {
+ 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
+ this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
+ if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
async apiDict() {
const response = await personnelDict()
if (response.status === 200) {
- console.log(response)
const data = response.data.data
this.typeName = data.map(item => {
const { account, deptName, id, realName } = item
@@ -107,16 +157,13 @@
confirmButtonText: '纭畾',
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 }
+ const response = await personnelCollect(this.collectParam)
if (response.status === 200) {
this.$nextTick(() => {
this.apiInit()
})
- console.log(response)
}
}).catch(() => {
@@ -125,8 +172,8 @@
async canCollect(name) {
const response = await cancelCollect({ name: name })
if (response.status === 200) {
- console.log(response)
this.apiInit()
+ this.isCollent = true
this.$message({
type: 'success',
message: response.data.msg
@@ -135,38 +182,66 @@
},
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
+ 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,btmtype} = this.saveParam
+ let vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,btmtype,...vars}
+ vals.oids=ids;
+ vals.createTime=dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss")
+ const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
+ if (response.status === 200) {
+ this.$message({
+ type: 'success',
+ message: response.data.msg
+ });
+ this.$emit('onLoad')
+ this.done()
+ }
}
+
} catch {
- console.error('鎺ュ彛璋冪敤澶辫触')
+ this.$message.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 }
+ 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)
this.canCollect(event.name)
},
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
+ this.$set(this.users, index, { ... this.collectParam.flowTaskUsers[index], userName })
+ // this.users[index] = { ... this.collectParam.flowTaskUsers[index], userName }
},
done() {
this.dialogVisible = false
@@ -175,8 +250,6 @@
this.done()
},
handleConfirm() {
- console.log(this.users)
- console.log(this.saveParam)
this.apiSave()
}
}
@@ -207,4 +280,5 @@
justify-content: end;
padding-bottom: 10px;
}
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.9.3