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/docDestruction/components/editDialog.vue | 17 ++
src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue | 15 ++
src/views/work/marketingManagement/contractManagement/contractChange/index.vue | 21 ++
src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue | 11 +
src/views/work/noticeMng/index.vue | 14 +
src/views/work/marketingManagement/customerList/list/components/editDialog.vue | 11 +
src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue | 1
src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/index.vue | 19 +
src/views/work/documentManage/docChangeInvalidate/index.vue | 13 +
src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue | 17 ++
src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/components/editDialog.vue | 11 +
src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/index.vue | 19 +
src/views/work/documentManage/docBorrowCopy/index.vue | 14 +
src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/index.vue | 10 +
src/views/work/marketingManagement/customerList/communicate/index.vue | 19 ++
src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/components/editDialog.vue | 15 ++
src/views/work/marketingManagement/customerList/need/components/editDialog.vue | 15 ++
src/views/work/marketingManagement/customerList/need/index.vue | 18 ++
src/views/work/documentManage/docBorrowCopy/components/editDialog.vue | 11 +
src/views/work/marketingManagement/customerList/list/index.vue | 15 +
src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/index.vue | 10 +
src/views/work/marketingManagement/contractManagement/contractLedger/index.vue | 14 +
src/views/work/documentManage/docDestruction/index.vue | 13 +
src/views/work/documentManage/docDistributeRetrieve/index.vue | 20 ++
src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/components/editDialog.vue | 15 ++
src/views/work/marketingManagement/afterSales/index.vue | 19 ++
26 files changed, 320 insertions(+), 57 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/components/editDialog.vue
index bafbe1e..5468ab7 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/components/editDialog.vue
@@ -19,6 +19,13 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item label="项目名称:" prop="itemName" >
<el-input v-model="state.form.itemName" placeholder="项目名称" :disabled="title === '查看'"/>
</el-form-item>
@@ -67,11 +74,13 @@
form: {
id: '',
companyId: null,
+ year: '',
itemName: '',
users: []
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
itemName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
users: [{ required: true, message: '请选择项目参与人员', trigger: 'blur' }],
},
@@ -89,6 +98,7 @@
if(state.isAdmin){
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
@@ -176,6 +186,7 @@
state.form = {
id: '',
companyId: null,
+ year: '',
itemName: '',
users: []
}
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/index.vue
index 89cee3d..07e1c00 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/project/projectSet/index.vue
@@ -12,6 +12,12 @@
v-hasPermi="['projectSet:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -39,6 +45,7 @@
</div>
</template>
</el-table-column>
+ <el-table-column label="年份" prop="year" align="center" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userTpye == 0 || userTpye == 6">
<template #default="scope">
<el-button link type="primary" @click="openDialog('edit',scope.row)" v-hasPermi="['projectSet:edit']">编辑</el-button>
@@ -76,6 +83,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year: new Date().getFullYear().toString(),
industryType: null,
type: '',
templateName: ''
@@ -155,12 +163,14 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year: new Date().getFullYear().toString(),
}
await getCompanyList()
}else {
data.queryParams = {
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
companyId: data.queryParams.companyId,
}
}
diff --git a/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue b/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue
index c5bc4eb..d400364 100644
--- a/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue
+++ b/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue
@@ -196,7 +196,6 @@
onMounted(() => {
const userInfo = JSON.parse(Cookies.get('userInfo'))
- console.log("userInfo",userInfo)
data.isAdmin = userInfo.userType === 0;
if(data.isAdmin){
data.queryParams.companyId = null
diff --git a/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/index.vue b/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/index.vue
index beb302d..a6c8fd4 100644
--- a/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/index.vue
+++ b/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/index.vue
@@ -11,6 +11,12 @@
v-hasPermi="['6sInspectChecklist:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -87,6 +93,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
companyId: null
},
total: 0,
@@ -301,7 +308,8 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString(),
}
await getCompanyList()
await getList()
diff --git a/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue b/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
index 37fe747..9586f91 100644
--- a/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
+++ b/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
@@ -19,6 +19,13 @@
</el-option>
</el-select>
</el-form-item>
+ <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-form-item label="记录名称:" prop="name">
<el-input v-model.trim="state.form.name" :readonly="state.title =='查看'"></el-input>
</el-form-item>
@@ -177,6 +184,7 @@
form: {
id: null,
companyId: null,
+ year: '',
name: '',
documentBorrowCopyRecordList: [],
deleteIds: []
@@ -184,6 +192,7 @@
oldDeviceList: [],
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
name: [{ required: true, message: '请填写名称', trigger: 'blur' }],
documentBorrowCopyRecordList: [{ required: true, validator: checkList, trigger: 'blur' }],
},
@@ -200,6 +209,7 @@
if(isAdmin){
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
await getUserList(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
@@ -296,6 +306,7 @@
state.form = {
id: null,
companyId: null,
+ year: '',
name: '',
documentBorrowCopyRecordList: [],
deleteIds: []
diff --git a/src/views/work/documentManage/docBorrowCopy/index.vue b/src/views/work/documentManage/docBorrowCopy/index.vue
index 0d6ec37..4778d36 100644
--- a/src/views/work/documentManage/docBorrowCopy/index.vue
+++ b/src/views/work/documentManage/docBorrowCopy/index.vue
@@ -11,6 +11,12 @@
v-hasPermi="['docBorrowCopy:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -36,6 +42,7 @@
{{scope.row.name }}
</template>
</el-table-column>
+ <el-table-column prop="year" align="center" label="年份"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openDialog('view',scope.row)">查看</el-button>
@@ -87,7 +94,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
},
total: 0,
dataList: [],
@@ -105,6 +113,7 @@
data.isAdmin = false
data.queryParams.companyId = userStore.companyId
}
+
await getList()
})
@@ -176,7 +185,8 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
}
await getCompanyList()
await getList()
diff --git a/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue b/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
index a652495..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">
@@ -350,6 +363,7 @@
form: {
id: null,
companyId: null,
+ year: '',
fileName: '',
number: '',
deptId: null,
@@ -381,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' }],
@@ -417,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' ? '编辑' : '查看'
@@ -551,6 +567,7 @@
state.form = {
id: null,
companyId: null,
+ year: '',
fileName: [],
number: '',
deptId: null,
diff --git a/src/views/work/documentManage/docChangeInvalidate/index.vue b/src/views/work/documentManage/docChangeInvalidate/index.vue
index e3a144f..3165c1a 100644
--- a/src/views/work/documentManage/docChangeInvalidate/index.vue
+++ b/src/views/work/documentManage/docChangeInvalidate/index.vue
@@ -11,6 +11,12 @@
v-hasPermi="['docChangeInvalidate:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -31,6 +37,7 @@
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="fileName" align="center" label="文件名称"></el-table-column>
+ <el-table-column prop="year" align="center" label="年份"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openDialog('view',scope.row)">查看</el-button>
@@ -85,7 +92,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
},
total: 0,
dataList: [],
@@ -145,7 +153,8 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
}
await getCompanyList()
await getList()
diff --git a/src/views/work/documentManage/docDestruction/components/editDialog.vue b/src/views/work/documentManage/docDestruction/components/editDialog.vue
index efbc315..44f0e0f 100644
--- a/src/views/work/documentManage/docDestruction/components/editDialog.vue
+++ b/src/views/work/documentManage/docDestruction/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="请选择" :disabled="state.title =='查看'" clearable @change="getDeptList">
<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">
@@ -198,6 +211,7 @@
form: {
id: null,
companyId: null,
+ year: '',
fileName: '',
sort: null,
number: '',
@@ -222,6 +236,7 @@
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
fileName: [{ required: true, message: '请填写文件名称', trigger: 'blur' }],
destruction: [{ required: true, message: '请填写销毁原因', trigger: 'blur' }],
destructionApplyId: [{ required: true, message: '请选择申请人', trigger: 'blur' }],
@@ -249,6 +264,7 @@
if(isAdmin){
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
await getUserList(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
@@ -317,6 +333,7 @@
state.form = {
id: null,
companyId: null,
+ year: '',
fileName: '',
sort: null,
number: '',
diff --git a/src/views/work/documentManage/docDestruction/index.vue b/src/views/work/documentManage/docDestruction/index.vue
index 1be6f0a..03d9a04 100644
--- a/src/views/work/documentManage/docDestruction/index.vue
+++ b/src/views/work/documentManage/docDestruction/index.vue
@@ -11,6 +11,12 @@
v-hasPermi="['docDestruction:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -32,6 +38,7 @@
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="fileName" align="center" label="文件名称"></el-table-column>
+ <el-table-column prop="year" align="center" label="年份"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openDialog('view',scope.row)">查看</el-button>
@@ -78,7 +85,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
},
total: 0,
dataList: [],
@@ -153,7 +161,8 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
}
await getCompanyList()
await getList()
diff --git a/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue b/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue
index b6d19e0..0a1c618 100644
--- a/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue
+++ b/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue
@@ -19,6 +19,13 @@
</el-option>
</el-select>
</el-form-item>
+ <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-form-item label="记录名称:" prop="name">
<el-input v-model.trim="state.form.name" :readonly="state.title =='查看'"></el-input>
</el-form-item>
@@ -294,6 +301,7 @@
form: {
id: null,
companyId: null,
+ year: '',
name: '',
documentDistributionCollectionRecordList: [],
deleteIds: [],
@@ -304,6 +312,7 @@
oldDeviceList: [],
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
name: [{ required: true, message: '请填写名称', trigger: 'blur' }],
tabulationId: [{ required: true, message: '请选择制表人', trigger: 'blur' }],
tabulationDate: [{ required: true, message: '请选择制表日期', trigger: 'blur' }],
@@ -323,6 +332,7 @@
if(isAdmin){
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
await getUserList(companyId)
await getDepartList(companyId)
await getFileList(companyId)
@@ -477,6 +487,7 @@
state.form = {
id: null,
companyId: null,
+ year: '',
name: '',
documentDistributionCollectionRecordList: [],
deleteIds: [],
diff --git a/src/views/work/documentManage/docDistributeRetrieve/index.vue b/src/views/work/documentManage/docDistributeRetrieve/index.vue
index b2625ef..4a92958 100644
--- a/src/views/work/documentManage/docDistributeRetrieve/index.vue
+++ b/src/views/work/documentManage/docDistributeRetrieve/index.vue
@@ -11,6 +11,12 @@
v-hasPermi="['docDistributeRetrieve:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -36,6 +42,7 @@
{{scope.row.name + '记录'}}
</template>
</el-table-column>
+ <el-table-column prop="year" align="center" label="年份"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openDialog('view',scope.row)">查看</el-button>
@@ -86,7 +93,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: ''
},
total: 0,
dataList: [],
@@ -103,14 +111,17 @@
}else{
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 getDocDistributeCollectList(data.queryParams)
@@ -176,7 +187,8 @@
data.queryParams = {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
}
await getCompanyList()
await getList()
diff --git a/src/views/work/marketingManagement/afterSales/index.vue b/src/views/work/marketingManagement/afterSales/index.vue
index a86b22b..5224704 100644
--- a/src/views/work/marketingManagement/afterSales/index.vue
+++ b/src/views/work/marketingManagement/afterSales/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['afterSales:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,10 +28,10 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
- <el-form-item style="margin-left: 15px">
+ <el-form-item>
<el-button
type="primary"
@click="exportData"
@@ -38,6 +44,7 @@
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column label="售后服务记录" prop="recordName" align="center"></el-table-column>
+ <el-table-column label="服务时间" prop="serverTime" align="center"></el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -84,7 +91,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
},
companyList: [],
@@ -162,6 +169,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
}
choosedData.value = []
data.companyList = [];
@@ -171,6 +179,7 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
}
}
getList();
diff --git a/src/views/work/marketingManagement/contractManagement/contractChange/index.vue b/src/views/work/marketingManagement/contractManagement/contractChange/index.vue
index baa5fbf..f79fea9 100644
--- a/src/views/work/marketingManagement/contractManagement/contractChange/index.vue
+++ b/src/views/work/marketingManagement/contractManagement/contractChange/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['contractChange:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -21,7 +27,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="评审状态:" style="margin-left: 20px">
+ <el-form-item label="评审状态:">
<el-select v-model="data.queryParams.status" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.stateList"
@@ -31,7 +37,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="评审类型:" style="margin-left: 20px">
+ <el-form-item label="评审类型:">
<el-select v-model="data.queryParams.type" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.typeList"
@@ -42,10 +48,10 @@
</el-select>
</el-form-item>
<el-form-item >
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
- <el-form-item style="margin-left: 15px">
+ <el-form-item>
<el-button
type="primary"
@click="exportData"
@@ -110,6 +116,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year: new Date().getFullYear().toString(),
status:null,
type:null
},
@@ -206,6 +213,7 @@
if(data.isAdmin){
data.queryParams = {
companyId: '',
+ year: new Date().getFullYear().toString(),
pageNum: 1,
pageSize: 10,
status:null,
@@ -217,6 +225,7 @@
}else {
data.queryParams = {
companyId: data.queryParams.companyId,
+ year: new Date().getFullYear().toString(),
pageNum: 1,
pageSize: 10,
status:null,
diff --git a/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue b/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue
index 7539e45..548406e 100644
--- a/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue
+++ b/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['contractLedger:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
</el-form>
@@ -83,6 +89,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
companyId: null,
},
companyList: [],
@@ -153,6 +160,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
}
choosedData.value = []
data.companyList = [];
diff --git a/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue b/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue
index e24cab9..75cccad 100644
--- a/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue
+++ b/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue
@@ -10,7 +10,7 @@
>
<el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" label-position="right" label-width="130">
<el-row :gutter="24">
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="单位名称:" prop="companyId" v-if="state.isAdmin">
<el-select v-model="state.form.companyId" placeholder="请选择" filterable clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom">
<el-option
@@ -22,6 +22,15 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
@@ -237,6 +246,7 @@
form: {
id: '',
companyId: '',
+ year: '',
recordName: "",
number: "",
client: "",
@@ -259,6 +269,7 @@
},
rules: {
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
recordName: [{ required: true, message: '请输入记录名称', trigger: 'blur' }],
number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
client: [{ required: true, message: '请输入客户单位/姓名', trigger: 'blur' }],
@@ -344,6 +355,7 @@
state.form.companyName = value.companyName
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
for (let key in state.form) {
@@ -427,6 +439,7 @@
state.form = {
id: '',
companyId: '',
+ year: '',
recordName: "",
number: "",
client: "",
diff --git a/src/views/work/marketingManagement/customerList/communicate/index.vue b/src/views/work/marketingManagement/customerList/communicate/index.vue
index 90adc61..ca1cbf9 100644
--- a/src/views/work/marketingManagement/customerList/communicate/index.vue
+++ b/src/views/work/marketingManagement/customerList/communicate/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['customerCommunicate:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,10 +28,10 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
- <el-form-item style="margin-left: 15px">
+ <el-form-item>
<el-button
type="primary"
@click="exportData"
@@ -39,6 +45,7 @@
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column label="单位名称" prop="companyName" align="center" v-if="data.isAdmin" />
<el-table-column label="记录名称" prop="recordName" align="center"></el-table-column>
+ <el-table-column label="年份" prop="year" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -84,7 +91,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
},
companyList: [],
@@ -206,6 +213,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString()
}
choosedData.value = []
data.companyList = [];
@@ -215,6 +223,7 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString()
}
}
getList();
diff --git a/src/views/work/marketingManagement/customerList/list/components/editDialog.vue b/src/views/work/marketingManagement/customerList/list/components/editDialog.vue
index f737deb..41656df 100644
--- a/src/views/work/marketingManagement/customerList/list/components/editDialog.vue
+++ b/src/views/work/marketingManagement/customerList/list/components/editDialog.vue
@@ -19,6 +19,13 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item label="顾客名称:" prop="customerName" >
<el-input v-model="state.form.customerName" :disabled="title === '查看'" placeholder="顾客名称"/>
</el-form-item>
@@ -74,6 +81,7 @@
form: {
id: '',
companyId: '',
+ year: '',
customerName: '',
customerAddr: '',
person: '',
@@ -83,6 +91,7 @@
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
customerName:[{ required: true, message: '请输入顾客名称', trigger: 'blur' }],
customerAddr:[{ required: true, message: '请输入顾客地址', trigger: 'blur' }],
person:[{ required: true, message: '请输入联系人', trigger: 'blur' }],
@@ -99,6 +108,7 @@
if(state.isAdmin){
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
@@ -163,6 +173,7 @@
state.form = {
id: '',
companyId: '',
+ year: '',
companyName: '',
customerAddr: '',
person: '',
diff --git a/src/views/work/marketingManagement/customerList/list/index.vue b/src/views/work/marketingManagement/customerList/list/index.vue
index 38a2658..2bcc926 100644
--- a/src/views/work/marketingManagement/customerList/list/index.vue
+++ b/src/views/work/marketingManagement/customerList/list/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['customerList:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
@@ -44,6 +50,7 @@
<el-table-column label="顾客地址" prop="customerAddr" align="center" width="130"/>
<el-table-column label="联系人" prop="person" align="center" />
<el-table-column label="电话" prop="phone" align="center" />
+ <el-table-column label="年份" prop="year" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -89,6 +96,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year: new Date().getFullYear().toString(),
},
companyList: [],
isAdmin: false
@@ -158,6 +166,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
}
choosedData.value = []
data.companyList = [];
diff --git a/src/views/work/marketingManagement/customerList/need/components/editDialog.vue b/src/views/work/marketingManagement/customerList/need/components/editDialog.vue
index 0020bf1..dabde52 100644
--- a/src/views/work/marketingManagement/customerList/need/components/editDialog.vue
+++ b/src/views/work/marketingManagement/customerList/need/components/editDialog.vue
@@ -10,7 +10,7 @@
>
<el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" label-position="right" label-width="130">
<el-row :gutter="24">
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="单位名称:" prop="companyId" v-if="state.isAdmin">
<el-select v-model="state.form.companyId" placeholder="请选择" filterable clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom">
<el-option
@@ -22,6 +22,15 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
@@ -170,11 +179,13 @@
form: {
id: '',
companyId: null,
+ year: '',
recordName: null,
customerRecordNeeds:[],
},
rules: {
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
recordName: [{ required: true, message: '请输入记录名称', trigger: 'blur' }],
customerName: [{required: true, message: "", trigger: "blur"}],
customerNeed: [{required: true, message: "", trigger: "blur"}],
@@ -204,6 +215,7 @@
state.form.companyName = value.companyName
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
@@ -336,6 +348,7 @@
companyId: null,
recordName: null,
customerRecordNeeds:[],
+ year: '',
}
state.companyList = []
}
diff --git a/src/views/work/marketingManagement/customerList/need/index.vue b/src/views/work/marketingManagement/customerList/need/index.vue
index 99a4ef5..fcf3332 100644
--- a/src/views/work/marketingManagement/customerList/need/index.vue
+++ b/src/views/work/marketingManagement/customerList/need/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['customerNeed:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,10 +28,10 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
- <el-form-item style="margin-left: 15px">
+ <el-form-item>
<el-button
type="primary"
@click="exportData"
@@ -43,6 +49,7 @@
<span>{{scope.row.recordName}}需求登记</span>
</template>
</el-table-column>
+ <el-table-column label="年份" prop="year" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -88,6 +95,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year: new Date().getFullYear().toString(),
},
companyList: [],
isAdmin: false,
@@ -164,6 +172,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
}
choosedData.value = []
data.companyList = [];
@@ -173,6 +182,7 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
+ year: new Date().getFullYear().toString(),
}
}
getList();
diff --git a/src/views/work/noticeMng/index.vue b/src/views/work/noticeMng/index.vue
index bd84ca2..8f83505 100644
--- a/src/views/work/noticeMng/index.vue
+++ b/src/views/work/noticeMng/index.vue
@@ -11,6 +11,12 @@
v-hasPermi="['noticeMng:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
<el-form-item v-if="isAdmin" label="企业：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
@@ -32,7 +38,7 @@
<el-table-column label="序号" type="index" align="center" width="80"/>
<el-table-column label="通知内容" prop="content" align="center"/>
<el-table-column label="发布部门" prop="deptName" align="center"/>
- <el-table-column label="分布日期" prop="publishDate" align="center"/>
+ <el-table-column label="发布日期" prop="publishDate" align="center"/>
<el-table-column label="文件" prop="filePath" align="center">
<template #default="scope">
<el-link v-if="scope.row.filePath && scope.row.filePath !== ''" style="" type="primary" @click="openFile(scope.row.filePath)">{{scope.row.fileName}}</el-link>
@@ -76,7 +82,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year: new Date().getFullYear().toString()
},
total: 0,
dataList: [],
@@ -196,7 +203,8 @@
data.queryParams = {
...data.queryParams,
pageNum: 1,
- pageSize: 10
+ pageSize: 10,
+ year: new Date().getFullYear().toString()
}
await getCompanyList()
await getList()
diff --git a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/components/editDialog.vue b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/components/editDialog.vue
index 4ad6442..219746c 100644
--- a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/components/editDialog.vue
+++ b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/components/editDialog.vue
@@ -10,7 +10,7 @@
>
<el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" >
<el-row :gutter="24">
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="单位名称:" prop="companyId" v-if="state.isAdmin">
<el-select v-model="state.form.companyId" placeholder="请选择" filterable clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom">
<el-option
@@ -22,6 +22,16 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ </el-col>
+
</el-row>
<el-row :gutter="24">
<el-col :span="12">
@@ -173,6 +183,7 @@
form: {
id: '',
companyId: null,
+ year: '',
questionName: null,
number: '',
unitName: null,
@@ -186,6 +197,7 @@
},
rules: {
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
questionName: [{ required: true, message: '请输入问卷名称', trigger: 'blur' }],
number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
unitName: [{ required: true, message: '请输入单位名称', trigger: 'blur' }],
@@ -278,6 +290,7 @@
state.form.companyName = value.companyName
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
await getSupplier()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
diff --git a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/index.vue b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/index.vue
index 788f5ff..d7c1c64 100644
--- a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/index.vue
+++ b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/deliver/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['satisfiedEvalusteDeliver:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
<!-- <el-form-item style="margin-left: 15px">-->
@@ -38,6 +44,7 @@
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column label="名称" prop="questionName" align="center" />
+ <el-table-column label="年份" prop="year" align="center"/>
<el-table-column label="操作" align="center" class-naame="small-padding fixed-width" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -83,7 +90,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
},
companyList: [],
@@ -169,7 +176,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
}
choosedData.value = []
@@ -180,7 +187,7 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
}
}
diff --git a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/components/editDialog.vue b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/components/editDialog.vue
index b182816..f3e0a63 100644
--- a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/components/editDialog.vue
+++ b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/components/editDialog.vue
@@ -10,7 +10,7 @@
>
<el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" >
<el-row :gutter="24">
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="单位名称:" prop="companyId" v-if="state.isAdmin">
<el-select v-model="state.form.companyId" placeholder="请选择" filterable clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom">
<el-option
@@ -20,6 +20,15 @@
:value="item.id">
</el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="年份:" prop="year" >
+ <el-date-picker
+ :disabled="title == '查看'"
+ v-model="state.form.year"
+ type="year"
+ value-format="YYYY"/>
</el-form-item>
</el-col>
</el-row>
@@ -161,6 +170,7 @@
form: {
id: '',
companyId: null,
+ year: '',
questionName: null,
number: '',
unitName: null,
@@ -174,6 +184,7 @@
},
rules: {
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
questionName: [{ required: true, message: '请输入问卷名称', trigger: 'blur' }],
number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
unitName: [{ required: true, message: '请输入单位名称', trigger: 'blur' }],
@@ -259,6 +270,7 @@
state.form.companyName = value.companyName
state.companyList = companyList
}
+ state.form.year = new Date().getFullYear().toString()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
@@ -324,6 +336,7 @@
state.form = {
id: '',
companyId: null,
+ year: '',
questionName: null,
number: '',
unitName: null,
diff --git a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/index.vue b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/index.vue
index 6ca8bff..be783c5 100644
--- a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/index.vue
+++ b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/research/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="margin-bottom: 10px">
- <el-form style="display: flex;flex-wrap: wrap;">
+ <el-form :inline="true" style="display: flex;flex-wrap: wrap;">
<el-form-item>
<el-button
type="primary"
@@ -11,7 +11,13 @@
v-hasPermi="['satisfiedEvalusteResearch:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"/>
+ </el-form-item>
+ <el-form-item label="单位名称:" v-if="data.isAdmin">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -22,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="data.isAdmin">
- <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
+ <el-button type="primary" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
<!-- <el-form-item style="margin-left: 15px">-->
@@ -38,6 +44,7 @@
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column label="名称" prop="questionName" align="center" />
+ <el-table-column label="年份" prop="year" align="center"/>
<el-table-column label="操作" align="center" class-naame="small-padding fixed-width" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -83,7 +90,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
},
companyList: [],
@@ -169,7 +176,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
}
choosedData.value = []
@@ -180,7 +187,7 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
- year: '',
+ year: new Date().getFullYear().toString(),
type: ''
}
}
--
Gitblit v1.9.2