From d5f59f6def2cc7c61db7ef58e5eef622fcf59a26 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 10:45:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/basicData/ApsResourceGroup/index.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/basicData/ApsResourceGroup/index.vue b/src/views/basicData/ApsResourceGroup/index.vue
index 6dd79c3..bf9d6be 100644
--- a/src/views/basicData/ApsResourceGroup/index.vue
+++ b/src/views/basicData/ApsResourceGroup/index.vue
@@ -44,7 +44,7 @@
plain
icon="Upload"
@click="handleImport"
- v-hasPermi="['partPlan:import']"
+ v-hasPermi="['ApsResourceGroup:ApsResourceGroup:import']"
>瀵煎叆</el-button>
</el-col>
<el-col :span="1.5">
@@ -100,9 +100,11 @@
<el-form-item label="鎴鏈哄姞闇�姹傛棩鏈�" prop="requestDate" >
<el-date-picker clearable
v-model="requestDate"
- type="datetime"
+ type="date"
value-format="YYYY-MM-DD HH:mm:ss"
- placeholder="璇烽�夋嫨鏈哄姞闇�姹傛棩鏈�">
+ placeholder="璇烽�夋嫨鏈哄姞闇�姹傛棩鏈�"
+ :disabled-date="disabledDate"
+ >
</el-date-picker>
</el-form-item>
<el-col>
@@ -185,7 +187,16 @@
const exampleHeight = ref("500px");
const uploadRef = ref();
const exampleList = ref([]);
-const requestDate = ref();
+const requestDate = ref(null);
+// 璁＄畻褰撳墠鏃堕棿寰�鍚庢帹 15 澶╃殑鏃ユ湡
+const disabledDate = (time) => {
+ // return time.getTime() > Date.now()
+ // 璁＄畻 15 澶╃殑姣鏁�
+ const fifteenDaysInMillis = 15 * 24 * 60 * 60 * 1000;
+ // 璁＄畻褰撳墠鏃堕棿鍔犱笂 15 澶╁悗鐨勬绉掓暟
+ const maxTime = Date.now() + fifteenDaysInMillis;
+ return time.getTime() > maxTime;
+}
/*** 鐢ㄦ埛瀵煎叆鍙傛暟 */
const upload = reactive({
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -316,7 +327,7 @@
loading.value = false;
});
}
-
+function handleCheckboxChange(){}
// 鍙栨秷鎸夐挳
function cancel() {
open.value = false;
--
Gitblit v1.9.3