From 4e94f50e54271f1be793a9f417cf7e7cc4a13df5 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Thu, 07 May 2026 10:04:12 +0800
Subject: [PATCH] 增加年份查询
---
src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue b/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
index 0c23b62..3aa9fed 100644
--- a/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
+++ b/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
@@ -9,6 +9,8 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
+ <el-row>
+ <el-col :span="12">
<el-form-item v-if="state.isAdmin" label="单位:" prop="companyId">
<el-select v-model="state.form.companyId" placeholder="请选择" clearable @change="getDeptList" :disabled="state.title =='查看'">
<el-option
@@ -19,6 +21,17 @@
</el-option>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="state.title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="文件名称:" prop="fileName">
@@ -56,9 +69,9 @@
<el-select clearable v-model="state.form.modifierId" :disabled="state.title =='查看'" filterable placeholder="更改人" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -184,9 +197,9 @@
<el-select clearable v-model="state.form.applyId" :disabled="state.title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -209,9 +222,9 @@
<el-select clearable v-model="state.form.processId" :disabled="state.title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -234,9 +247,9 @@
<el-select clearable v-model="state.form.approvalId" :disabled="state.title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -339,6 +352,7 @@
getDocDistributeCollectDetail,
saveDocChangesInvalidate
} from "@/api/documentManage";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -349,6 +363,7 @@
form: {
id: null,
companyId: null,
+ year: '',
fileName: '',
number: '',
deptId: null,
@@ -380,6 +395,7 @@
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
fileName: [{ required: true, message: '请填写文件名称', trigger: 'blur' }],
number: [{ required: true, message: '请填写编号', trigger: 'blur' }],
deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
@@ -416,6 +432,7 @@
if(isAdmin){
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
await getUserList(companyId)
await getDepartList(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
@@ -461,10 +478,10 @@
const data = JSON.parse(JSON.stringify(state.form))
data.delEvaluateIds = state.oldList1.filter(i =>!data.documentChangesInvalidatedEvaluateList.some(item=>item.id == i.id)).map(i=>i.id)
data.delInvalidatedIssueIds = state.oldList2.filter(i =>!data.documentChangesInvalidatedIssueList.some(item=>item.id == i.id)).map(i=>i.id)
- data.modifierName = state.userList.find(i=>i.id == data.modifierId)?.name
- data.applyName = state.userList.find(i=>i.id == data.applyId)?.name
- data.processName = state.userList.find(i=>i.id == data.processId)?.name
- data.approvalName = state.userList.find(i=>i.id == data.approvalId)?.name
+ data.modifierName = state.userList.find(i=>i.userId == data.modifierId)?.name
+ data.applyName = state.userList.find(i=>i.userId == data.applyId)?.name
+ data.processName = state.userList.find(i=>i.userId == data.processId)?.name
+ data.approvalName = state.userList.find(i=>i.userId == data.approvalId)?.name
if(state.title == '新增'){
delete data.id
const res = await saveDocChangesInvalidate(data)
@@ -512,9 +529,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list:[]
+ state.userList = res.data ? res.data :[]
}else{
ElMessage.warning(res.message)
}
@@ -550,6 +567,7 @@
state.form = {
id: null,
companyId: null,
+ year: '',
fileName: [],
number: '',
deptId: null,
--
Gitblit v1.9.2