From d44d15d044c9e1b70f3dbf87b8d7a54ac8983852 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 07 May 2026 15:22:19 +0800
Subject: [PATCH] 修改
---
src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/index.vue | 42 ++++++++--
src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue | 14 +++
src/views/work/selfProblems/internalAudit/auditorManage/tableList/components/editDialog.vue | 12 +++
src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue | 17 +++
src/views/work/qualityManage/performanceAppraisal/components/editDialog.vue | 12 +++
src/views/work/selfProblems/internalAudit/auditorManage/nameList/index.vue | 45 ++++++++--
src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue | 16 +++
src/views/work/qualityInfo/infrastructureMng/maintainRecord/index.vue | 1
src/views/work/procurementPlatform/materialMng/components/editDialog.vue | 17 +++
src/views/work/procurementPlatform/materialMng/index.vue | 42 ++++++++--
10 files changed, 183 insertions(+), 35 deletions(-)
diff --git a/src/views/work/procurementPlatform/materialMng/components/editDialog.vue b/src/views/work/procurementPlatform/materialMng/components/editDialog.vue
index 9aa55d1..b327a30 100644
--- a/src/views/work/procurementPlatform/materialMng/components/editDialog.vue
+++ b/src/views/work/procurementPlatform/materialMng/components/editDialog.vue
@@ -19,6 +19,15 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year">
+ <el-date-picker
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="年份"
+ style="width: 100%"
+ />
+ </el-form-item>
<el-form-item label="材料名称:" prop="materialName">
<el-input v-model.trim="state.form.materialName" :readonly="state.title =='查看'" placeholder="材料名称"></el-input>
</el-form-item>
@@ -65,6 +74,7 @@
specification: '',
materialBatch:'',
materialUnit: '',
+ year:new Date().getFullYear().toString(),
inventory: ''
},
formRules:{
@@ -73,7 +83,8 @@
materialBatch: [{ required: true, message: '请输入批次', trigger: 'blur' }],
specification: [{ required: true, message: '请输入规格', trigger: 'blur' }],
materialUnit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
- inventory: [{ required: true, message: '请输入库存量', trigger: 'blur' }]
+ inventory: [{ required: true, message: '请输入库存量', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
},
isAdmin: false,
companyList: []
@@ -110,7 +121,8 @@
materialBatch:state.form.materialBatch,
specification: state.form.specification,
materialUnit: state.form.materialUnit,
- inventory: state.form.inventory
+ inventory: state.form.inventory,
+ year:state.form.year
}
}else{
data = state.form
@@ -136,6 +148,7 @@
specification: '',
materialBatch:'',
materialUnit: '',
+ year:new Date().getFullYear().toString(),
inventory: ''
}
superRef.value.clearValidate();
diff --git a/src/views/work/procurementPlatform/materialMng/index.vue b/src/views/work/procurementPlatform/materialMng/index.vue
index 519afbd..37beff6 100644
--- a/src/views/work/procurementPlatform/materialMng/index.vue
+++ b/src/views/work/procurementPlatform/materialMng/index.vue
@@ -21,15 +21,24 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="请选择年份"
+ />
+ </el-form-item>
<el-form-item >
- <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
- <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+ <el-button type="primary" @click="getList">查询</el-button>
+ <el-button type="primary" plain @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column label="序号" type="index" align="center" width="80"/>
+ <el-table-column label="年份" prop="year" align="center"/>
<el-table-column label="材料名称" prop="materialName" align="center"/>
<el-table-column label="批次" prop="materialBatch" align="center"/>
<el-table-column label="规格" prop="specification" align="center"/>
@@ -76,7 +85,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year:''
},
total: 0,
dataList: [],
@@ -95,13 +105,16 @@
data.isAdmin = false
data.queryParams.companyId = userStore.companyId
}
+ await getNowYear()
await getList()
})
onUnmounted(()=>{
})
-
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true
const res = await getMaterialList(data.queryParams)
@@ -134,12 +147,23 @@
/** 重置新增的表单以及其他数据 */
const reset= async()=> {
- data.queryParams = {
- pageNum: 1,
- pageSize: 10,
- companyId: null
+ if(data.isAdmin){
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ companyId: null,
+ year:''
+ }
+ await getCompanyList()
+ }else {
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ companyId: data.queryParams.companyId,
+ year:''
+ }
}
- await getCompanyList()
+ await getNowYear()
await getList()
}
const handleDelete = (val) => {
diff --git a/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue
index 034ffa9..54eb5de 100644
--- a/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue
@@ -19,6 +19,15 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year">
+ <el-date-picker
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="年份"
+ style="width: 100%"
+ />
+ </el-form-item>
<el-row>
<el-col :span="8">
<el-form-item label="设备名称:" prop="deviceName">
@@ -240,7 +249,8 @@
operateDateTwo: '',
checkersTwo: [],
checkDateTwo: '',
- delServiceUserIds: []
+ delServiceUserIds: [],
+ year:new Date().getFullYear().toString(),
},
oldServiceUsers: [],
maintainList: [
@@ -306,7 +316,8 @@
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
deviceName: [{ required: true, message: '请填写设备名称', trigger: 'blur' }],
deviceNumber: [{ required: true, message: '请填写设备编号', trigger: 'blur' }],
- number: [{ required: true, message: '请填写表单编号', trigger: 'blur' }]
+ number: [{ required: true, message: '请填写表单编号', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
},
isAdmin: false,
companyList: [],
@@ -533,6 +544,7 @@
operateDateTwo: '',
checkersTwo: [],
checkDateTwo: '',
+ year:new Date().getFullYear().toString(),
delServiceUserIds: []
}
state.maintainList = state.maintainList.map(i=>{
diff --git a/src/views/work/qualityInfo/infrastructureMng/maintainRecord/index.vue b/src/views/work/qualityInfo/infrastructureMng/maintainRecord/index.vue
index 58aa481..a4ecfdb 100644
--- a/src/views/work/qualityInfo/infrastructureMng/maintainRecord/index.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/maintainRecord/index.vue
@@ -39,6 +39,7 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column type="index" label="序号"></el-table-column>
+ <el-table-column prop="year" align="center" label="年份"></el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称"></el-table-column>
<el-table-column prop="deviceNumber" align="center" label="设备编号"></el-table-column>
<el-table-column label="操作" align="center">
diff --git a/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue b/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue
index 828de7e..74f2f59 100644
--- a/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue
+++ b/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue
@@ -19,6 +19,15 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year">
+ <el-date-picker
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="年份"
+ style="width: 100%"
+ />
+ </el-form-item>
<el-form-item label="供应商：" prop="supplierId">
<el-select v-model="state.form.supplierId" placeholder="请选择" :disabled="state.title =='查看'" clearable style="width: 100%">
<el-option
@@ -62,12 +71,14 @@
companyId: null,
productName: '',
supplierId: null,
+ year:new Date().getFullYear().toString(),
supplierName: ''
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
productName: [{ required: true, message: '请输入外包产品名称', trigger: 'blur' }],
- supplierId: [{ required: true, message: '请选择供应商', trigger: 'blur' }]
+ supplierId: [{ required: true, message: '请选择供应商', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
},
isAdmin: false,
companyList: [],
@@ -122,7 +133,8 @@
companyId: state.form.companyId,
productName: state.form.productName,
supplierId: state.form.supplierId,
- supplierName: state.supplierList.find(i=>i.id == state.form.supplierId)?.supplierName
+ supplierName: state.supplierList.find(i=>i.id == state.form.supplierId)?.supplierName,
+ year:state.form.year
}
}else{
data = state.form
@@ -146,6 +158,7 @@
companyId: null,
productName: '',
supplierId: null,
+ year:new Date().getFullYear().toString(),
supplierName: ''
}
superRef.value.clearValidate();
diff --git a/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/index.vue b/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/index.vue
index f45879e..32645a5 100644
--- a/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/index.vue
+++ b/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/index.vue
@@ -21,15 +21,24 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="请选择年份"
+ />
+ </el-form-item>
<el-form-item >
- <el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
- <el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
+ <el-button type="primary" @click="getList">查询</el-button>
+ <el-button type="primary" plain @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column label="序号" type="index" align="center" width="80"/>
+ <el-table-column label="年份" prop="year" align="center" />
<el-table-column label="供应商" prop="supplierName" align="center"/>
<el-table-column label="产品名称" prop="productName" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
@@ -72,7 +81,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year:''
},
total: 0,
dataList: [],
@@ -91,13 +101,16 @@
data.isAdmin = false
data.queryParams.companyId = userStore.companyId
}
+ await getNowYear()
await getList()
})
onUnmounted(()=>{
})
-
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true
const res = await getOutsourcedProductNameList(data.queryParams)
@@ -130,12 +143,23 @@
/** 重置新增的表单以及其他数据 */
const reset= async()=> {
- data.queryParams = {
- pageNum: 1,
- pageSize: 10,
- companyId: null
+ if(data.isAdmin){
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ companyId: null,
+ year:''
+ }
+ await getCompanyList()
+ }else {
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ companyId: data.queryParams.companyId,
+ year:''
+ }
}
- await getCompanyList()
+ await getNowYear()
await getList()
}
const handleDelete = (val) => {
diff --git a/src/views/work/qualityManage/performanceAppraisal/components/editDialog.vue b/src/views/work/qualityManage/performanceAppraisal/components/editDialog.vue
index e2b9cd6..d71cb01 100644
--- a/src/views/work/qualityManage/performanceAppraisal/components/editDialog.vue
+++ b/src/views/work/qualityManage/performanceAppraisal/components/editDialog.vue
@@ -21,6 +21,15 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year">
+ <el-date-picker
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="年份"
+ style="width: 100%"
+ />
+ </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
@@ -237,6 +246,7 @@
fictionTime: "",
checkId: null,
checkTime: "",
+ year:new Date().getFullYear().toString(),
content:
'一、主要问题：\n' +
'1、按GJB9001C-2017标准建立体系\t\n' +
@@ -316,6 +326,7 @@
opportunity: [{ required: true, message: '', trigger: 'blur' }],
scope: [{ required: true, message: '', trigger: 'blur' }],
score: [{ required: true, message: '', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
},
peopleList: [],
@@ -435,6 +446,7 @@
fictionId: null,
fictionTime: "",
checkId: null,
+ year:new Date().getFullYear().toString(),
checkTime: "",
content:
'一、主要问题：\n' +
diff --git a/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue b/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue
index 697018b..994c240 100644
--- a/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue
+++ b/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue
@@ -26,6 +26,15 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year">
+ <el-date-picker
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="年份"
+ style="width: 100%"
+ />
+ </el-form-item>
<el-form-item label="人员选择:" prop="personId">
<el-select
clearable
@@ -76,7 +85,8 @@
id: null,
personId: null,
companyId: null,
- speciality: ''
+ speciality: '',
+ year:new Date().getFullYear().toString()
},
isAdmin: false,
peopleList: [],
@@ -84,6 +94,7 @@
personId: [{ required: true, message: '请选择人员', trigger: 'blur' }],
companyId: [{ required: true, message: '请选择公司', trigger: 'blur' }],
speciality: [{ required: true, message: '请输入专长领域', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
}
})
onMounted(() => {
@@ -170,6 +181,7 @@
id: null,
personId: null,
companyId: null,
+ year:new Date().getFullYear().toString(),
speciality: ''
}
state.peopleList = []
diff --git a/src/views/work/selfProblems/internalAudit/auditorManage/nameList/index.vue b/src/views/work/selfProblems/internalAudit/auditorManage/nameList/index.vue
index 6132bd5..897772f 100644
--- a/src/views/work/selfProblems/internalAudit/auditorManage/nameList/index.vue
+++ b/src/views/work/selfProblems/internalAudit/auditorManage/nameList/index.vue
@@ -21,7 +21,15 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item v-if="data.isAdmin">
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="请选择年份"
+ />
+ </el-form-item>
+ <el-form-item >
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
@@ -31,6 +39,7 @@
<el-table v-loading="loading" :data="dataList" :border="true" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column label="姓名" prop="personName" align="center" />
+ <el-table-column label="年份" prop="year" align="center" />
<el-table-column label="所属部门" prop="deptName" align="center" />
<el-table-column label="职务" prop="duty" align="center" />
<el-table-column label="专长领域" prop="speciality" align="center" />
@@ -78,6 +87,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year:''
},
companyList: [],
isAdmin: false
@@ -97,8 +107,12 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
});
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getPersonPage(data.queryParams);
@@ -149,16 +163,27 @@
}
/** 重置新增的表单以及其他数据 */
-function reset() {
- data.queryParams = {
- companyId: '',
- pageNum: 1,
- pageSize: 10,
+const reset= async()=> {
+ if(data.isAdmin){
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ companyId: null,
+ year:''
+ }
+ choosedData.value = []
+ data.companyList = [];
+ await getCompanyList()
+ }else {
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ companyId: data.queryParams.companyId,
+ year:''
+ }
}
- choosedData.value = []
- data.companyList = [];
- getList();
- getCompanyList()
+ await getNowYear()
+ await getList()
}
const exportData = () => {
if(choosedData.value && choosedData.value.length === 0){
diff --git a/src/views/work/selfProblems/internalAudit/auditorManage/tableList/components/editDialog.vue b/src/views/work/selfProblems/internalAudit/auditorManage/tableList/components/editDialog.vue
index b16a327..5bbeb0d 100644
--- a/src/views/work/selfProblems/internalAudit/auditorManage/tableList/components/editDialog.vue
+++ b/src/views/work/selfProblems/internalAudit/auditorManage/tableList/components/editDialog.vue
@@ -26,6 +26,15 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year">
+ <el-date-picker
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="年份"
+ style="width: 100%"
+ />
+ </el-form-item>
<el-form-item label="人员选择:" prop="personId">
<el-select
clearable
@@ -98,6 +107,7 @@
companyId: null,
paperStudentId: '',
amount: '',
+ year:new Date().getFullYear().toString(),
conclusion: ''
},
@@ -107,6 +117,7 @@
formRules:{
companyId: [{ required: true, message: '请选择公司', trigger: 'blur' }],
personId: [{ required: true, message: '请选择人员', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
}
})
onMounted(() => {
@@ -219,6 +230,7 @@
companyId: null,
paperStudentId: '',
amount: '',
+ year:new Date().getFullYear().toString(),
conclusion: ''
}
state.certList = []
--
Gitblit v1.9.2