From 6afb98b81fa4b4b3223d53d42a891fb89862d38b Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 14 八月 2023 16:36:29 +0800
Subject: [PATCH] 新增家谱图,完善各模块新增时的电子文件上传功能,在上传期间显示正在上传

---
 ruoyi-ui/src/views/selfeconomy/index.vue |   59 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 8d664ee..8a08a6e 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -68,7 +68,7 @@
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
         </el-form-item>
-
+        <el-cntainer>
           <el-col :span="9" >
             <el-form-item>
               <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
@@ -142,7 +142,7 @@
         </el-row>
       </div>
       <el-table v-loading="loading" :data="selfeconomyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
-        <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
+        <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
         <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
         <el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center">
           <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
@@ -176,22 +176,23 @@
 
           <template slot-scope="scope" >
             <div  @click="handleCheck(scope.row)">
-            <img
-              class="el-upload-list__item-thumbnail"
-              src="../../assets/images/deviceLis.png"
-              alt=""
-              style="width: 35px; height: 35px;"
-              fit="cover"
-              v-if="scope.row.url !== ',' "
-            >
-            <img
-              class="el-upload-list__item-thumbnail"
-              src="../../assets/images/deviceA.png"
-              alt=""
-              style="width: 35px; height: 35px;"
-              fit="cover"
-              v-if="scope.row.url === ','"
-            ></div>
+              <img
+                class="el-upload-list__item-thumbnail"
+                src="../../assets/images/deviceLis.png"
+                alt=""
+                style="width: 35px; height: 35px;"
+                fit="cover"
+                v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+              >
+              <img
+                v-else
+                class="el-upload-list__item-thumbnail"
+                src="../../assets/images/deviceA.png"
+                alt=""
+                style="width: 35px; height: 35px;"
+                fit="cover"
+
+              ></div>
           </template>
         </el-table-column>
         <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
@@ -295,7 +296,8 @@
             :http-request="requestUpload"
             :file-list="fileList"
           >
-            <i slot="default" class="el-icon-plus"></i>
+            <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+            <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
               <img
                 class="el-upload-list__item-thumbnail"
@@ -367,8 +369,7 @@
 
 
   //瀵煎叆鎺ュ彛鍑芥暟
-  import {listSelfEconomy, getSelfEconomyInfo, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
-//   import {enload} from "@/api/doctor";
+  import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
   import {Message} from "element-ui";
 
 
@@ -416,7 +417,7 @@
         dsb:true,
         btn:false,
         fit:['fill'],
-
+        uploading: false,
         formDat: {
           //鐧惧勾蹇冩効璁板綍
           id:undefined,
@@ -701,8 +702,13 @@
         Object.keys(this.formDat).forEach(key => {
           this.formDat[key] = '';
         });
-        this.handleRemove(this.fileList[0]);
-        this.handleRemoveFile(this.fileListOther[0]);
+        for(let i = 0; i <= this.fileList.length; i++)
+        {
+          this.handleRemove(this.fileList[0]);
+        }
+        for(let i = 0; i < this.fileListOther.length; i++){
+          this.handleRemoveFile(this.fileListOther[0]);
+        }
       },
       requestUpload(params)
       {
@@ -710,10 +716,11 @@
         var formData = new FormData();
         formData.append('uploadFile', file);
         let _this = this
-
+        this.uploading = true;
         uploadPic(formData).then(response => {
           let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+          this.uploading = false;
+          this.$modal.msgSuccess("涓婁紶鎴愬姛");
           if(_this.fot.includes(pth) === true)
           {
             _this.fileList.push({name:response.data.fileName, "url":response.data.url})

--
Gitblit v1.9.1