From a4db210c069cd45448067fffb39f070e9d119bb9 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 17:00:32 +0800
Subject: [PATCH] 修改家大事记 的图片文件上传 直调接口

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |   68 ++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 77800ff..e76efca 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -1,7 +1,15 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="printable-content">
     <div class="form-header mt">
-      <h4 class="dt h4">鏀惰棌涓庤崳瑾夎缁嗕俊鎭� </h4>
+      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" >
+        <span>鏀惰棌涓庤崳瑾夎缁嗕俊鎭�</span>
+        <div style="display: flex; align-items: center;">
+        <el-button size="mini" type="text"  v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+        <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
+          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
+      </el-button></div>
+      </h1>
 <!--      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
       <!--      <br>-->
       <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
@@ -17,9 +25,9 @@
            <el-row :span="12">
              <el-cow >
               <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <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-cow>
@@ -67,17 +75,26 @@
               <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
             </el-form-item>
              </el-cow>
+             <el-cow >
+               <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>
+             </el-cow>
+
            </el-row>
          </el-container>
-          <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+          <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
           <el-upload
             action="#"
             list-type="picture-card"
             multiple
             :http-request="requestUpload"
             :file-list="fileList"
+            :disabled="!btn"
+            :class="{ hide: !btn }"
           >
-            <i slot="default" class="el-icon-plus"></i>
+            <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+            <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
               <img
                 class="el-upload-list__item-thumbnail"
@@ -126,9 +143,12 @@
             :on-remove="handleRemoveFile"
             :http-request="requestUpload"
             :show-file-list="true"
+            :disabled="!btn"
+            :class="{ hide: !btn }"
           >
 
-            <i slot="default" class="el-icon-plus"></i>
+            <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+            <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
               <img
                 class="el-upload-list__item-thumbnail"
@@ -185,6 +205,7 @@
 import {blobValidate} from "@/utils/ruoyi";
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
+import {addRole, updateRole} from "@/api/system/role";
 import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index";
 
 
@@ -195,8 +216,7 @@
     return {
       cdi:"鏀惰棌涓庤崳瑾夎缁嗕俊鎭�",
       udi:"鏀惰棌涓庤崳瑾変俊鎭鎯�",
-      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
-        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+      fot:[".jpg",".jif"],
       fileList:[
       ],
       fileListOther:[
@@ -205,6 +225,7 @@
       dsb:true,
       btn:false,
       isShow:true,
+      uploading: false,
       // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
      collectionList: [],
       typeList:[],
@@ -221,6 +242,7 @@
         remark:undefined,
         url: undefined,
       },
+      desurl:'',
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
@@ -284,6 +306,7 @@
       this.btn= jd
       this.dsb = !jd
       this.showInput=true
+      this.isShow=true
       document.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
       this.$route.meta.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
     }
@@ -291,6 +314,7 @@
       document.title = "鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
       this.$route.meta.title = "鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
       this.isShow=false
+      this.btn = false;
     }
 
     let _this = this
@@ -332,17 +356,6 @@
   },
   mounted() {},
   methods: {
-    /** 鏌ヨ绫诲埆淇℃伅 */
-    // getCateInfor()
-    // {
-    //   let _this = this
-    //   getCategory().then(response=>{
-    //
-    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-    //     })
-    //   })
-    // },
     //绫诲埆
     addNewOption() {
       const newOption = this.newOption.trim();
@@ -454,7 +467,7 @@
     handleEdit()
     {
       this.dsb = false
-      // this.btn = true
+      this.btn = true
       this.isShow=false
     },
     requestUpload(params)
@@ -463,10 +476,11 @@
       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})
@@ -511,6 +525,12 @@
   display: block;
   position: absolute;
 }
+.hide .el-upload--picture-card {
+  display: none;
+}
+.form{
+  background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
 .form_item{
   font-size: 12px;
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;

--
Gitblit v1.9.1