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

@@ -2,57 +2,78 @@
  <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-container>
         <el-row :span="12">
           <el-cow>
            <el-form-item label="家人姓名" prop="myName" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.myName" placeholder="请输入家人姓名" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="通讯录中称呼" prop="nickName" label-width="110px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.nickName" placeholder="请输入通讯录中称呼" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
             <el-form-item label="姓名" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>

    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
      <!--      <el-form-item label="id" prop="id">-->
      <!--        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"-->
      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
      <!--      </el-form-item>-->
      <el-form-item label="成员姓名" prop="myName">
        <el-input v-model="formData.myName" placeholder="请输入成员姓名" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="称呼" prop="nickName">
        <el-input v-model="formData.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="姓名" prop="name">
        <el-input v-model="formData.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="工作单位" prop="work">
        <el-input v-model="formData.work" placeholder="请输入具体位置" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="手机" prop="phone">
        <el-input v-model="formData.phone" placeholder="请输入手机" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="微信" prop="wx">
        <el-input v-model="formData.wx" placeholder="请输入微信" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="QQ" prop="qq">
        <el-input v-model="formData.qq" placeholder="请输入QQ" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="twitter" prop="twitter">
        <el-input v-model="formData.twitter" placeholder="请输入twitter" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="是否常联系" prop="isAlways">
        <el-input v-model="formData.isAlways === 1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <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-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">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="手机" prop="phone" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.phone" placeholder="请输入手机" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="微信" prop="wx" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.wx" placeholder="请输入微信" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="QQ" prop="qq" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.qq" placeholder="请输入QQ" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="twitter" prop="twitter" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.twitter" placeholder="请输入twitter" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="是否常联系" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.isAlways === 1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="备注（是否存在金钱关系）" prop="remark" label-width="180px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
            <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>
      <el-upload
        action="#"
@@ -61,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"
@@ -73,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)"
        >
@@ -99,7 +121,7 @@
        </div>
      </el-upload>

      <!--<h4 class="form-header">其他附件 </h4>
     <h4 class="form-header">其他附件 </h4>
      <el-upload
        action=""
        :file-list="fileListOther"
@@ -107,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">正在上传...</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"
@@ -123,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"
@@ -150,13 +171,13 @@
        </div>


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

      <el-form-item size="large">
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>

    </div>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
@@ -164,7 +185,7 @@
</template>

<script>
import {getContactList, getContactIdList, addContact,updateContact, download,delContact,uploadPic} from "@/api/contacts/index";
import {getContactIdList, updateContact, download,uploadPic} from "@/api/contacts/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
@@ -185,6 +206,7 @@
      dsb:true,
      btn:false,
      isShow:true,
      uploading: false,
      // 通讯录表格数据
      contactList: [],

@@ -216,7 +238,7 @@

        myName: [{
          required: true,
          message: '请输入成员姓名',
          message: '请输入家人姓名',
          trigger: 'blur'
        }],
        nickName: [{
@@ -259,8 +281,8 @@
      this.$route.meta.title = "修改通讯录详细信息";//列表的名称
    }
    else{
      document.title = "查看通讯录详细信息";
      this.$route.meta.title = "查看通讯录详细信息";//列表的名称
      document.title = "通讯录详细信息";
      this.$route.meta.title = "通讯录详细信息";//列表的名称
      this.isShow=false
    }

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