Merge remote-tracking branch 'origin/master'

linwenling

2023-09-12 2eec82ffc96ae02a75b18ee2c426f7a162950b95

 ruoyi-ui/src/views/wish/wishInfo.vue

@@ -1,11 +1,15 @@
<template>
  <div class="app-container">
  <div class="app-container" id="printable-content">
    <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>-->
      <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>
    </div>
    <div style="padding-left:15px">
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="120px">
@@ -79,6 +83,8 @@
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
          :disabled="!btn"
          :class="{ hide: !btn }"
        >
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -130,6 +136,8 @@
          :on-remove="handleRemoveFile"
          :http-request="requestUpload"
          :show-file-list="true"
          :disabled="!btn"
          :class="{ hide: !btn }"
        >
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -224,6 +232,7 @@
        remark:undefined,
        url: undefined,
      },
      desurl:'',
      dialogImageUrl: '',
      dialogVisible: false,
      disabled: false,
@@ -292,6 +301,7 @@
      document.title = "百年心愿详细信息";
      this.$route.meta.title = "百年心愿详细信息";//列表的名称
      this.isShow=false
      this.btn = false;
    }

    let _this = this
@@ -479,6 +489,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;