From 02aad919c193a50948cfdd6bef5bf50882578baf Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:30:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/basesetting/machine.vue | 20 +++++++++++++-------
src/views/wel/shemi.vue | 16 +++++++++++++++-
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 999f9ce..bebb42f 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -27,14 +27,16 @@
@on-load="onLoad"
>
<template #menu-left>
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
+ <div class="menuLeft">
+ <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
+ <el-upload :show-file-list="false" class="upload-demo"
+ action="/api/blade-mdm/machine/import"
+ :on-change="handleChange">
+ <el-button type="primary" plain size="default">瀵煎叆</el-button>
+ </el-upload>
+ <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
+ </div>
- <el-upload :show-file-list="false" class="upload-demo"
- action="/api/blade-mdm/machine/import"
- :on-change="handleChange">
- <el-button type="primary" plain size="default">瀵煎叆</el-button>
- </el-upload>
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">缂栬緫</el-button>
@@ -540,4 +542,8 @@
margin-left: 6px;
margin-right: 6px;
}
+.menuLeft {
+ display: flex;
+ align-items: center;
+}
</style>
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index c6272e5..b26c484 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -32,7 +32,7 @@
</el-col>
<el-col :span="8" class="search-data-flex">
<span class="search-data-title">鏃堕棿鑼冨洿:</span>
- <el-date-picker v-model="searchTreeData.createTime" type="daterange" range-separator="To" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :size="size" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="createTimeChange"/>
+ <el-date-picker v-model="searchTreeData.createTime" type="daterange" range-separator="To" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :size="size" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="disabledDate" @change="createTimeChange"/>
</el-col>
<el-col :span="8">
<el-button type="primary" @click="searchTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Search /></el-icon>鎼滅储</el-button>
@@ -644,6 +644,19 @@
},
methods: {
+ disabledDate(time) {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const today = new Date();
+ today.setHours(0, 0, 0, 0); // 璁剧疆涓哄綋澶╁紑濮嬫椂闂�
+
+ // 鑾峰彇涓変釜鏈堝墠鐨勬棩鏈�
+ const threeMonthsAgo = new Date();
+ threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
+ threeMonthsAgo.setHours(0, 0, 0, 0);
+
+ // 绂佺敤浠婂ぉ涔嬪悗鐨勬棩鏈熷拰涓変釜鏈堝墠鐨勬棩鏈熶箣鍓嶇殑鏃ユ湡
+ return time.getTime() > today.getTime() || time.getTime() < threeMonthsAgo.getTime();
+ },
createTimeChange(value) {
this.searchTreeData.createTimeBegin = value[0];
this.searchTreeData.createTimeEnd = value[1];
@@ -829,6 +842,7 @@
this.$nextTick(() => {
this.highlightTargetRow(); // 璁剧疆褰撳墠琛岄珮浜�
this.tabsForm = this.targetRow; //tabs鑺傜偣淇℃伅
+ if(this.tabsForm == null) return;
this.nodeTypeList.forEach(item=> {
if(item.dictKey == this.tabsForm.nodeType) {
this.tabsForm.nodeTypeName = item.dictValue;
--
Gitblit v1.9.3