提交
This commit is contained in:
123
parent
57d48a518c
commit
b22013c978
@ -19,6 +19,11 @@ export interface MaterialSealVO {
|
||||
*/
|
||||
sealAdminId: string | number;
|
||||
|
||||
/**
|
||||
* 印章管理员姓名
|
||||
*/
|
||||
sealAdminName: string | number;
|
||||
|
||||
/**
|
||||
* 启用状态
|
||||
*/
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
import { RoleVO } from '@/api/system/role/types';
|
||||
import { PostVO } from '@/api/system/post/types';
|
||||
import { string } from 'vue-types';
|
||||
|
||||
/**
|
||||
* 用户信息
|
||||
@ -48,6 +49,7 @@ export interface UserVO extends BaseEntity {
|
||||
postIds: any;
|
||||
roleId: any;
|
||||
admin: boolean;
|
||||
employeeName: string;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<el-form-item label="抄送" v-if="task.flowStatus === 'waiting' && buttonObj.copy">
|
||||
<el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
|
||||
<el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
|
||||
{{ user.nickName }}
|
||||
{{ user.employeeName }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="buttonObj.pop && nestNodeList && nestNodeList.length > 0" label="下一步审批人" prop="assigneeMap">
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
<el-card shadow="hover">
|
||||
<template v-if="prop.multiple" #header>
|
||||
<el-tag v-for="user in selectUserList" :key="user.userId" closable style="margin: 2px" @close="handleCloseTag(user)">
|
||||
{{ user.nickName }}
|
||||
{{ user.employeeName }}
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
<vxe-column type="checkbox" width="50" align="center" />
|
||||
<vxe-column key="userId" title="用户编号" align="center" field="userId" />
|
||||
<vxe-column key="userName" title="用户账号" align="center" field="userName" />
|
||||
<vxe-column key="nickName" title="用户姓名" align="center" field="nickName" />
|
||||
<vxe-column key="employeeName" title="用户姓名" align="center" field="employeeName" />
|
||||
<vxe-column key="deptName" title="部门" align="center" field="deptName" />
|
||||
<vxe-column key="phonenumber" title="手机号码" align="center" field="phonenumber" width="120" />
|
||||
<vxe-column key="status" title="状态" align="center">
|
||||
|
||||
@ -1,18 +1,20 @@
|
||||
<template>
|
||||
<div class="p-2">
|
||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
|
||||
:leave-active-class="proxy?.animate.searchAnimate.leave">
|
||||
<div v-show="showSearch" class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
||||
<el-form-item label="公章名称" prop="sealName">
|
||||
<el-input v-model="queryParams.sealName" placeholder="请输入公章名称" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="公章管理员" prop="sealAdminId">
|
||||
<!-- <el-form-item label="公章管理员" prop="sealAdminId">
|
||||
<el-input v-model="queryParams.sealAdminId" placeholder="请输入公章管理员" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="公章状态" prop="status">
|
||||
<el-select v-model="queryParams.sealStatus" placeholder="公章状态" clearable>
|
||||
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@ -28,16 +30,20 @@
|
||||
<template #header>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['operate:materialSeal:add']">新增</el-button>
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['operate:materialSeal:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['operate:materialSeal:edit']">修改</el-button>
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
|
||||
v-hasPermi="['operate:materialSeal:edit']">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['operate:materialSeal:remove']">删除</el-button>
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
|
||||
v-hasPermi="['operate:materialSeal:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['operate:materialSeal:export']">导出</el-button>
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
||||
v-hasPermi="['operate:materialSeal:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
@ -54,22 +60,26 @@
|
||||
<el-table-column label="公章管理员" align="center" prop="sealAdminName" />
|
||||
<el-table-column label="状态" align="center" width="100">
|
||||
<template #default="scope">
|
||||
<el-switch v-model="scope.row.sealStatus" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
|
||||
<el-switch v-model="scope.row.sealStatus" active-value="0" inactive-value="1"
|
||||
@change="handleStatusChange(scope.row)"></el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="修改" placement="top">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['operate:materialSeal:edit']"></el-button>
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['operate:materialSeal:edit']"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="删除" placement="top">
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['operate:materialSeal:remove']"></el-button>
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['operate:materialSeal:remove']"></el-button>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
</el-card>
|
||||
<!-- 添加或修改公章管理对话框 -->
|
||||
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
||||
@ -78,9 +88,10 @@
|
||||
<el-input v-model="form.sealName" placeholder="请输入公章名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="公章管理员" prop="sealAdminId">
|
||||
<el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
|
||||
<el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
|
||||
{{ user.nickName }}
|
||||
<el-button type="primary" icon="Plus" circle @click="openUserSelect" />
|
||||
<el-tag v-for="user in selectUserList" :key="user.userId" closable style="margin: 2px"
|
||||
@close="handleCloseTag(user)">
|
||||
{{ user.employeeName }}
|
||||
</el-tag>
|
||||
</el-form-item>
|
||||
<el-form-item label="公章类型" prop="sealType">
|
||||
@ -99,15 +110,19 @@
|
||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
<UserSelect ref="userSelectRef" :multiple="false" :data="selectUserIds" @confirm-call-back="userSelectCallBack">
|
||||
</UserSelect>
|
||||
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup name="MaterialSeal" lang="ts">
|
||||
import { listMaterialSeal, getMaterialSeal, delMaterialSeal, addMaterialSeal, updateMaterialSeal , changeSealStatus } from '@/api/operate/materialSeal';
|
||||
import { listMaterialSeal, getMaterialSeal, delMaterialSeal, addMaterialSeal, updateMaterialSeal, changeSealStatus } from '@/api/operate/materialSeal';
|
||||
import { MaterialSealVO, MaterialSealQuery, MaterialSealForm } from '@/api/operate/materialSeal/types';
|
||||
import UserSelect from '@/components/UserSelect';
|
||||
import UserSelect from '@/components/UserSelect/index.vue';
|
||||
import { UserVO } from '@/api/system/user/types';
|
||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||
|
||||
@ -120,11 +135,11 @@ const single = ref(true);
|
||||
const multiple = ref(true);
|
||||
const total = ref(0);
|
||||
|
||||
//抄送人
|
||||
const selectCopyUserList = ref<UserVO[]>([]);
|
||||
//抄送人id
|
||||
const selectCopyUserIds = ref<string>(undefined);
|
||||
const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
|
||||
//user
|
||||
const selectUserList = ref<UserVO[]>([]);
|
||||
//userid
|
||||
const selectUserIds = ref<string>(undefined);
|
||||
const userSelectRef = ref<InstanceType<typeof UserSelect>>();
|
||||
|
||||
const queryFormRef = ref<ElFormInstance>();
|
||||
const materialSealFormRef = ref<ElFormInstance>();
|
||||
@ -155,8 +170,14 @@ const data = reactive<PageData<MaterialSealForm, MaterialSealQuery>>({
|
||||
params: {}
|
||||
},
|
||||
rules: {
|
||||
id: [
|
||||
{ required: true, message: "创建人不能为空", trigger: "blur" }
|
||||
sealName: [
|
||||
{ required: true, message: "公章名称不能为空", trigger: "blur" }
|
||||
],
|
||||
sealType: [
|
||||
{ required: true, message: "公章类型不能为空", trigger: "blur" }
|
||||
],
|
||||
sealAdminId: [
|
||||
{ required: true, message: "公章管理员不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
});
|
||||
@ -218,6 +239,32 @@ const handleUpdate = async (row?: MaterialSealVO) => {
|
||||
Object.assign(form.value, res.data);
|
||||
dialog.visible = true;
|
||||
dialog.title = '修改公章管理';
|
||||
const newUser: UserVO = {
|
||||
userId: form.value.sealAdminId,
|
||||
employeeName: row?.sealAdminName,
|
||||
tenantId: undefined,
|
||||
deptId: undefined,
|
||||
userName: undefined,
|
||||
nickName: undefined,
|
||||
userType: undefined,
|
||||
email: undefined,
|
||||
phonenumber: undefined,
|
||||
sex: undefined,
|
||||
avatar: undefined,
|
||||
status: undefined,
|
||||
delFlag: undefined,
|
||||
loginIp: undefined,
|
||||
loginDate: undefined,
|
||||
remark: undefined,
|
||||
deptName: undefined,
|
||||
roles: undefined,
|
||||
roleIds: undefined,
|
||||
postIds: undefined,
|
||||
roleId: undefined,
|
||||
admin: undefined
|
||||
};
|
||||
selectUserList.value[0] = newUser;
|
||||
console.log(selectUserList)
|
||||
};
|
||||
|
||||
/** 提交按钮 */
|
||||
@ -265,24 +312,28 @@ const handleExport = () => {
|
||||
}, `materialSeal_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
//打开抄送人员
|
||||
const openUserSelectCopy = () => {
|
||||
userSelectCopyRef.value.open();
|
||||
//打开人员
|
||||
const openUserSelect = () => {
|
||||
userSelectRef.value.open();
|
||||
};
|
||||
//确认抄送人员
|
||||
const userSelectCopyCallBack = (data: UserVO[]) => {
|
||||
//确认人员
|
||||
const userSelectCallBack = (data: UserVO[]) => {
|
||||
if (data && data.length > 0) {
|
||||
selectCopyUserList.value = data;
|
||||
selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
|
||||
selectUserList.value = data;
|
||||
selectUserIds.value = selectUserList.value.map((item) => item.userId).join(',');
|
||||
|
||||
console.log(data)
|
||||
console.log(selectUserIds.value)
|
||||
form.value.sealAdminId = selectUserIds.value;
|
||||
}
|
||||
};
|
||||
//删除抄送人员
|
||||
const handleCopyCloseTag = (user: UserVO) => {
|
||||
//删除人员
|
||||
const handleCloseTag = (user: UserVO) => {
|
||||
const userId = user.userId;
|
||||
// 使用split删除用户
|
||||
const index = selectCopyUserList.value.findIndex((item) => item.userId === userId);
|
||||
selectCopyUserList.value.splice(index, 1);
|
||||
selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
|
||||
const index = selectUserList.value.findIndex((item) => item.userId === userId);
|
||||
selectUserList.value.splice(index, 1);
|
||||
selectUserIds.value = selectUserList.value.map((item) => item.userId).join(',');
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user