Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

 ruoyi-ui/src/views/note/propertyInfo.vue

@@ -16,7 +16,10 @@
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">

      <el-form-item label="类型" prop="type">
        <el-input v-model="formData.type" placeholder="请输入类型" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        <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"
                     :disabled="item.disabled"></el-option>
        </el-select>
      </el-form-item>

      <el-form-item label="发生时间" prop="happenTime" >
@@ -43,6 +46,9 @@
      <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
@@ -52,7 +58,8 @@
        :http-request="requestUpload"
        :file-list="fileList"
      >
        <i slot="default" class="el-icon-plus"></i>
        <div v-if="uploading" class="upload-status">正在上传...</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"
@@ -64,14 +71,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)"
        >
@@ -102,8 +109,8 @@
        :http-request="requestUpload"
        :show-file-list="true"
      >

        <i slot="default" class="el-icon-plus"></i>
        <div v-if="uploading" class="upload-status">正在上传...</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"
@@ -114,14 +121,14 @@
          >
          <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"

                  class="el-upload-list__item-delete"
                  @click="handleDownload(file.url)"
                >
@@ -175,6 +182,7 @@
      dsb:true,
      btn:false,
      isShow:true,
      uploading: false,
      formData: {

        type: undefined,
@@ -239,7 +247,7 @@
    else{
      document.title = "家庭资产详细信息";
      this.$route.meta.title = "家庭资产详细信息";//列表的名称
      this.isShow=true
      this.isShow=false
    }

    let _this = this
@@ -381,9 +389,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.indexOf(pth) !== -1)
        {
          _this.fileList.push({"name":response.data.fileName, "url":response.data.url})