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

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

 ruoyi-ui/src/views/contacts/contactsInfo.vue

@@ -67,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>
@@ -77,7 +82,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"
@@ -89,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)"
        >
@@ -115,102 +121,57 @@
        </div>
      </el-upload>

       <h4 class="form-header">电子文件 </h4>
       <el-upload
         action="#"
         list-type="picture-card"
         multiple
         :http-request="requestUpload"
         :file-list="fileList"
       >
         <i slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
             class="el-upload-list__item-thumbnail"
             :src="file.url"
             alt=""
             style="width: 147px; height: 147px"
             fit="cover"
             :preview-src-list="[file.url]"
           >
           <span class="el-upload-list__item-actions" >
            <span
     <h4 class="form-header">其他附件 </h4>
      <el-upload
        action=""
        :file-list="fileListOther"
        class="upload-demo"
        multiple
        list-type="picture-card"
        :on-preview="handleFileCardPreview"
        :on-remove="handleRemoveFile"
        :http-request="requestUpload"
        :show-file-list="true"
      >
        <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"
            src="../../assets/401_images/401.gif"
            alt=""
            style="width: 147px; height: 147px"
            fit="cover"
          >
          <span class="el-upload-list__item-actions">
                <span

              class="el-upload-list__item-preview"
              @click="handlePictureCardPreview(file)"
            >
              <i class="el-icon-zoom-in"></i>
            </span>
            <span
                  class="el-upload-list__item-preview"
                  @click="handleFileCardPreview(file)"
                >
                  <i class="el-icon-zoom-in"></i>
                </span>
                <span

              class="el-upload-list__item-delete"
              @click="handleDownload(file.url)"
            >
              <i class="el-icon-download"></i>
            </span>
            <span
              v-if="isShow"
              class="el-upload-list__item-delete"
              @click="handleRemove(file)"
            >
              <i class="el-icon-delete"></i>
            </span>
          </span>


         </div>
       </el-upload>

       <h4 class="form-header">其他附件 </h4>
       <el-upload
         action=""
         :file-list="fileListOther"
         class="upload-demo"
         multiple
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
         :on-remove="handleRemoveFile"
         :http-request="requestUpload"
         :show-file-list="true"
       >

         <i slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
             class="el-upload-list__item-thumbnail"
             src="../../assets/401_images/401.gif"
             alt=""
             style="width: 147px; height: 147px"
             fit="cover"
           >
           <span class="el-upload-list__item-actions">
                    <span
                      class="el-upload-list__item-preview"
                      @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span

                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
                  class="el-upload-list__item-delete"
                  @click="handleDownload(file.url)"
                >
                 <i class="el-icon-download"></i>
                 </span>
                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleRemoveFile(file)"
                    >
                      <i class="el-icon-delete"></i>
                    </span>
                  </span>
                <span
                  v-if="isShow"
                  class="el-upload-list__item-delete"
                  @click="handleRemoveFile(file)"
                >
                  <i class="el-icon-delete"></i>
                </span>
              </span>


         </div>
        </div>


       </el-upload>
      </el-upload>

      <el-form-item size="large">
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
@@ -245,6 +206,7 @@
      dsb:true,
      btn:false,
      isShow:true,
      uploading: false,
      // 通讯录表格数据
      contactList: [],

@@ -456,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})