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/clean/cleanInfo.vue |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 103 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 92647bc..643c656 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -14,15 +14,19 @@
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
       <el-form-item label="绫诲瀷" prop="kind">
-        <template v-if="dsb">
+        <!-- <template v-if="dsb">
           <el-input v-model="formData.kind === 1 ? '鏀剁撼':'淇濇磥'" :disabled="true"></el-input>
         </template>
         <template v-else>
           <el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}">
-            <el-option label="鏀剁撼" value="1"></el-option>
-            <el-option label="淇濇磥" value="0"></el-option>
+            <el-option label="淇濇磥" value='0'></el-option>
+            <el-option label="鏀剁撼" value='1'></el-option>
           </el-select>
-        </template>
+        </template> -->
+        <el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼 " clearable :style="{width: '100%'}" :disabled="dsb"  >
+          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="绫诲埆" prop="type">
         <el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -223,6 +227,7 @@
 	  uploadFileList1:[],
 	  fileListOther:[
       ],
+      fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
@@ -280,11 +285,11 @@
 
       },
       typeOptions: [{
-        value: '0',
+        value: '淇濇磥',
         label: '淇濇磥',
       },
         {
-          value: '1',
+          value: '鏀剁撼',
           label: '鏀剁撼',
         }],
     }
@@ -315,6 +320,10 @@
       this.loading = true;
       getCLeanInfo(id).then((response) => {
         this.formData = response.data;
+        if(this.formData.kind==1)
+        	this.formData.kind = '鏀剁撼'
+        else
+        	this.formData.kind = '淇濇磥'
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
         {
@@ -350,6 +359,46 @@
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getCLeanInfo(id).then((response) => {
+          this.formData = response.data;
+          if(this.formData.kind==1)
+          	this.formData.kind = '鏀剁撼'
+          else
+          	this.formData.kind = '淇濇磥'
+          let paths = response.data.url.split(",");
+          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)
+            	{
+              console.log()
+            	  }
+                else {
+                  let nms = paths[i].split("\/")
+                  let nm = nms[nms.length - 1]
+            	  if(paths[i][0]=="/")
+                  _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+            		else
+            		_this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+            	}
+              }
+          }
+          _this.fileListOther = _this.fileListOther1
+          this.loading = false;
+        });
+        this.getCateInfor()
+
+      }
+    },
     getSrc1(type) {
       if (type === 0) {
         return '鍩洪噾'
@@ -395,16 +444,27 @@
       // this.formData.url = ul+","+uls
 
       this.$refs['elForm'].validate(valid => {
-
+        if(this.formData.kind=='鏀剁撼')
+        	this.formData.kind = 1
+        else
+        	this.formData.kind = 0
         if (valid) {
           if (this.formData.id != undefined) {
             updateClean(this.formData).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
+              if(this.formData.kind==1)
+              	this.formData.kind = '鏀剁撼'
+              else
+              	this.formData.kind = '淇濇磥'
               // this.open = false;
               this.btn=false
             });
           } else {
             this.$modal.msgSuccess("淇敼澶辫触");
+            if(this.formData.kind==1)
+            	this.formData.kind = '鏀剁撼'
+            else
+            	this.formData.kind = '淇濇磥'
 
           }
         }
@@ -478,8 +538,16 @@
 	  this.formData.url = ul+","+uls;
 	//  alert(this.formData.url)
 	  if(res==true){
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
 		  updateClean(this.formData).then(response => {
 			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      if(this.formData.kind==1)
+      	this.formData.kind = '鏀剁撼'
+      else
+      	this.formData.kind = '淇濇磥'
 			// this.open = false;
 
 		  });
@@ -523,8 +591,16 @@
 	  })
 	  this.formData.url = ul+","+uls;
 	  if(res==true){
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
 		  updateClean(this.formData).then(response => {
 			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      if(this.formData.kind==1)
+      	this.formData.kind = '鏀剁撼'
+      else
+      	this.formData.kind = '淇濇磥'
 		  });
 	  }
 
@@ -551,7 +627,7 @@
 		   this.fileList.push({name:file.name,url:file.url,res:true})
 	    },
 		//鑷畾涔変笂浼犳柟娉�
-		handleChange1(file, fileListOther1) {
+		handleChange1(file, fileListOther12) {
 		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
 
 		     // this.uploadFileList.push(file.raw);
@@ -580,6 +656,11 @@
 			console.log(this.uploadFileList1)
 			let _this = this
 
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
+
 			this.uploading = true;
 			uploadPic(formData).then(response => {
 			_this.uploadFileList1 = []
@@ -587,6 +668,12 @@
 			    updateClean(_this.formData).then(response => {
 			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
 			      // this.open = false;
+            this.getData()
+            this.fileListOther1=[]
+            if(this.formData.kind==1)
+            	this.formData.kind = '鏀剁撼'
+            else
+            	this.formData.kind = '淇濇磥'
 			    });
 			  })
 
@@ -607,7 +694,10 @@
 			})
 			let _this = this
 
-
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
 	        uploadPic(formData).then(response => {
 				// console.log(response.originalFilenames)
 				// console.log(response.urls)
@@ -633,6 +723,10 @@
 	         // alert(87)
 	          updateClean(_this.formData).then(response => {
 	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+              if(this.formData.kind==1)
+              	this.formData.kind = '鏀剁撼'
+              else
+              	this.formData.kind = '淇濇磥'
 	            // this.open = false;
 
 	          });

--
Gitblit v1.9.1