From 2a120264875c70aefcb96327918898fda218c2f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 13:50:04 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/wel/shemi.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index 25f327f..573fae3 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -1,5 +1,6 @@
-<template>
+<template >
<basic-container>
+ <div class="norightmenu">
<avue-crud
:addBtn="false"
:option="option"
@@ -32,7 +33,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" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :size="size" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="disabledDate" @change="createTimeChange"/>
+ <el-date-picker v-model="searchTreeData.createTime" type="daterange" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :size="size" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="createTimeChange"/><!--:disabled-date="disabledDate" 涓嶉渶瑕佺鐢ㄦ棩鏈�-->
</el-col>
<el-col :span="4">
<el-button type="primary" @click="searchTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Search /></el-icon>鎼滅储</el-button>
@@ -60,6 +61,7 @@
<el-button :size="size" text v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2')>-1 && row.isLocked == 1" icon="el-icon-unlock" type="primary" @click="locked(row,false)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button>
</template>
</avue-crud>
+ </div>
<!-- 鏂板鑺傜偣 -->
<el-dialog :title="modalTitle" append-to-body v-model="modalBox">
<avue-form :option="modalOption" v-model="modalForm" @submit="modalSubmit" @reset-change="modalCancel"/>
@@ -647,6 +649,7 @@
},
methods: {
disabledDate(time) {
+ //涓嶉渶瑕佺鐢ㄦ棩鏈�
// 鑾峰彇褰撳墠鏃ユ湡
const today = new Date();
today.setHours(0, 0, 0, 0); // 璁剧疆涓哄綋澶╁紑濮嬫椂闂�
@@ -656,10 +659,11 @@
threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
threeMonthsAgo.setHours(0, 0, 0, 0);
- // 绂佺敤浠婂ぉ涔嬪悗鐨勬棩鏈熷拰涓変釜鏈堝墠鐨勬棩鏈熶箣鍓嶇殑鏃ユ湡
- return time.getTime() > today.getTime() || time.getTime() < threeMonthsAgo.getTime();
+ // 绂佺敤浠婂ぉ涔嬪悗鐨勬棩鏈� 鍗冲彲
+ return time.getTime() > today.getTime() || time.getTime() < threeMonthsAgo.getTime();//
},
createTimeChange(value) {
+ console.log('createTimeChange',value)
this.searchTreeData.createTimeBegin = value[0];
this.searchTreeData.createTimeEnd = value[1];
},
@@ -836,8 +840,7 @@
searchTree() {
if(this.searchTreeData.programStatus.length == 0) return;
if(this.searchTreeData.drawingNo == "") return;
- this.searchTreeData.createTimeBegin = this.searchTreeData.createTime[0];
- this.searchTreeData.createTimeEnd = this.searchTreeData.createTime[1];
+
this.searchTreeData.status = this.searchTreeData.programStatus.join();
axios({
url: '/blade-mdm/program/node/search-list2',
@@ -1250,8 +1253,10 @@
},
mounted() {
let b = this.getBeginDate()
- this.defaultTimeRange = [b,this.getToday()];
- this.searchTreeData.createTime =[b,this.getToday()]
+ //this.defaultTimeRange = [b,this.getToday()];
+ let defTimeRange = [b,this.getToday()];
+ this.searchTreeData.createTime = defTimeRange
+ this.createTimeChange(defTimeRange)
this.tabsOption = this.tabsOption1;
//鑾峰彇nodetype
@@ -1264,6 +1269,9 @@
</script>
<style lang="scss">
+.norightmenu .avue-crud .avue-crud__header {
+ display: none !important;
+ }
.delFile {
color: red;
margin-left: 12px;
--
Gitblit v1.9.3