From eaafc29bc72b22b59b95b54c27d1a3113b3e7871 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期三, 23 四月 2025 14:42:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev
---
src/views/basicData/processRoute/index.vue | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/views/basicData/processRoute/index.vue b/src/views/basicData/processRoute/index.vue
index 204dc6f..38a4cd4 100644
--- a/src/views/basicData/processRoute/index.vue
+++ b/src/views/basicData/processRoute/index.vue
@@ -68,7 +68,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;" >
@@ -93,20 +93,6 @@
</div>
</template>
</el-upload>
- </el-col>
- </el-row>
- <el-row style="margin-top: 20px;">
- <el-col>
- <div>
- <el-button
- type="success"
- plain
- icon="Check"
- :disabled="planned"
- @click="uploadParse"
- v-hasPermi="['processRoute:processRoute:confirmProcessRoute']"
- >涓婁紶骞惰В鏋�</el-button>
- </div>
</el-col>
</el-row>
<el-row>
@@ -142,6 +128,14 @@
</el-row>
<template #footer>
<div class="dialog-footer">
+ <el-button
+ type="success"
+ plain
+ icon="Check"
+ :disabled="planned"
+ @click="uploadParse"
+ v-hasPermi="['processRoute:processRoute:confirmProcessRoute']"
+ >纭涓婁紶</el-button>
<el-button @click="dialogCancel">鍙� 娑�</el-button>
</div>
</template>
@@ -268,6 +262,7 @@
align:"center",
}
]);
+
// 琛ㄦ牸閰嶇疆-寮圭獥
const exampleColumns = ref([
{ type: 'seq', title: '搴忓彿', width: 60 },
@@ -547,6 +542,7 @@
isError.value = false;
planned.value = true;
upload.open = false;
+ upload.isUploading = false;
}
getList();
</script>
--
Gitblit v1.9.3