From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/pet/petnote.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index 99cddf2..17cbe1f 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -60,7 +60,7 @@
</el-upload>
</el-col>
</el-row>
- <el-table v-loading="loading" :data="PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 100%;">
+ <el-table v-loading="loading" border :data="PetNoteList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 100%;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
<el-table-column label="鏃ユ湡" prop="happenTime" sortable width="200px" align="center">
@@ -773,12 +773,12 @@
var file = params.file;
var formData = new FormData();
formData.append('excelImport', file);
- // formData.append('pid', pid); // 娣诲姞瀵煎叆鍒板摢涓� ID 鐨勪俊鎭�
+ formData.append('pid', pid); // 娣诲姞瀵煎叆鍒板摢涓� ID 鐨勪俊鎭�
// console.log(formData,'formDataformDataformData')
// alert(this.pid);
let _this = this;
- enload(formData,this.pid)
+ enload(this.pid,formData)
.then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' });
--
Gitblit v1.9.1