From 70ecfcddb4a414e58cdde6dcb8246b7b80ed9ed8 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期三, 23 七月 2025 14:14:09 +0800 Subject: [PATCH] yys 人事,质量,设备增加时间筛选 --- src/views/personnelManagement/employeeRecord/index.vue | 23 ++++ src/views/equipmentManagement/repair/index.vue | 34 ++++++ src/views/qualityManagement/rawMaterialInspection/index.vue | 24 ++++ src/views/equipmentManagement/ledger/index.vue | 22 ++++ src/views/qualityManagement/finalInspection/index.vue | 23 ++++ src/views/personnelManagement/contractManagement/index.vue | 23 ++++ src/views/personnelManagement/dimission/index.vue | 32 ++++++ src/views/qualityManagement/nonconformingManagement/index.vue | 23 ++++ src/views/qualityManagement/processInspection/index.vue | 24 ++++ src/views/personnelManagement/onboarding/index.vue | 31 ++++++ 10 files changed, 251 insertions(+), 8 deletions(-) diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue index 275f0fb..ba17f7e 100644 --- a/src/views/equipmentManagement/ledger/index.vue +++ b/src/views/equipmentManagement/ledger/index.vue @@ -41,6 +41,10 @@ @change="getTableData" /> </el-form-item> + <el-form-item label="褰曞叆鏃ユ湡:"> + <el-date-picker v-model="filters.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> + </el-form-item> <el-form-item> <el-button type="primary" @click="getTableData">鎼滅储</el-button> <el-button @click="resetFilters">閲嶇疆</el-button> @@ -101,6 +105,7 @@ import { onMounted, getCurrentInstance } from "vue"; import Modal from "./Modal.vue"; import { ElMessageBox, ElMessage } from "element-plus"; +import dayjs from "dayjs"; defineOptions({ name: "璁惧鍙拌处", @@ -223,6 +228,17 @@ }); }; +const changeDaterange = (value) => { + if (value) { + filters.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + filters.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } else { + filters.entryDateStart = undefined; + filters.entryDateEnd = undefined; + } + getTableData(); +}; + const handleOut = () => { ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", { confirmButtonText: "纭", @@ -238,6 +254,12 @@ }; onMounted(() => { + filters.entryDate = [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ] + filters.entryDateStart = dayjs().format("YYYY-MM-DD") + filters.entryDateEnd = dayjs().add(1, "day").format("YYYY-MM-DD") getTableData(); }); </script> diff --git a/src/views/equipmentManagement/repair/index.vue b/src/views/equipmentManagement/repair/index.vue index 2840bd4..6cae307 100644 --- a/src/views/equipmentManagement/repair/index.vue +++ b/src/views/equipmentManagement/repair/index.vue @@ -41,6 +41,24 @@ @change="getTableData" /> </el-form-item> + <el-form-item label="鎶ヤ慨鏃ユ湡"> + <el-date-picker + v-model="filters.repairTimeStr" + type="date" + placeholder="璇烽�夋嫨鎶ヤ慨鏃ユ湡" + size="default" + @change="(date) => handleDateChange(date,2)" + /> + </el-form-item> + <el-form-item label="缁翠慨鏃ユ湡"> + <el-date-picker + v-model="filters.maintenanceTimeStr" + type="date" + placeholder="璇烽�夋嫨缁翠慨鏃ユ湡" + size="default" + @change="(date) => handleDateChange(date,1)" + /> + </el-form-item> <el-form-item> <el-button type="primary" @click="getTableData">鎼滅储</el-button> <el-button @click="resetFilters">閲嶇疆</el-button> @@ -208,6 +226,22 @@ ] ); +// type === 1 缁翠慨 2鎶ヤ慨闂� +const handleDateChange = (value,type) => { + filters.maintenanceTimeStr = null + filters.c = null + if(type === 1){ + if (value) { + filters.maintenanceTimeStr = dayjs(value).format("YYYY-MM-DD"); + } + }else{ + if (value) { + filters.repairTimeStr = dayjs(value).format("YYYY-MM-DD"); + } + } + getTableData(); +}; + // 澶氶�夊悗鍋氫粈涔� const handleSelectionChange = (selectionList) => { multipleList.value = selectionList; diff --git a/src/views/personnelManagement/contractManagement/index.vue b/src/views/personnelManagement/contractManagement/index.vue index 46a73e1..57d7ec4 100644 --- a/src/views/personnelManagement/contractManagement/index.vue +++ b/src/views/personnelManagement/contractManagement/index.vue @@ -11,6 +11,9 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px" class="search_title">鍚堝悓缁撴潫鏃ユ湡锛�</span> + <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -44,10 +47,17 @@ import FormDia from "@/views/personnelManagement/contractManagement/components/formDia.vue"; import {ElMessageBox} from "element-plus"; import {staffOnJobListPage} from "@/api/personnelManagement/employeeRecord.js"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { staffName: "", + entryDate: [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ], // 褰曞叆鏃ユ湡 + entryDateStart: dayjs().format("YYYY-MM-DD"), + entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"), }, }); const { searchForm } = toRefs(data); @@ -174,6 +184,15 @@ const formDia = ref() const { proxy } = getCurrentInstance() +const changeDaterange = (value) => { + searchForm.value.entryDateStart = undefined; + searchForm.value.entryDateEnd = undefined; + if (value) { + searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -187,7 +206,9 @@ }; const getList = () => { tableLoading.value = true; - staffOnJobListPage({...page, ...searchForm.value,}).then(res => { + const params = { ...searchForm.value, ...page }; + params.entryDate = undefined + staffOnJobListPage(params).then(res => { tableLoading.value = false; tableData.value = res.data.records page.total = res.data.total; diff --git a/src/views/personnelManagement/dimission/index.vue b/src/views/personnelManagement/dimission/index.vue index 3b5ca2b..6e20b1e 100644 --- a/src/views/personnelManagement/dimission/index.vue +++ b/src/views/personnelManagement/dimission/index.vue @@ -11,6 +11,22 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px;" class="search_title">鍚堝悓寮�濮嬫棩鏈燂細</span> + <el-date-picker + v-model="searchForm.entryDateStart" + type="date" + placeholder="璇烽�夋嫨鍚堝悓寮�濮嬫棩鏈�" + size="default" + @change="(date) => handleDateChange(date,1)" + /> + <span style="margin-left: 10px;" class="search_title">鍚堝悓缁撴潫鏃ユ湡锛�</span> + <el-date-picker + v-model="searchForm.entryDateEnd" + type="date" + placeholder="璇烽�夋嫨鍚堝悓缁撴潫鏃ユ湡" + size="default" + @change="(date) => handleDateChange(date,2)" + /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -44,6 +60,7 @@ import FormDia from "@/views/personnelManagement/dimission/components/formDia.vue"; import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js"; import {ElMessageBox} from "element-plus"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { @@ -173,6 +190,21 @@ const formDia = ref() const { proxy } = getCurrentInstance() + +const handleDateChange = (value,type) => { + searchForm.value.entryDateEnd = null + searchForm.value.entryDateStart = null + if(type === 1){ + if (value) { + searchForm.value.entryDateStart = dayjs(value).format("YYYY-MM-DD"); + } + }else{ + if (value) { + searchForm.value.entryDateEnd = dayjs(value).format("YYYY-MM-DD"); + } + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { diff --git a/src/views/personnelManagement/employeeRecord/index.vue b/src/views/personnelManagement/employeeRecord/index.vue index a7389a5..6965e96 100644 --- a/src/views/personnelManagement/employeeRecord/index.vue +++ b/src/views/personnelManagement/employeeRecord/index.vue @@ -11,6 +11,9 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px" class="search_title">鍚堝悓缁撴潫鏃ユ湡锛�</span> + <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -44,10 +47,17 @@ import FormDia from "@/views/personnelManagement/employeeRecord/components/formDia.vue"; import {ElMessageBox} from "element-plus"; import {staffOnJobListPage} from "@/api/personnelManagement/employeeRecord.js"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { staffName: "", + entryDate: [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ], // 褰曞叆鏃ユ湡 + entryDateStart: dayjs().format("YYYY-MM-DD"), + entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"), }, }); const { searchForm } = toRefs(data); @@ -174,6 +184,15 @@ const formDia = ref() const { proxy } = getCurrentInstance() +const changeDaterange = (value) => { + searchForm.value.entryDateStart = undefined; + searchForm.value.entryDateEnd = undefined; + if (value) { + searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -187,7 +206,9 @@ }; const getList = () => { tableLoading.value = true; - staffOnJobListPage({...page, ...searchForm.value, staffState: 1}).then(res => { + const params = { ...searchForm.value, ...page }; + params.entryDate = undefined + staffOnJobListPage({...params, staffState: 1}).then(res => { tableLoading.value = false; tableData.value = res.data.records page.total = res.data.total; diff --git a/src/views/personnelManagement/onboarding/index.vue b/src/views/personnelManagement/onboarding/index.vue index 2254175..d36f2e5 100644 --- a/src/views/personnelManagement/onboarding/index.vue +++ b/src/views/personnelManagement/onboarding/index.vue @@ -11,6 +11,22 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px;" class="search_title">鍚堝悓寮�濮嬫棩鏈燂細</span> + <el-date-picker + v-model="searchForm.entryDateStart" + type="date" + placeholder="璇烽�夋嫨鍚堝悓寮�濮嬫棩鏈�" + size="default" + @change="(date) => handleDateChange(date,1)" + /> + <span style="margin-left: 10px;" class="search_title">鍚堝悓缁撴潫鏃ユ湡锛�</span> + <el-date-picker + v-model="searchForm.entryDateEnd" + type="date" + placeholder="璇烽�夋嫨鍚堝悓缁撴潫鏃ユ湡" + size="default" + @change="(date) => handleDateChange(date,2)" + /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -44,6 +60,7 @@ import FormDia from "@/views/personnelManagement/onboarding/components/formDia.vue"; import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js"; import {ElMessageBox} from "element-plus"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { @@ -174,6 +191,20 @@ const formDia = ref() const { proxy } = getCurrentInstance() +const handleDateChange = (value,type) => { + searchForm.value.entryDateEnd = null + searchForm.value.entryDateStart = null + if(type === 1){ + if (value) { + searchForm.value.entryDateStart = dayjs(value).format("YYYY-MM-DD"); + } + }else{ + if (value) { + searchForm.value.entryDateEnd = dayjs(value).format("YYYY-MM-DD"); + } + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue index 6fc90de..e8dcee6 100644 --- a/src/views/qualityManagement/finalInspection/index.vue +++ b/src/views/qualityManagement/finalInspection/index.vue @@ -11,6 +11,9 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px" class="search_title">妫�娴嬫棩鏈燂細</span> + <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -48,10 +51,17 @@ import {ElMessageBox} from "element-plus"; import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js"; import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { productName: "", + entryDate: [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ], // 褰曞叆鏃ユ湡 + entryDateStart: dayjs().format("YYYY-MM-DD"), + entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"), }, }); const { searchForm } = toRefs(data); @@ -145,6 +155,15 @@ const inspectionFormDia = ref() const { proxy } = getCurrentInstance() +const changeDaterange = (value) => { + searchForm.value.entryDateStart = undefined; + searchForm.value.entryDateEnd = undefined; + if (value) { + searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -158,7 +177,9 @@ }; const getList = () => { tableLoading.value = true; - qualityInspectListPage({...page, ...searchForm.value, inspectType: 2}).then(res => { + const params = { ...searchForm.value, ...page }; + params.entryDate = undefined + qualityInspectListPage({...params, inspectType: 2}).then(res => { tableLoading.value = false; tableData.value = res.data.records page.total = res.data.total; diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue index 319cfd5..d3ac667 100644 --- a/src/views/qualityManagement/nonconformingManagement/index.vue +++ b/src/views/qualityManagement/nonconformingManagement/index.vue @@ -28,6 +28,9 @@ :prefix-icon="Search" /> </div> + <span style="margin-left: 10px" class="search_title">妫�娴嬫棩鏈燂細</span> + <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button> </div> <div> @@ -61,12 +64,19 @@ import {ElMessageBox} from "element-plus"; import {qualityUnqualifiedDel, qualityUnqualifiedListPage} from "@/api/qualityManagement/nonconformingManagement.js"; import InspectionFormDia from "@/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { inspectType: "", inspectState: "", productName: "", + entryDate: [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ], // 褰曞叆鏃ユ湡 + entryDateStart: dayjs().format("YYYY-MM-DD"), + entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"), }, }); const { searchForm } = toRefs(data); @@ -200,6 +210,15 @@ const inspectionFormDia = ref() const { proxy } = getCurrentInstance() +const changeDaterange = (value) => { + searchForm.value.entryDateStart = undefined; + searchForm.value.entryDateEnd = undefined; + if (value) { + searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -213,7 +232,9 @@ }; const getList = () => { tableLoading.value = true; - qualityUnqualifiedListPage({...page, ...searchForm.value}).then(res => { + const params = { ...searchForm.value, ...page }; + params.entryDate = undefined + qualityUnqualifiedListPage(params).then(res => { tableLoading.value = false; tableData.value = res.data.records page.total = res.data.total; diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue index c8a0ddd..04ed1f3 100644 --- a/src/views/qualityManagement/processInspection/index.vue +++ b/src/views/qualityManagement/processInspection/index.vue @@ -11,6 +11,9 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px" class="search_title">妫�娴嬫棩鏈燂細</span> + <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -48,10 +51,17 @@ import {ElMessageBox} from "element-plus"; import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js"; import FilesDia from "@/views/qualityManagement/processInspection/components/filesDia.vue"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { process: "", + entryDate: [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ], // 褰曞叆鏃ユ湡 + entryDateStart: dayjs().format("YYYY-MM-DD"), + entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"), }, }); const { searchForm } = toRefs(data); @@ -149,7 +159,15 @@ const filesDia = ref() const inspectionFormDia = ref() const { proxy } = getCurrentInstance() - +const changeDaterange = (value) => { + searchForm.value.entryDateStart = undefined; + searchForm.value.entryDateEnd = undefined; + if (value) { + searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -163,7 +181,9 @@ }; const getList = () => { tableLoading.value = true; - qualityInspectListPage({...page, ...searchForm.value, inspectType: 1}).then(res => { + const params = { ...searchForm.value, ...page }; + params.entryDate = undefined + qualityInspectListPage({...params, inspectType: 1}).then(res => { tableLoading.value = false; tableData.value = res.data.records page.total = res.data.total; diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue index 9732bc9..bbee1bc 100644 --- a/src/views/qualityManagement/rawMaterialInspection/index.vue +++ b/src/views/qualityManagement/rawMaterialInspection/index.vue @@ -11,6 +11,9 @@ clearable :prefix-icon="Search" /> + <span style="margin-left: 10px" class="search_title">妫�娴嬫棩鏈燂細</span> + <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange" + placeholder="璇烽�夋嫨" clearable @change="changeDaterange" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px" >鎼滅储</el-button > @@ -48,10 +51,17 @@ import {ElMessageBox} from "element-plus"; import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js"; import FilesDia from "@/views/qualityManagement/rawMaterialInspection/components/filesDia.vue"; +import dayjs from "dayjs"; const data = reactive({ searchForm: { supplier: "", + entryDate: [ + dayjs().format("YYYY-MM-DD"), + dayjs().add(1, "day").format("YYYY-MM-DD"), + ], // 褰曞叆鏃ユ湡 + entryDateStart: dayjs().format("YYYY-MM-DD"), + entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"), }, }); const { searchForm } = toRefs(data); @@ -149,7 +159,15 @@ const filesDia = ref() const inspectionFormDia = ref() const { proxy } = getCurrentInstance() - +const changeDaterange = (value) => { + searchForm.value.entryDateStart = undefined; + searchForm.value.entryDateEnd = undefined; + if (value) { + searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD"); + searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD"); + } + getList(); +}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -163,7 +181,9 @@ }; const getList = () => { tableLoading.value = true; - qualityInspectListPage({...page, ...searchForm.value, inspectType: 0}).then(res => { + const params = { ...searchForm.value, ...page }; + params.entryDate = undefined + qualityInspectListPage({...params, inspectType: 0}).then(res => { tableLoading.value = false; tableData.value = res.data.records page.total = res.data.total; -- Gitblit v1.9.3