From f4357cc86cd66e27476bc865b8a61b04c1e7c59a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 23 三月 2024 22:16:07 +0800
Subject: [PATCH] 提交代码

---
 ruoyi-ui/src/views/economy/economyInfo.vue |   61 ++++++++++++++++--------------
 1 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index dd1600a..2d20c79 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -15,8 +15,11 @@
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
 
       <el-form-item label="鍙拌处" prop="type">
-        <el-select v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
-        </el-select>
+       <el-input v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
+        </el-input>
+<!-- 		
+		  <el-select v-model="formData.type" 	filterable clearable  placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
+		        </el-select> -->
       </el-form-item>
       <el-form-item label="鏃堕棿" prop="createTime">
         <el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -215,7 +218,7 @@
       uploadFileList:[],
       uploadFileList1:[],
       fileListOther:[
-      
+
       ],
       dsb:true,
       btn:false,
@@ -321,7 +324,7 @@
         for(let i = 0; i < paths.length; i++)
         {
           if(paths[i]!="") {
-          
+
               let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
           //	alert(pth)
               if (_this.fot.includes(pth) === true)
@@ -340,7 +343,7 @@
                 _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
           		else
           		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-          		
+
           	}
             }
         }
@@ -410,10 +413,10 @@
       			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
       		}
             this.$delete(this.fileListOther,i);
-      
+
       	}
         }
-        
+
         let ul = ""
         this.fileList.map(function (elem){
         		if(elem.res==false)
@@ -430,7 +433,7 @@
       	  updateEconomy(this.formData).then(response => {
       		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       		// this.open = false;
-      	  
+
       	  });
         }
     },
@@ -454,7 +457,7 @@
      		 	//	  alert(this.uploadFileList.length)
      		 }
            this.$delete(this.fileList,i);
-        
+
        }
        }
        let ul = ""
@@ -465,7 +468,7 @@
        let uls = ""
        this.fileListOther.map(function (elem){
          if(elem.res==false)
-     		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+     		uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        })
        this.formData.url = ul+","+uls;
        if(res==true){
@@ -473,7 +476,7 @@
      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
      	  });
        }
-     
+
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -511,11 +514,11 @@
       this.btn = true
       this.isShow=false
     },
-   
+
    //鑷畾涔変笂浼犳柟娉�
        handleChange(file, fileList1) {
           //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-   
+
         // this.uploadFileList.push(file.raw);
          console.log("=========5555=========")
    	  this.uploadFileList.push(file.raw);
@@ -524,7 +527,7 @@
    	//鑷畾涔変笂浼犳柟娉�
    	handleChange1(file, fileListOther1) {
    	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-   	
+
    	     // this.uploadFileList.push(file.raw);
    		 this.uploadFileList1.push(file.raw);
    		  this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -535,7 +538,7 @@
    	},
    	fileUpload(){
    	//	var file = params.file;
-   
+
    		var formData = new FormData();
    		//this.$refs.upload1.submit();
    	//	alert(this.uploadFileList1.length)
@@ -543,14 +546,14 @@
    		if(this.uploadFileList1.length==0){
    			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
    			  return}
-   		
+
    		this.uploadFileList1.forEach((elem)=>{
    			formData.append("files", elem)
-   			
+
    		})
    		console.log(this.uploadFileList1)
    		let _this = this
-   
+
    		this.uploading = true;
    		uploadPic(formData).then(response => {
    		_this.uploadFileList1 = []
@@ -560,25 +563,25 @@
    		      // this.open = false;
    		    });
    		  })
-   
+
    	},
    	picUpload()
    	{
-   
+
    		var formData = new FormData();
    		//this.$refs.upload.submit();
    		//alert(this.uploadFileList.length)
    	if(this.uploadFileList.length==0){
    		  this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
    		  return}
-   
+
    		this.uploadFileList.forEach((elem)=>{
    			formData.append("files", elem)
-   			
+
    		})
    		let _this = this
-   
-   		
+
+
            uploadPic(formData).then(response => {
    			// console.log(response.originalFilenames)
    			// console.log(response.urls)
@@ -605,12 +608,12 @@
              updateEconomy(_this.formData).then(response => {
                _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
                // this.open = false;
-   
+
              });
            // }
            // else{
            //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-   
+
            // }
          });
    	},
@@ -618,10 +621,10 @@
        {
       //  alert(124)
    //	 this.uploadFileList.push(params.file);
-   
+
         //alert(34)
-    
-   	
+
+
        },
        requestUpload1(params)
        {

--
Gitblit v1.9.1