From 7d8c89bce98c55ec01c4203bfbfdbdbe11a838eb Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期二, 16 九月 2025 09:36:37 +0800
Subject: [PATCH] 修改新增
---
public/docBorrowCopy.docx | 0
src/views/work/documentManage/docBorrowCopy/index.vue | 11 +-
src/views/work/documentManage/docBorrowCopy/components/editDialog.vue | 233 ++++++++++++++--------------------------------
src/views/work/empResource/deptEmpAnalysis/index.vue | 2
4 files changed, 79 insertions(+), 167 deletions(-)
diff --git a/public/docBorrowCopy.docx b/public/docBorrowCopy.docx
new file mode 100644
index 0000000..4dd708c
--- /dev/null
+++ b/public/docBorrowCopy.docx
Binary files differ
diff --git a/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue b/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
index 04c9540..0ed4c7a 100644
--- a/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
+++ b/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
@@ -35,6 +35,17 @@
<el-table :data="state.form.documentBorrowCopyRecordList" class="customedTable" :border="true">
<el-table-column label="序号" type="index" width="80" align="center">
</el-table-column>
+ <el-table-column label="时间" prop="borrowDate" align="center">
+ <template #default="scope">
+ <el-date-picker
+ v-model="scope.row.borrowDate"
+ type="date"
+ value-format="YYYY-MM-DD"
+ placeholder="请选择日期"
+ :disabled="state.title =='查看'"
+ />
+ </template>
+ </el-table-column>
<el-table-column label="文件名称" prop="fileName" align="center">
<template #default="scope">
<el-input
@@ -48,7 +59,7 @@
</el-input>
</template>
</el-table-column>
- <el-table-column label="编号" prop="number" align="center">
+ <el-table-column label="文件编号" prop="number" align="center">
<template #default="scope">
<el-input
v-model.trim="scope.row.number"
@@ -61,111 +72,57 @@
</el-input>
</template>
</el-table-column>
- <el-table-column label="发放记录" align="center">
- <el-table-column label="部门" prop="distributionDeptName" align="center">
- <template #default="scope">
- <el-input
- v-model.trim="scope.row.distributionDeptName"
- size="large"
- type="textarea"
- style="width: 100%;"
- clearable
- :readonly="state.title =='查看'"
- >
- </el-input>
- </template>
- </el-table-column>
- <el-table-column label="签收" prop="distributionSign" align="center">
- <template #default="scope">
- <el-input
- v-model.trim="scope.row.distributionSign"
- size="large"
- type="textarea"
- style="width: 100%;"
- clearable
- :readonly="state.title =='查看'"
- >
- </el-input>
- </template>
- </el-table-column>
- <el-table-column label="日期" prop="distributionDate" align="center">
- <template #default="scope">
- <el-date-picker
- v-model="scope.row.distributionDate"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="请选择日期"
- :disabled="state.title =='查看'"
- />
- </template>
- </el-table-column>
- <el-table-column label="份数" prop="distributionNum" align="center">
- <template #default="scope">
- <el-input
- v-model.trim="scope.row.distributionNum"
- size="large"
- type="textarea"
- style="width: 100%;"
- clearable
- :readonly="state.title =='查看'"
- >
- </el-input>
- </template>
- </el-table-column>
+ <el-table-column label="受控状态" prop="controlledState" align="center">
+ <template #default="scope">
+ <el-input
+ v-model.trim="scope.row.controlledState"
+ size="large"
+ type="textarea"
+ style="width: 100%;"
+ clearable
+ :readonly="state.title =='查看'"
+ >
+ </el-input>
+ </template>
</el-table-column>
- <el-table-column label="回收记录" align="center">
- <el-table-column label="部门" prop="collectionDeptName" align="center">
- <template #default="scope">
- <el-input
- v-model.trim="scope.row.collectionDeptName"
- size="large"
- type="textarea"
- style="width: 100%;"
- clearable
- :readonly="state.title =='查看'"
- >
- </el-input>
- </template>
- </el-table-column>
- <el-table-column label="签回" prop="collectionSign" align="center">
- <template #default="scope">
- <el-input
- v-model.trim="scope.row.collectionSign"
- size="large"
- type="textarea"
- style="width: 100%;"
- clearable
- :readonly="state.title =='查看'"
- >
- </el-input>
- </template>
- </el-table-column>
- <el-table-column label="日期" prop="collectionDate" align="center">
- <template #default="scope">
- <el-date-picker
- v-model="scope.row.collectionDate"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="请选择日期"
- :disabled="state.title =='查看'"
- />
- </template>
- </el-table-column>
- <el-table-column label="份数" prop="collectionNum" align="center">
- <template #default="scope">
- <el-input
- v-model.trim="scope.row.collectionNum"
- size="large"
- type="textarea"
- style="width: 100%;"
- clearable
- :readonly="state.title =='查看'"
- >
- </el-input>
- </template>
- </el-table-column>
+ <el-table-column label="借阅/复制（份数）" prop="collectionNum" align="center">
+ <template #default="scope">
+ <el-input
+ v-model.number.trim="scope.row.collectionNum"
+ size="large"
+ type="number"
+ style="width: 100%;"
+ clearable
+ :readonly="state.title =='查看'"
+ >
+ </el-input>
+ </template>
</el-table-column>
- <el-table-column label="备注/版本" prop="remark" align="center">
+ <el-table-column label="签名" prop="backSign" align="center">
+ <template #default="scope">
+ <el-input
+ v-model.trim="scope.row.backSign"
+ size="large"
+ type="textarea"
+ style="width: 100%;"
+ clearable
+ :readonly="state.title =='查看'"
+ >
+ </el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="归还日期" prop="backDate" align="center">
+ <template #default="scope">
+ <el-date-picker
+ v-model="scope.row.backDate"
+ type="date"
+ value-format="YYYY-MM-DD"
+ placeholder="请选择日期"
+ :disabled="state.title =='查看'"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="备注" prop="remark" align="center">
<template #default="scope">
<el-input
v-model.trim="scope.row.remark"
@@ -184,31 +141,6 @@
</template>
</el-table-column>
</el-table>
- <el-row>
- <el-col :span="12">
- <el-form-item label="制表:" prop="tabulationId">
- <el-select clearable v-model="state.form.tabulationId" :disabled="state.title =='查看'" filterable placeholder="编制" style="width: 100%">
- <el-option
- v-for="item in state.userList"
- :key="item.userId"
- :label="item.name"
- :value="item.userId"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="日期:" prop="tabulationDate">
- <el-date-picker
- v-model="state.form.tabulationDate"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="请选择日期"
- :disabled="state.title =='查看'"
- />
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
<template #footer v-if="state.title !='查看'">
<span class="dialog-footer">
@@ -223,17 +155,10 @@
import {reactive, ref, toRefs, defineEmits, nextTick, onMounted} from 'vue'
import {ElMessage} from "element-plus";
import {getToken} from "@/utils/auth";
-import {
- updateMaintenanceEvaluate,
- getMaintenanceEvaluateDetail
-} from "@/api/infrastructureMng/ledger";
-
import {listUser} from "@/api/system/user";
import {
getDocBorrowCopyDetail,
- getDocDistributeCollectDetail,
saveDocBorrowCopy,
- saveDocDistributeCollect
} from "@/api/documentManage";
const emit = defineEmits(["getList"]);
@@ -241,7 +166,7 @@
const superRef = ref()
const checkList = (rule, value, callback) => {
if (state.form.documentBorrowCopyRecordList.length == 0) {
- callback(new Error('文件发放回收记录不可为空'))
+ callback(new Error('文件借阅复制记录不可为空'))
} else {
callback()
}
@@ -253,17 +178,13 @@
companyId: null,
name: '',
documentBorrowCopyRecordList: [],
- deleteIds: [],
- tabulationId: null,
- tabulationName: '',
- tabulationDate: ''
+ deleteIds: []
},
oldDeviceList: [],
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
name: [{ required: true, message: '请填写名称', trigger: 'blur' }],
- tabulationId: [{ required: true, message: '请选择制表人', trigger: 'blur' }],
- tabulationDate: [{ required: true, message: '请选择制表日期', trigger: 'blur' }],
+ documentBorrowCopyRecordList: [{ required: true, validator: checkList, trigger: 'blur' }],
},
isAdmin: false,
companyList: [],
@@ -290,17 +211,14 @@
const addLine = () => {
const obj = {
id: null,
- documentId: null,
+ documentBorrowId: null,
fileName: '',
number: '',
- distributionDeptName: '',
- distributionSign: '',
- distributionDate: '',
- distributionNum: null,
- collectionDeptName: '',
- collectionSign: '',
- collectionDate: '',
+ borrowDate: '',
+ controlledState: '',
collectionNum: null,
+ backSign: '',
+ backDate: '',
remark: ''
}
state.form.documentBorrowCopyRecordList.push(obj);
@@ -350,8 +268,8 @@
}
})
state.form.documentBorrowCopyRecordList = res.data.documentBorrowCopyRecordList?.map(
- ({ id, documentId, fileName, number, distributionDeptName, distributionSign, distributionDate, distributionNum, collectionDeptName, collectionSign, collectionDate, collectionNum, remark}) => ({
- id, documentId, fileName, number, distributionDeptName, distributionSign, distributionDate, distributionNum, collectionDeptName, collectionSign, collectionDate, collectionNum, remark
+ ({ id, documentBorrowId, fileName, number, borrowDate, controlledState, collectionNum, backSign, backDate, remark}) => ({
+ id, documentBorrowId, fileName, number, borrowDate, controlledState, collectionNum, backSign, backDate, remark
})
)
state.oldDeviceList = state.form.documentBorrowCopyRecordList
@@ -361,9 +279,7 @@
}
const getDeptList = async ()=>{
- state.form.tabulationId = null
- state.form.tabulationName = ''
- await getUserList(state.form.companyId)
+ // await getUserList(state.form.companyId)
}
const getUserList = async (companyId)=> {
@@ -388,10 +304,7 @@
companyId: null,
name: '',
documentBorrowCopyRecordList: [],
- deleteIds: [],
- tabulationId: null,
- tabulationName: '',
- tabulationDate: ''
+ deleteIds: []
}
superRef.value.clearValidate();
superRef.value.resetFields()
diff --git a/src/views/work/documentManage/docBorrowCopy/index.vue b/src/views/work/documentManage/docBorrowCopy/index.vue
index 8df3e09..fa4686a 100644
--- a/src/views/work/documentManage/docBorrowCopy/index.vue
+++ b/src/views/work/documentManage/docBorrowCopy/index.vue
@@ -30,9 +30,9 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column type="index" label="序号"></el-table-column>
- <el-table-column prop="enactmentDate" align="center" label="检查表名称">
+ <el-table-column prop="name" align="center" label="记录名称">
<template #default="scope">
- {{scope.row.name + '记录'}}
+ {{scope.row.name }}
</template>
</el-table-column>
<el-table-column label="操作" align="center">
@@ -146,13 +146,12 @@
return {
...item,
index: index + 1,
- distributionDate: item.distributionDate.substring(0,10),
- collectionDate: item.collectionDate.substring(0,10)
+ borrowDate: item.borrowDate.substring(0,10),
+ backDate: item.backDate.substring(0,10)
}
})
- tableData.tabulationDate = tableData.tabulationDate.substring(0,10)
try {
- generateWordDocument('/docDistributeRetrieve.docx', tableData, tableData.name +'文件发放/回收记录.docx');
+ generateWordDocument('/docBorrowCopy.docx', tableData, tableData.name +'文件借阅/复制记录.docx');
} catch (error){
ElMessage({
type: 'warning',
diff --git a/src/views/work/empResource/deptEmpAnalysis/index.vue b/src/views/work/empResource/deptEmpAnalysis/index.vue
index 9a06773..2abf4bc 100644
--- a/src/views/work/empResource/deptEmpAnalysis/index.vue
+++ b/src/views/work/empResource/deptEmpAnalysis/index.vue
@@ -27,7 +27,7 @@
</el-form>
</div>
<!-- 表格数据 -->
- <div>
+ <div style="background:#fff;padding: 20px;border-radius: 0.6rem;box-shadow: 8px 8px 15px rgba(0, 21, 41, 0.08), -8px -8px 15px #fff">
公司目前拥有职工总人数{{ dataList.totalUser }}人，包括{{ dataList.post }}等专业，
<span v-if="(dataList.qualification5 && dataList.qualification5>0) || (dataList.qualification4 && dataList.qualification4>0)">
<span v-if="dataList.qualification5>0">博士</span>
--
Gitblit v1.9.2