From 587c89a718c83997a8323fa243cbd59c04e3dbc2 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期一, 14 四月 2025 20:41:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev
---
src/views/basicData/ApsResourceGroup/index.vue | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/src/views/basicData/ApsResourceGroup/index.vue b/src/views/basicData/ApsResourceGroup/index.vue
index 6dd79c3..2c27b4c 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:importData']"
>瀵煎叆</el-button>
</el-col>
<el-col :span="1.5">
@@ -69,7 +69,7 @@
>
</HxlhTable>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" v-model="upload.open" width="90%" append-to-body>
+ <el-dialog :title="upload.title" v-model="upload.open" width="90%" append-to-body @close="dialogCancel">
<el-row :gutter="10">
<el-col>
<div style="border-bottom: 1px solid #ccc;" >
@@ -94,28 +94,6 @@
</div>
</template>
</el-upload>
- </el-col>
- </el-row>
- <el-row style="margin-top: 20px;">
- <el-form-item label="鎴鏈哄姞闇�姹傛棩鏈�" prop="requestDate" >
- <el-date-picker clearable
- v-model="requestDate"
- type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss"
- placeholder="璇烽�夋嫨鏈哄姞闇�姹傛棩鏈�">
- </el-date-picker>
- </el-form-item>
- <el-col>
- <div>
- <el-button
- type="success"
- plain
- icon="Check"
- :disabled="planned"
- @click="uploadParse"
- v-hasPermi="['partPlan:edit']"
- >涓婁紶骞惰В鏋�</el-button>
- </div>
</el-col>
</el-row>
<el-row>
@@ -148,9 +126,29 @@
<h4>鍏变笂浼�<span style="color: blue;">{{ total }}</span>鏉¤祫婧愭睜鏁版嵁</h4>
</div>
</el-col>
+ <el-col>
+ <el-form-item label="鎴鏈哄姞闇�姹傛棩鏈�" prop="requestDate" >
+ <el-date-picker clearable
+ v-model="requestDate"
+ type="date"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨鏈哄姞闇�姹傛棩鏈�"
+ :disabled-date="disabledDate"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
<template #footer>
<div class="dialog-footer">
+ <el-button
+ type="success"
+ plain
+ icon="Check"
+ :disabled="planned"
+ @click="uploadParse"
+ v-hasPermi="['partPlan:edit']"
+ >纭涓婁紶</el-button>
<el-button @click="dialogCancel">鍙� 娑�</el-button>
</div>
</template>
@@ -185,7 +183,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 +323,7 @@
loading.value = false;
});
}
-
+function handleCheckboxChange(){}
// 鍙栨秷鎸夐挳
function cancel() {
open.value = false;
@@ -494,7 +501,7 @@
isError.value = false;
planned.value = true;
upload.open = false;
-
+ upload.isUploading = false;
}
getList();
--
Gitblit v1.9.3