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

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

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

@@ -177,6 +177,10 @@
          <span v-if="scope.row.isAlways== null">——</span>
        </template>
      </el-table-column>
      <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
      </el-table-column>


      <el-table-column label="备注（是否存在金钱关系）" prop="remark" sortable width="120" align="center">
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
@@ -279,8 +283,10 @@
          </el-input>
        </el-form-item>
        <el-form-item label="是否常联系" prop="isAlways">
          <el-input v-model="formDat.isAlways" placeholder="是否常联系" clearable :style="{width: '100%'}" >
          </el-input>
          <el-select v-model="formDat.isAlways" placeholder="请选择是否常联系" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>

        <el-form-item label="备注（是否存在金钱关系）" prop="remark">
@@ -295,7 +301,7 @@
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
         <i  slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
@@ -337,6 +343,7 @@
          :show-file-list="true"
        >
          <el-button type="primary">点击上传</el-button>
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <template #tip>
            <div class="el-upload__tip">
            </div>
@@ -411,7 +418,7 @@
      dsb:true,
      btn:false,
      fit:['fill'],

      uploading: false,
      formDat: {
        //通讯录
        id:undefined,
@@ -523,7 +530,14 @@
          trigger: 'blur'
        }],
      },
      typeOptions: [],
      typeOptions: [{
        value: '1',
        label: '是',
      },
        {
          value: '0',
          label: '否',
        }],
    };
  },
  created() {
@@ -720,10 +734,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})