From 397f5b5d8f6f15270b158a91ba3b173d00051df5 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 27 六月 2025 17:00:41 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/industryTemplate/index.vue | 4
src/views/build/conpanyFunctionConsult/industryTemplate/components/editDialog.vue | 19 ++++++
src/views/build/conpanyFunctionConsult/infoPlatform/components/editDialog.vue | 21 ++++++
src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue | 4 -
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue | 5 +
src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue | 6 ++
src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/components/editorDialog.vue | 20 ++++++
src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/index.vue | 4
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue | 12 ++--
src/views/build/conpanyFunctionConsult/infoPlatform/index.vue | 4
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue | 27 ++++++++-
11 files changed, 101 insertions(+), 25 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/industryTemplate/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/industryTemplate/components/editDialog.vue
index 79b1e9c..332905b 100644
--- a/src/views/build/conpanyFunctionConsult/industryTemplate/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/industryTemplate/components/editDialog.vue
@@ -9,6 +9,16 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
+ <el-form-item v-if="state.isAdmin" label="企业：" prop="companyId">
+ <el-select v-model="state.form.companyId" placeholder="请选择" clearable>
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="模板名称:" prop="templateName">
<el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="模板名称"></el-input>
</el-form-item>
@@ -67,10 +77,13 @@
companyId: null
},
formRules:{
+ companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
templateName: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
industryType: [{ required: true, message: '请选择行业类型', trigger: 'blur' }],
filePath: [{ required: true, validator: checkFiles, trigger: 'blur' }]
},
+ isAdmin: false,
+ companyList: [],
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
header: {
Authorization: getToken()
@@ -82,7 +95,11 @@
});
-const openDialog = async (type, value,companyId) => {
+const openDialog = async (type, value,companyId, isAdmin, companyList) => {
+ state.isAdmin = isAdmin
+ if(isAdmin){
+ state.companyList = companyList
+ }
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
if(state.title == '编辑'||state.title == '查看'){
diff --git a/src/views/build/conpanyFunctionConsult/industryTemplate/index.vue b/src/views/build/conpanyFunctionConsult/industryTemplate/index.vue
index 19c1ef3..e0c9573 100644
--- a/src/views/build/conpanyFunctionConsult/industryTemplate/index.vue
+++ b/src/views/build/conpanyFunctionConsult/industryTemplate/index.vue
@@ -141,7 +141,7 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list?res.data.list:[]
- data.queryParams.companyId = data.companyList[0].id
+ // data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
@@ -156,7 +156,7 @@
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value, data.queryParams.companyId);
+ dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList);
}
/** 重置新增的表单以及其他数据 */
diff --git a/src/views/build/conpanyFunctionConsult/infoPlatform/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/infoPlatform/components/editDialog.vue
index 6c3bbc5..2201117 100644
--- a/src/views/build/conpanyFunctionConsult/infoPlatform/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/infoPlatform/components/editDialog.vue
@@ -9,6 +9,16 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
+ <el-form-item v-if="state.isAdmin" label="企业：" prop="companyId">
+ <el-select v-model="state.form.companyId" placeholder="请选择" clearable>
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="信息平台名称:" prop="platformName">
<el-input v-model.trim="state.form.platformName" :disabled="state.title =='查看'" placeholder="信息平台名称"></el-input>
</el-form-item>
@@ -51,15 +61,22 @@
companyId: null
},
formRules:{
+ companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
platformName: [{ required: true, message: '请输入信息平台名称', trigger: 'blur' }],
buildDate: [{ required: true, message: '请选择平台创建时间', trigger: 'blur' }]
- }
+ },
+ isAdmin: false,
+ companyList: []
})
onMounted(() => {
});
-const openDialog = async (type, value,companyId) => {
+const openDialog = async (type, value,companyId, isAdmin, companyList) => {
+ state.isAdmin = isAdmin
+ if(isAdmin){
+ state.companyList = companyList
+ }
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
if(state.title == '编辑'||state.title == '查看'){
diff --git a/src/views/build/conpanyFunctionConsult/infoPlatform/index.vue b/src/views/build/conpanyFunctionConsult/infoPlatform/index.vue
index 385baca..eb6e3bc 100644
--- a/src/views/build/conpanyFunctionConsult/infoPlatform/index.vue
+++ b/src/views/build/conpanyFunctionConsult/infoPlatform/index.vue
@@ -119,14 +119,14 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list?res.data.list:[]
- data.queryParams.companyId = data.companyList[0].id
+ // data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value, data.queryParams.companyId);
+ dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList );
}
/** 重置新增的表单以及其他数据 */
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
index aa2adec..b83be69 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
@@ -8,7 +8,17 @@
:close-on-press-escape="false"
:close-on-click-modal="false"
>
- <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
+ <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px">
+ <el-form-item v-if="state.isAdmin" label="企业：" prop="companyId">
+ <el-select v-model="state.form.companyId" placeholder="请选择" clearable @change="getDeptList()">
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="部门名称:" prop="deptName">
<el-input v-model.trim="state.form.deptName" :disabled="state.title =='查看'" placeholder="部门名称"></el-input>
</el-form-item>
@@ -17,7 +27,7 @@
<el-option
v-for="item in state.userList"
:key="item.id"
- :label="item.name"
+ :label="item.username"
:value="item.id"
/>
</el-select>
@@ -89,11 +99,14 @@
delCaluseIds: [],
companyId: null
},
+ isAdmin: false,
+ companyList: [],
userList: [],
departList: [],
sysClauseList: [],
oldClauseList: [],
formRules:{
+ companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
deptName: [{ required: true, message: '请输入部门名称', trigger: 'blur' }],
leaderUserId: [{ required: true, message: '请选择负责人', trigger: 'blur' }],
parentId: [{ required: true, message: '请选择负责部门', trigger: 'blur' }],
@@ -106,7 +119,11 @@
});
const disabled = ref(false);
const userInfo = ref()
-const openDialog = async (type, value, companyId) => {
+const openDialog = async (type, value, companyId, isAdmin, companyList) => {
+ state.isAdmin = isAdmin
+ if(isAdmin){
+ state.companyList = companyList
+ }
await getUserList()
await getDepartList(companyId)
await getSysClauseList()
@@ -134,6 +151,10 @@
}
};
+const getDeptList = async ()=>{
+ await getDepartList(state.form.companyId)
+}
+
const getDepartList = async (companyId)=> {
const params = {
pageNum: 1,
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
index 955110e..83ec96e 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
@@ -154,14 +154,13 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list?res.data.list:[]
- data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value, data.queryParams.companyId);
+ dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList );
}
const openDutyDialog = (value) =>{
dutyDialogRef.value.openDialog(value);
@@ -200,7 +199,6 @@
const download = async (val) => {
const templatePath = '/dutyFile.docx'
const data = await getDeptDetail(val.deptId)
- console.log(data)
try {
generateWordDocument(templatePath, data, `${data.deptName}职责表.docx`);
} catch (error){
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 903fff4..d472afb 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -148,6 +148,11 @@
}
const confirmEdit = async ()=>{
+ if(data.form.list.length == 0){
+ data.isEdit = !data.isEdit
+ await getList()
+ return
+ }
loading.value = true
const res = await saveDistribution(data.form)
if(res.code == 200){
@@ -156,6 +161,7 @@
ElMessage.warning(res.message)
}
loading.value = false
+ await getList()
data.isEdit = !data.isEdit
}
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/components/editorDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/components/editorDialog.vue
index 050d4bc..38d6d2b 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/components/editorDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/components/editorDialog.vue
@@ -9,6 +9,16 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
+ <el-form-item v-if="state.isAdmin" label="企业：" prop="companyId">
+ <el-select v-model="state.form.companyId" placeholder="请选择" clearable>
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="员工情况介绍:" prop="companyRoster">
<editor v-model="state.form.companyRoster" :min-height="300"/>
</el-form-item>
@@ -40,9 +50,11 @@
companyId: null,
companyRoster: '',
},
+ companyList: [],
isView: false,
formRules:{
- companyRoster: [{ required: true, message: '员工情况介绍', trigger: 'blur' }],
+ companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ companyRoster: [{ required: true, message: '员工情况介绍', trigger: 'blur' }]
},
isAdmin: false,
})
@@ -53,7 +65,11 @@
const disabled = ref(false);
const userInfo = ref()
-const openDialog = async (type, value, companyId) => {
+const openDialog = async (type, value, companyId, isAdmin, companyList) => {
+ state.isAdmin = isAdmin
+ if(isAdmin){
+ state.companyList = companyList
+ }
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
if(type == 'view'){
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/index.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/index.vue
index 3225da3..eb19814 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/index.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffPortfolio/index.vue
@@ -114,14 +114,14 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list?res.data.list:[]
- data.queryParams.companyId = data.companyList[0].id
+ // data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value,data.queryParams.companyId);
+ dialogRef.value.openDialog(type, value,data.queryParams.companyId, data.isAdmin, data.companyList);
}
/** 重置新增的表单以及其他数据 */
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index fdef075..e06122a 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -12,8 +12,8 @@
<el-form-item label="用户名:" prop="username" v-if="state.title !== '修改密码'">
<el-input v-model.trim="state.form.username" :disabled="state.title =='编辑' || state.title =='查看'" placeholder="请输入用户名" ></el-input>
</el-form-item>
- <el-form-item label="名称:" prop="name" v-if="state.title !== '修改密码'">
- <el-input v-model.trim="state.form.name" :disabled="disabled" placeholder="请输入公司、部门或者车间岗位名"></el-input>
+ <el-form-item label="姓名:" prop="name" v-if="state.title !== '修改密码'">
+ <el-input v-model.trim="state.form.name" :disabled="disabled" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="性别:" prop="sex" v-if="state.title !== '修改密码'">
<el-radio-group v-model="state.form.sex" :disabled="disabled">
@@ -259,18 +259,18 @@
post: ''
},
formRules:{
- name: [{ required: true, message: '请输入公司、部门或者车间岗位名称', trigger: 'blur' }],
+ name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
companyName: [{ required: true, message: '请选择所在企业', trigger: 'blur' }],
deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
username: [{ required: true, trigger: "blur", validator: validateUsername }],
password: [{ required: true, validator: validatePwd, trigger: 'blur' }],
confirmPassword: [{ required: true, validator: equalToPassword, trigger: 'blur' }],
- phone: [{ required: true, validator: validateUserPhone, trigger: 'blur' }],
+ // phone: [{ required: true, validator: validateUserPhone, trigger: 'blur' }],
userType: [{ required: true, message: '请选择用户类型', trigger: 'blur' }],
- idCard: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
+ // idCard: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
entryTime: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
duty: [{ required: true, message: '请输入职务', trigger: 'blur' }],
- post: [{ required: true, message: '请输入专业', trigger: 'blur' }],
+ // post: [{ required: true, message: '请输入专业', trigger: 'blur' }]
},
companyList: [],
userList: [
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
index 0404d39..cc7c38c 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
@@ -62,7 +62,8 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column label="序号" type="index" align="center" width="80" />
- <el-table-column label="姓名" prop="username" align="center" />
+ <el-table-column label="用户名" prop="username" align="center" />
+ <el-table-column label="姓名" prop="name" align="center" />
<el-table-column label="身份证号" prop="idCard" align="center" />
<el-table-column label="入职时间" prop="entryTime" align="center"/>
<el-table-column label="部门" prop="deptName" align="center"/>
@@ -198,7 +199,7 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list?res.data.list:[]
- data.queryParams.companyId = data.companyList[0].id
+ // data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
--
Gitblit v1.9.2