From 89ca288fbb88ca7083030e2f332ec7a9731d8cd6 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Mon, 24 Mar 2025 10:37:57 +0800
Subject: [PATCH] bug修改
---
.env.development | 2
src/views/signProject/components/circulation.vue | 76 ++++++++++++++++++++++++++-----------
src/views/signProject/components/record.vue | 3 +
3 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/.env.development b/.env.development
index 3248597..c832a54 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@
# 纳米所安全责任书签署/开发环境
#小董
-VITE_APP_BASE_API = 'http://192.168.2.30:8085/signature'
+VITE_APP_BASE_API = 'http://192.168.2.10:8085/signature'
#线上
#VITE_APP_BASE_API = 'http://8.137.115.153:85/api'
diff --git a/src/views/signProject/components/circulation.vue b/src/views/signProject/components/circulation.vue
index 887a7c2..fe2a562 100644
--- a/src/views/signProject/components/circulation.vue
+++ b/src/views/signProject/components/circulation.vue
@@ -9,32 +9,37 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="busRef" :rules="state.formRules" label-width="150px" >
- <el-form-item label="部门:" prop="signDeptId" >
+ <el-form-item label="部门:" prop="deptIds" >
<el-cascader
style="width: 100%"
clearable
- v-model="state.form.signDeptId"
+ placeholder="请选择部门"
+ v-model="state.deptIds"
:options="state.options"
@change="selectValue"
- :props="{ expandTrigger: 'hover', value: 'deptId',label: 'deptName',emitPath: false}"></el-cascader>
+ :props="{ multiple:true, expandTrigger: 'hover', value: 'deptId',label: 'deptName',emitPath: false}">
+ </el-cascader>
</el-form-item>
- <el-form-item label="签署人:" prop="signUserId" >
+ <el-form-item label="签署人:" prop="initiaiUsers" >
<el-select
clearable
- v-model="state.form.signUserId"
+ v-model="state.initiaiUsers"
filterable
remote
+ multiple
reserve-keyword
placeholder="请输入签署人名称"
remote-show-suffix
- :remote-method="(val)=>getUserList(val,state.form.signDeptId)"
- style="width: 100%"
+ @change="changeUser"
+ :remote-method="(val)=>getUserList(val,state.deptIds)"
+ style=" width:100%"
+ value-key="userId"
>
<el-option
v-for="item in state.userList"
:key="item.userId"
:label="item.nickName"
- :value="item.userId"
+ :value="item"
/>
</el-select>
</el-form-item>
@@ -55,6 +60,7 @@
import {listUser} from "@/api/system/user";
import {signFlow} from "@/api/signAgreement/signProject";
import {getInfo} from "@/api/login";
+import {userListByDept} from "@/api/signAgreement/template";
const { proxy } = getCurrentInstance();
const dialogVisible = ref(false);
@@ -66,16 +72,18 @@
const state = reactive({
form: {
itemId: null,
- signUserId: null,
- signDeptId: null
+ initiaiUserId:null,
+ userDept: []
},
user: {},
options: [],
userList: [],
- formRules:{
- signDeptId: [{ required: true, trigger: "blur", message:'请选择部门' }],
- signUserId: [{ required: true, trigger: "blur", message:'请选择签署人' }],
- },
+ // formRules:{
+ // deptIds: [{ required: true, trigger: "blur", message:'请选择部门' }],
+ // initiaiUsers: [{ required: true, trigger: "blur", message:'请选择签署人' }],
+ // },
+ deptIds: [],
+ initiaiUsers: []
})
@@ -87,11 +95,17 @@
}
const selectValue = (val) => {
state.userList = []
- state.form.signUserId = []
+ state.form.initiaiUserId = null
+ state.initiaiUsers = []
+ state.form.userDept = []
getUserList("",val)
}
-
+const changeUser = (val) =>{
+ const userIds = val.map(item => item.userId)
+ state.form.initiaiUserId = userIds.join(',')
+ state.form.userDept = val.map(i => i.userId + '_' + i.deptId)
+}
const getDept = () => {
listDept().then(response => {
state.options = proxy.handleTree(response.data, "deptId",'parentId','children');
@@ -116,6 +130,10 @@
data.userName = state.user.userName
data.deptId = state.user.deptId
data.deptName = state.user.dept.deptName
+ if(data.initiaiUserId == null) {
+ ElMessage.warning('请选择签署人')
+ return;
+ }
const res = await signFlow(data)
if(res.code === 200){
ElMessage({
@@ -141,12 +159,14 @@
const reset = () => {
state.form = {
itemId: null,
- signUserId: null,
- signDeptId: null
+ initiaiUserId:null,
+ userDept: []
}
+ state.deptIds = []
+ state.initiaiUsers = []
}
const getUserList = async (val,deptId)=>{
- if(deptId == '' || deptId == null){
+ if(deptId.length ==0 || deptId == null){
// ElMessage.warning("请选择部门！")
return;
}
@@ -155,9 +175,14 @@
deptId: deptId,
nickName: val,
}
- const res = await listUser(queryParams)
+ const res = await userListByDept(queryParams)
if (res.code == 200) {
- state.userList = res.rows
+ state.userList = res.rows.map(item => {
+ return {
+ ...item,
+ nickName: item.nickName + ' ( ' + item.dept.deptName + ' ) '
+ }
+ })
} else {
ElMessage.warning(res.message)
}
@@ -167,9 +192,14 @@
pageSize: 10,
deptId: deptId
}
- const res = await listUser(queryParams)
+ const res = await userListByDept(queryParams)
if (res.code == 200) {
- state.userList = res.rows
+ state.userList = res.rows.map(item => {
+ return {
+ ...item,
+ nickName: item.nickName + ' ( ' + item.dept.deptName + ' ) '
+ }
+ })
} else {
ElMessage.warning(res.message)
}
diff --git a/src/views/signProject/components/record.vue b/src/views/signProject/components/record.vue
index dd5b927..4c016ad 100644
--- a/src/views/signProject/components/record.vue
+++ b/src/views/signProject/components/record.vue
@@ -15,7 +15,7 @@
<el-timeline-item style="font-size: 16px" :color="state.firstPeopleState == 1 ? '#0bbd87' : '#B4B4B4' " size="large">
<div style="display: flex">
最初签署人：
- <div style="display: flex;flex-direction: column">
+ <div style="display: flex;flex-direction: column;line-height: 25px">
<div v-for="item in firstArr">
{{item.firstPeopleContent}}
<span v-if="item.firstPeopleState == 1" style="color: #1ab394;font-size: 14px;">[已签]</span>
@@ -110,6 +110,7 @@
name: '',
remark: '',
}
+ firstArr.value = []
}
defineExpose({
--
Gitblit v1.9.2