From 8f767255e3ee00b7e9cf70bc8680b4358c430d13 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 15:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/basicData/ApsResourceGroup/index.vue | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/src/views/basicData/ApsResourceGroup/index.vue b/src/views/basicData/ApsResourceGroup/index.vue
index 29c423e..2c27b4c 100644
--- a/src/views/basicData/ApsResourceGroup/index.vue
+++ b/src/views/basicData/ApsResourceGroup/index.vue
@@ -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,30 +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="date"
- value-format="YYYY-MM-DD HH:mm:ss"
- placeholder="璇烽�夋嫨鏈哄姞闇�姹傛棩鏈�"
- :disabled-date="disabledDate"
- >
- </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>
@@ -150,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>
@@ -505,7 +501,7 @@
isError.value = false;
planned.value = true;
upload.open = false;
-
+ upload.isUploading = false;
}
getList();
--
Gitblit v1.9.3