From 1737343f1ac89c5980a268775a201304c47151ca Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 08 八月 2023 19:38:58 +0800
Subject: [PATCH] 个人模块的查看详情电子文件三键

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |   85 +++++++++++++++++++++++++-----------------
 1 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 8756a7e..77800ff 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -21,16 +21,15 @@
                 </el-input>
 
               </el-form-item>
-<!--               <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="78px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">-->
-<!--                 <el-date-picker v-model='formData.happenTime' type='date' placeholder='璇烽�夋嫨鏃ユ湡'></el-date-picker>-->
-<!--               </el-form-item>-->
+
              </el-cow>
              <el-cow >
                <el-form-item label="绫诲埆" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                 <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}"  >
+                 <el-select v-model="formData.type" 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-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
               </el-form-item>
              </el-cow>
              <el-cow >
@@ -90,14 +89,14 @@
               >
               <span class="el-upload-list__item-actions" >
                 <span
-                  v-if="isShow"
+
                   class="el-upload-list__item-preview"
                   @click="handlePictureCardPreview(file)"
                 >
                   <i class="el-icon-zoom-in"></i>
                 </span>
                 <span
-                  v-if="isShow"
+
                   class="el-upload-list__item-delete"
                   @click="handleDownload(file.url)"
                 >
@@ -139,14 +138,14 @@
                 fit="cover"
               >
               <span class="el-upload-list__item-actions">
-                    <span v-if="isShow"
+                    <span
                       class="el-upload-list__item-preview"
                       @click="handleFileCardPreview(file)"
                     >
                       <i class="el-icon-zoom-in"></i>
                     </span>
                     <span
-                      v-if="isShow"
+
                       class="el-upload-list__item-delete"
                       @click="handleDownload(file.url)"
                     >
@@ -186,7 +185,8 @@
 import {blobValidate} from "@/utils/ruoyi";
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
-import {getCollection, updateCollection,download,uploadPic} from "@/api/collection/index";
+import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index";
+
 
 export default {
   components: {},
@@ -195,7 +195,8 @@
     return {
       cdi:"鏀惰棌涓庤崳瑾夎缁嗕俊鎭�",
       udi:"鏀惰棌涓庤崳瑾変俊鎭鎯�",
-      fot:[".jpg",".jif"],
+      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       fileList:[
       ],
       fileListOther:[
@@ -206,7 +207,7 @@
       isShow:true,
       // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
      collectionList: [],
-
+      typeList:[],
       formData: {
         //鏀惰棌涓庤崳瑾夎褰�
         id:undefined,
@@ -267,30 +268,9 @@
         }],
 
       },
-      typeOptions: [
-        {
-          value: '閭エ',
-          label: '閭エ'
-        }, {
-          value: '鏃ユ湰鍐涘垁',
-          label: '鏃ユ湰鍐涘垁'
-        }, {
-          value: '鑼呭彴閰�',
-          label: '鑼呭彴閰�'
-        }, {
-          value: '绾㈡湪',
-          label: '绾㈡湪'
-        }, {
-          value: '绾康鍝�',
-          label: '绾康鍝�'
-        }, {
-          value: '鐡峰櫒',
-          label: '鐡峰櫒'
-        }, {
-          value: '涔︾睄',
-          label: '涔︾睄'
-        }
-      ],
+      typeOptions: [],
+      newOption: undefined,
+      showInput: false
     }
   },
   computed: {},
@@ -303,6 +283,7 @@
       jd =  this.$route.query.detail
       this.btn= jd
       this.dsb = !jd
+      this.showInput=true
       document.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
       this.$route.meta.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
     }
@@ -336,6 +317,15 @@
         }
         this.loading = false;
       });
+      listType(this.queryParams).then(response => {
+          this.typeList = response.data;
+          this.total = response.data.total;
+          // console.log( this.typeList )
+          // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+          this.getTypeOptions();
+          this.loading = false;
+        }
+      );
       // this.getCateInfor()
 
     }
@@ -353,6 +343,31 @@
     //     })
     //   })
     // },
+    //绫诲埆
+    addNewOption() {
+      const newOption = this.newOption.trim();
+      if (newOption && !this.typeOptions.includes(newOption)) {
+        this.typeOptions.push(newOption);
+        this.$set(this.formData, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+      }
+    },
+    getTypeOptions() {
+      const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+      // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+      const uniqueOptions = {};
+      // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+      this.typeOptions = filteredOptions.reduce((options, option) => {
+        if (!uniqueOptions[option]) {
+          uniqueOptions[option] = true;
+          options.push({
+            label: option,
+            value: option
+          });
+        }
+        return options;
+      }, []);
+
+    },
     submitForm() {
       let ul = this.fileList.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")

--
Gitblit v1.9.1