From 87e28c4bc7fe04eb14629482e97541d183c1d067 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 18 五月 2024 16:10:34 +0800
Subject: [PATCH] 修改完除了用户管理的其他报错

---
 ruoyi-ui/src/views/economy/index.vue |  202 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 158 insertions(+), 44 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 411ce05..d14e14a 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -212,7 +212,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="閲戦" prop="balance">
-          <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ラ噾棰�" clearable :style="{width: '100%'}" >
+          <el-input v-model.number="formDat.balance" type="number" placeholder="璇疯緭鍏ラ噾棰�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="鐢ㄩ��" prop="useFor">
@@ -240,6 +240,9 @@
           multiple
           :http-request="requestUpload"
           :file-list="fileList"
+          :on-change="handleChange"
+          :auto-upload="false"
+          	ref="upload"
         >
           <i slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
@@ -271,6 +274,13 @@
 
           </div>
         </el-upload>
+		<el-button
+		         style="margin-left: 10px"
+		         size="small"
+		         type="success"
+
+		         @click="picUpload"
+		       >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -279,17 +289,60 @@
           multiple
 
           :on-remove="handleRemoveFile"
-          :http-request="requestUpload"
           :show-file-list="true"
-        >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
-        </el-upload>
 
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
+		    :http-request="requestUpload1"
+        >
+
+        <i slot="default" class="el-icon-plus"></i>
+                <div slot="file" slot-scope="{file}">
+                  <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+                  <video
+                    v-if="file.url.includes('.mp4')"
+                    class="el-upload-list__item-thumbnail"
+                    :src="file.url"
+                    style="width: 147px; height: 147px"
+                    fit="cover"
+                  ></video>
+                  <img v-else
+                       class="el-upload-list__item-thumbnail"
+                       src="../../assets/images/deviceLis.png"
+                       alt=""
+                       style="width: 100%; height: 100%"
+                       fit="cover"></img>
+
+                  <span class="el-upload-list__item-actions">
+                       <span class="el-upload-list__item-name">{{ file.name }}</span>
+                            <span
+                              class="el-upload-list__item-preview"
+                              @click="handleFileCardPreview(file)"
+                            >
+                              <i class="el-icon-zoom-in"></i>
+                            </span>A
+
+                            <span
+
+                              class="el-upload-list__item-delete"
+                              @click="handleRemoveFile(file)"
+                            >
+                              <i class="el-icon-delete"></i>
+                            </span>
+                      </span>
+
+                </div>
+
+
+        </el-upload>
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -356,9 +409,10 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+	  fileList1:[],
+ 	  uploadFileList: [],
+ 	  uploadFileList1: [],
+	  fileListOther:[],
       dsb:true,
       btn:false,
       uploading: false,
@@ -369,7 +423,7 @@
         usePeople: undefined,
         kind:undefined,
         remark: undefined,
-        url: undefined,
+        url: "",
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
@@ -517,14 +571,22 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
+        {
           this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
       }
     },
     handleRemoveFile(file) {
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
+        {
+
           this.$delete(this.fileListOther,i);
+          this.$delete(this.uploadFileList1,i);
+
+          }
       }
     },
     getCateInfor()
@@ -568,7 +630,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
@@ -624,13 +686,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      this.formDat.url = ul+","+uls
+
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -653,29 +709,87 @@
         this.handleRemoveFile(this.fileListOther[0]);
       }
     },
-    requestUpload(params)
+	handleChange(file, fileList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+	 // this.uploadFileList.push(file.raw);
+	  console.log("=========5555=========")
+	  console.log(file)
+	//  console.log(this.uploadFileList)
+	//  this.fileList = fileList
+	//alert(file)
+	    this.uploadFileList.push(file.raw);
+	     this.fileList.push({name:file.name,url:file.url})
+	//alert(fileList1.length)
+	},
+	handleChange1(file, fileOtherList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	this.uploadFileList1.push(file.raw);
+	 this.fileListOther.push({name:file.name,url:file.url})
+	 // this.uploadFileList.push(file.raw);
+	  console.log("=========5555=========")
+	  //console.log(file)
+	//  console.log(this.uploadFileList)
+	//  this.fileList = fileList
+	},
+	fileUpload(){
+	//	var file = params.file;
+
+		var formData = new FormData();
+		this.$refs.upload1.submit();
+		// formData.append('uploadFile', file);
+		if(this.uploadFileList1.length==0){
+			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+			  return
+		}
+		this.uploadFileList1.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+
+		let _this = this
+
+		this.uploading = true;
+		uploadPic(formData).then(response => {
+		_this.uploadFileList1 = []
+		_this.formDat.url = _this.formDat.url+","+response.fileNames
+		_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+		  })
+
+	},
+	picUpload()
+	{
+		var formData = new FormData();
+		//alert(976)
+		//this.$refs.upload.submit();
+		//alert(8)
+		//alert(this.uploadFileList.length)
+	if(this.uploadFileList.length==0){
+		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+		  return}
+	//console.log(this.uploadFileList)
+		this.uploadFileList.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+		//alert(90)
+		let _this = this
+		//alert(9)
+	    uploadPic(formData).then(response => {
+		//	alert("dds")
+	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+		  _this.uploadFileList = []
+		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+	  });
+	},
+    requestUpload(params) {
+//alert(98)
+ //    this.uploadFileList.push(params.file);
+    },
+    requestUpload1(params)
     {
-      var file = params.file;
-      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})
-
-        }
-
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
-
+		//     this.uploadFileList1.push(params.file);
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {

--
Gitblit v1.9.1