From 039aa6bf6fb6c43209f4a452a62b17833d36f27e Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 17:22:32 +0800
Subject: [PATCH] 修改保洁收纳

---
 ruoyi-ui/src/views/clean/cleanInfo.vue |  162 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 122 insertions(+), 40 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 87e3171..5545b6f 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -13,13 +13,16 @@
     </div>
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
-      <!-- <el-form-item label="搴忓彿" prop="id">
-        <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"
-          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
-      </el-form-item> -->
       <el-form-item label="绫诲瀷" prop="kind">
-        <el-select v-model="formData.kind=== 1 ? '鏀剁撼':'淇濇磥'" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}" :disabled="dsb" >
-        </el-select>
+        <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-select>
+        </template>
       </el-form-item>
       <el-form-item label="绫诲埆" prop="type">
         <el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -41,59 +44,62 @@
         </el-input>
       </el-form-item>
       <el-form-item label="鏃堕棿" prop="happenTime">
-        <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                        :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
-      <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
-        <el-input  v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
-      </el-form-item>
-
 
       <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
       <el-upload
         action="#"
         list-type="picture-card"
         multiple
+        accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
         :http-request="requestUpload"
         :file-list="fileList"
         :disabled="!btn"
         :class="{ hide: !btn }"
+
+
       >
-        <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+        <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+        <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
             class="el-upload-list__item-thumbnail"
             :src="file.url"
             alt=""
-            style="width: 147px; height: 147px"
+            style="width: 100%; height: 100%; object-fit: cover;"
             fit="cover"
             :preview-src-list="[file.url]"
           >
           <span class="el-upload-list__item-actions">
-          <span
-            class="el-upload-list__item-preview"
-            @click="handlePictureCardPreview(file)"
-          >
-            <i class="el-icon-zoom-in"></i>
-          </span>
-          <span
+        <span
 
-            class="el-upload-list__item-delete"
-            @click="handleDownload(file.url)"
-          >
-            <i class="el-icon-download"></i>
-          </span>
-          <span
-            v-if="isShow"
-            class="el-upload-list__item-delete"
-            @click="handleRemove(file)"
-          >
-            <i class="el-icon-delete"></i>
-          </span>
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+<!--          <i class="el-icon-zoom-in"></i>-->
+          <i  class="el-icon-zoom-in"></i>
         </span>
+        <span
+
+          class="el-upload-list__item-delete"
+          @click="handleDownload(file.url)"
+        >
+          <i class="el-icon-download"></i>
+        </span>
+        <span
+          v-if="isShow"
+          class="el-upload-list__item-delete"
+          @click="handleRemove(file)"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
 
 
         </div>
@@ -108,7 +114,7 @@
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
         :on-remove="handleRemoveFile"
-        :http-request="requestUpload"
+        :http-request="requestUpload1"
         :show-file-list="true"
         :disabled="!btn"
         :class="{ hide: !btn }"
@@ -153,6 +159,7 @@
 
       </el-upload>
 
+
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -164,11 +171,12 @@
   </div>
 </template>
 <script>
-import {getCLeanInfo,  uploadPic, download} from "@/api/clean/index";
+import {getCLeanInfo, updateClean, uploadPic, download} from "@/api/clean/index";
 import {addRole, updateRole} from "@/api/system/role";
 import {blobValidate} from "@/utils/ruoyi";
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
+
 
 export default {
   components: {},
@@ -187,6 +195,7 @@
       btn:false,
       isShow:true,
       uploading: false,
+      uploading1: false,
       formData: {
         type: undefined,
         kind: undefined,
@@ -319,6 +328,18 @@
       {
         if(this.fileList[i].url==file.url)
           this.$delete(this.fileList,i);
+        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.formData.url = ul+","+uls;
+        updateClean(this.formData).then(response => {
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          // this.open = false;
+          // this.btn=false
+        });
       }
     },
 
@@ -335,7 +356,7 @@
 
         if (valid) {
           if (this.formData.id != undefined) {
-            updateEconomy(this.formData).then(response => {
+            updateClean(this.formData).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               // this.open = false;
               this.btn=false
@@ -376,13 +397,25 @@
       this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
       myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
     },
-    //鍒犻櫎鍥剧墖
+    //鍒犳枃浠�
     handleRemoveFile(file,) {
 
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
           this.$delete(this.fileListOther,i);
+        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.formData.url = ul+","+uls;
+        updateClean(this.formData).then(response => {
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          // this.open = false;
+          // this.btn=false
+        });
       }
     },
     handleDownload(url) {
@@ -409,11 +442,48 @@
       var formData = new FormData();
       formData.append('uploadFile', file);
       let _this = this
+      this.uploading1 = true;
+
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        this.uploading1= false;
+        console.log(_this.fot.includes(pth))
+        // debugger
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+          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.formData.url = ul+","+uls
+          console.log(this.formData.url)
+          updateClean(this.formData).then(response => {
+            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+            // this.open = false;
+            // this.btn=false
+          });
+        }
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+    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("涓婁紶鎴愬姛");
+        // this.$modal.msgSuccess("涓婁紶鎴愬姛");
         if(_this.fot.includes(pth) === true)
         {
           _this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -422,11 +492,23 @@
 
         else{
           _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+          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.formData.url = ul+","+uls
+          console.log(this.formData.url)
+          updateClean(this.formData).then(response => {
+            this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+            // this.open = false;
+            // this.btn=false
+          });
         }
       })
 
-    }
+    },
 
   }
 }

--
Gitblit v1.9.1