From 9c622c05702484fa4942647099cdbdbb3bec50bc Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 19 六月 2023 10:19:56 +0800
Subject: [PATCH] 解决proxy冲突
---
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 187 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 159 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index beb1801..07ebde0 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -1,15 +1,33 @@
<template>
<el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" width="30%">
- <el-tag v-for="tag in tags" :key="tag" closable effect="dark" @click="handleClickTag(tag)"
- @close="handleCloseTag(tag)">
- <span> {{ tag }}</span>
+ <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>
- <el-form :model="formInline" class="demo-form-inline" label-position="left">
- <el-form-item :label="item.taskName" v-for="(item,index) in initFrom" :key="index">
- <el-select v-model="formInline[index].userId" :placeholder="item.taskName">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+ <div class="btns-icon">
+ <el-button icon="el-icon-star-off" circle @click="handleCollect"></el-button>
+ </div>
+ <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: 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>
</el-select>
</el-form-item>
</el-form>
@@ -20,7 +38,7 @@
</el-dialog>
</template>
<script>
-import { personnelInit, personnelCollect, cancelCollect, personnelSave } from '@/api/template/setPersonnel.js'
+import { personnelInit, personnelCollect, cancelCollect, personnelSave, personnelDict } from '@/api/template/setPersonnel.js'
export default {
name: 'SetPersonnel',
props: {
@@ -29,14 +47,28 @@
typeof: Boolean,
default: false
},
+ // 鏍囬
title: {
typeof: String,
- default: '浜哄憳璁剧疆'
+ default: '娴佺▼瀹℃壒'
},
- code:{
- typeof: String,
- default: ''
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�
+ parameter: {
+ typeof: Object,
+ default: () => { }
+ },
+ parameterKeys: {
+ typeof: Object,
+ default: () => {
+ return {
+ ids: 'ids',
+ flowTemplate: 'flowTemplate',
+ code: 'code',
+ type: 'type'
+ }
+ }
}
+
},
watch: {
visible(n) {
@@ -49,48 +81,140 @@
data() {
return {
dialogVisible: this.visible,
+ isCollent: false,
initFrom: [],
- tags: ['鏍囩1', '鏍囩2', '鏍囩3', '鏍囩4'],
- formInline: []
-
+ tags: [],
+ typeName: [],
+ collectParam: {},
+ saveParam: this.saveParam(),
+ users: [],
+ rules: {
+ processName: [
+ { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+ { min: 1, max: 20, message: '闀垮害鍦� 3 鍒� 20 涓瓧绗�', trigger: 'blur' }
+ ]
+ }
}
},
+
mounted() {
this.apiInit()
+ this.apiDict()
},
methods: {
+ saveParam() {
+ return {
+ processName: this.parameter[this.parameterKeys.flowTemplate],
+ topName: this.title,
+ ids: this.parameter[this.parameterKeys.ids],
+ }
+ },
+ userIndex(arr1) {
+ return this.initFrom.findIndex(i => i.taskId === arr1)
+ },
async apiInit() {
- const response = await personnelInit({type:'PUBLIC',templateId:'8b5e2017-990f-454a-9c39-4c4eeeb57553'})
+ 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.formInline = response.data.data.user
+ this.tags = response.data.data.collect
+ const { modelKey, templateId, modelName } = response.data.data.flow
+ let flowTaskUsers = response.data.data.user
+ this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
+ console.log(this.collectParam)
+ this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
+ this.handleClickTag(this.tags[0])
}
},
- async apiCollect() {
- const response = await personnelCollect()
+ async apiDict() {
+ const response = await personnelDict()
+ console.log(response)
if (response.status === 200) {
console.log(response)
+ const data = response.data.data
+ this.typeName = data.map(item => {
+ const { account, deptName, id, realName } = item
+ let userNames = `${deptName} - ${realName} - ${account}`
+ return { userId: id, userName: realName, userNames: userNames }
+ })
}
},
- async canCollect(id) {
- const response = await cancelCollect()
+
+ handleCollect() {
+ this.$prompt('璇疯緭鍏ヤ竴涓悕瀛�', '鎿嶄綔', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ }).then(async ({ value }) => {
+ console.log(this.users)
+ 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(() => {
+
+ });
+ },
+ 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
+ });
}
},
async apiSave() {
- const response = await personnelSave()
- if (response.status === 200) {
- console.log(response)
+ try {
+ const response = await personnelSave(this.saveParam)
+ 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//collet.flowTaskUsers
+ let tasks = this.collectParam.flowTaskUsers;//user
+ for(let i=0;i<tasks.length;i++){
+ let thisFlowTaskUsers = tasks[i];
+ console.log('thisFlowTaskUsers',thisFlowTaskUsers)
+ 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;
+ }
+ }
+ }
+ console.log(this.collectParam)
},
handleCloseTag(event) {
console.log(event)
- this.canCollect(event)
+ this.canCollect(event.name)
+ },
+ handleSelect(event, index) {
+ const res = this.typeName.find(item => item.userId === event)
+ const { userName } = res
+ let users = { ... this.collectParam.flowTaskUsers[index], userName }
+ console.log(users)
+ this.users[index] = users
},
done() {
this.dialogVisible = false
@@ -99,8 +223,8 @@
this.done()
},
handleConfirm() {
- // this.done()
- console.log(this.formInline)
+ console.log(this.saveParam)
+ this.apiSave()
}
}
}
@@ -108,6 +232,7 @@
<style lang="scss">
.el-tag+.el-tag {
margin-left: 10px;
+ margin-top: 10px;
}
.button-new-tag {
@@ -123,4 +248,10 @@
margin-left: 10px;
vertical-align: bottom;
}
+
+.btns-icon {
+ display: flex;
+ justify-content: end;
+ padding-bottom: 10px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3