From f16c91bc9b96c415b7129e3eccf29b5b9f93d7a3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 三月 2025 08:29:13 +0800
Subject: [PATCH] 工时查询修改, 样品搜索问题修复
---
src/views/performance/manHour/workTimeStatistics.vue | 6 +++---
src/utils/date.js | 27 +++++++++++++++++++++++++++
src/views/business/productOrder/index.vue | 2 +-
3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/utils/date.js b/src/utils/date.js
index 3f4a780..6d2c1a5 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -51,4 +51,31 @@
return format
}
return ''
+}
+
+/**
+ * 鑾峰彇骞存湀鏃� 26鍙�+1
+ * @param date
+ * @returns {string}
+ */
+export function getYearAndMonthAndDaysZTZB(date = new Date()) {
+ let year = date.getFullYear();
+ let month = date.getMonth();
+ let days = date.getDate();
+
+ // 鍒ゆ柇鏄惁鏄�26鍙�
+ if (days === 26) {
+ month++;
+ if (month > 11) {
+ month = 0;
+ year++;
+ }
+ }
+
+ month += 1;
+ month = month < 10 ? '0' + month + '-' : month + '-';
+ year = year + '-';
+ days = days < 10 ? '0' + days : days;
+
+ return (year + month + days);
}
\ No newline at end of file
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 027fda7..d54ecff 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -8,7 +8,7 @@
</el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О" prop="sampleName">
- <el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small"
+ <el-input v-model="entity.sampleName" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍨嬪彿" prop="sampleModel">
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 9719c9c..422aa61 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -48,7 +48,7 @@
</template>
<script>
-import { getYearAndMonthAndDays } from "@/utils/date";
+import { getYearAndMonthAndDays, getYearAndMonthAndDaysZTZB } from "@/utils/date";
import limsTable from "@/components/Table/lims-table.vue";
import { selectAuxiliaryAllByMonth } from "@/api/performance/manHour";
export default {
@@ -58,7 +58,7 @@
data() {
return {
queryParams: {
- month: getYearAndMonthAndDays().slice(0, 7),
+ month: getYearAndMonthAndDaysZTZB().slice(0, 7),
name: "",
departLims: "",
},
@@ -115,7 +115,7 @@
},
refresh() {
this.queryParams = {
- month: getYearAndMonthAndDays().slice(0, 7),
+ month: getYearAndMonthAndDaysZTZB().slice(0, 7),
name: "",
departLims: "",
};
--
Gitblit v1.9.3