From aaef4ba0aacdb30905515ba28943d6f501cf95dd Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 03 四月 2025 18:04:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/reservation/resercopy/index.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index b7d7fd0..fed9291 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -209,6 +209,7 @@
<el-upload
ref="upload"
:limit="1"
+ :key="uploadKey"
accept=".xlsx, .xls"
:headers="upload.headers"
:data="data"
@@ -637,6 +638,7 @@
],
},
ListObj: {},
+ uploadKey:0,
// 閬僵灞�
loading: true,
pacStatus: "鍚敤",
@@ -873,6 +875,8 @@
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
if (this.objs.drugManufacturerId && this.objs.reservationTime) {
+ this.$refs.upload?.clearFiles();
+ this.uploadKey = Date.now(); // 鏀瑰彉 key 寮哄埗閲嶆柊娓叉煋缁勪欢
this.upload.title = "鐢ㄦ埛瀵煎叆";
this.upload.open = true;
} else {
@@ -894,12 +898,12 @@
// 鏂囦欢涓婁紶鎴愬姛澶勭悊
handleFileSuccess(response, file, fileList) {
if (response.code == 500) {
- console.log(22222222222);
+ this.isdisabled = true;
// Message.warning(response.msg);
// this.$modal.msgError(response.msg);
// this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
const errorList = response.data.list.join(", ");
- console.log(errorList)
+
this.$confirm(`${errorList}`, `${response.msg}`, {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -908,6 +912,7 @@
dangerouslyUseHTMLString: true,
});
}else{
+ this.isdisabled = false;
this.ListObj = response.data;
this.userList = response.data.list;
@@ -937,15 +942,17 @@
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
- } else {
- this.isdisabled = false;
- this.$alert(
- "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.msg,
- { dangerouslyUseHTMLString: true }
- );
- this.rightList = response;
- }
+ }
+ // else {
+ // console.log(11111)
+ // this.isdisabled = false;
+ // this.$alert(
+ // "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+ // response.msg,
+ // { dangerouslyUseHTMLString: true }
+ // );
+ // this.rightList = response;
+ // }
for (let i = 0; i < fileList.length; i++) {
if (file.name != fileList[i].name) {
this.fileList.push({
--
Gitblit v1.8.0