From 3549fed09cc87c323ca6c8a3d55c83fc495f4b7e Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 11:55:19 +0800
Subject: [PATCH] 家庭设备的打印功能已经没有问题了 家庭设备详情的时候,不可以上传文件 家谱思维导图可以打击查看信息了

---
 ruoyi-ui/src/views/contacts/contactsInfo.vue |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 740a688..9263e66 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -2,17 +2,9 @@
   <div class="app-container">
     <div class="form-header mt">
       <h4 class="dt h4">閫氳褰曡缁嗕俊鎭� </h4>
-      <!--      <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"-->
-      <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
     </div>
     <div style="padding-left:15px">
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
-      <!--      <el-form-item label="id" 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-container>
          <el-row :span="12">
            <el-cow>
@@ -33,6 +25,7 @@
               </el-input>
             </el-form-item>
            </el-cow>
+
            <el-cow>
             <el-form-item label="宸ヤ綔鍗曚綅" prop="work" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
               <el-input v-model="formData.work" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -74,6 +67,11 @@
             <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>
@@ -84,7 +82,8 @@
         :http-request="requestUpload"
         :file-list="fileList"
       >
-        <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"
@@ -96,14 +95,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)"
         >
@@ -122,7 +121,7 @@
         </div>
       </el-upload>
 
-      <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4>
+     <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
         :file-list="fileListOther"
@@ -130,12 +129,12 @@
         multiple
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
-        :on-remove="handleRemove"
+        :on-remove="handleRemoveFile"
         :http-request="requestUpload"
         :show-file-list="true"
       >
-
-        <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"
@@ -146,20 +145,19 @@
           >
           <span class="el-upload-list__item-actions">
                 <span
-                  v-if="isShow"
+
                   class="el-upload-list__item-preview"
                   @click="handleFileCardPreview(file)"
                 >
                   <i class="el-icon-zoom-in"></i>
                 </span>
                 <span
-                  v-if="isShow"
-                  @click="handleRemove(file)"
-                  class="el-upload-list__item-delete"
 
+                  class="el-upload-list__item-delete"
+                  @click="handleDownload(file.url)"
                 >
-                  <i class="el-icon-download"></i>
-                </span>
+                 <i class="el-icon-download"></i>
+                 </span>
                 <span
                   v-if="isShow"
                   class="el-upload-list__item-delete"
@@ -173,7 +171,7 @@
         </div>
 
 
-      </el-upload>-->
+      </el-upload>
 
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
@@ -208,6 +206,7 @@
       dsb:true,
       btn:false,
       isShow:true,
+      uploading: false,
       // 閫氳褰曡〃鏍兼暟鎹�
       contactList: [],
 
@@ -419,10 +418,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})

--
Gitblit v1.9.1