修改bug

yz

2021-03-16 46f80d3bd304e7113ae99f53ea37e5a196f04cc8

 src/views/yunpan/zhishou.vue

@@ -38,7 +38,7 @@
              <el-input v-model="folderform.foldername" autocomplete="off" />
            </el-form-item>

            <el-form-item label="上级文件夹名称" prop="parentId">
            <el-form-item label="上级文件夹:" :label-width="formLabelWidth" prop="parentId">
              <treeselect
                v-model="folderform.parentId"
                :multiple="false"
@@ -151,27 +151,27 @@
          width="25%"
          class="add-label"
        >
          <el-form ref="mvfolderform" :model="folderform" :rules="mvrules">
          <el-form ref="mvfolderform" :model="mvfolderform">
            <el-form-item
              label="目录名称:"
              :label-width="formLabelWidth"
              prop="folderid"
            >
              <el-select v-model="folderform.folderid" placeholder="请选择移动的目录">
                <el-option
                  v-for="item in activities"
                  :key="item.id"
                  :value="item.id"
                  :label="item.timestamp"
                />
              </el-select>
              <treeselect
                v-model="mvfolderform.folderid"
                :multiple="false"
                :options="activitiesTree"
                :clear-value-text="$t('common.clear')"
                placeholder=" "
                style="width:100%"
              />
            </el-form-item>
          </el-form>
          <div slot="footer" class="dialog-footer">
            <el-button @click="mvdialogFormVisible = false">取 消</el-button>
            <el-button
              type="primary"
              @click="mvfolder('mvfolderform')"
              @click="mvfolder()"
            >确 定</el-button>
          </div>
        </el-dialog>
@@ -196,13 +196,14 @@
                  </el-tooltip>
                  <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
                    <div style="padding-top: 14px;">
                      <el-image
                        style="width: 100px; height: 80px;margin-top: -10px;"
                        :src="getImg+node.filesid"
                        :preview-src-list="srcList"
                        @click="clickImg(node)"
                      />
                      <el-checkbox v-model="checkedArr[index * rowCount + nodeIndex].isChecked" class="myRedCheckBox">
                        <el-image
                          style="width: 100px; height: 80px"
                          :src="getImg+node.filesid"
                          :preview-src-list="srcList"
                          @click="clickImg(node)"
                        />

                        {{ node.filesname }}
                      </el-checkbox>
                    </div>
@@ -258,7 +259,7 @@
      },
      rowCount: 12,
      mvrules: {
        folderid: [{ required: true, message: '请选择目录', trigger: 'change' }]
        folderid: [{ required: true, message: '请选择目录', trigger: 'blur' }]
      },
      filesUploadUrl: pages.filesUploadUrl,
      fileDate: {
@@ -273,6 +274,9 @@
        foldername: '',
        sort: 0
      },
      mvfolderform: {
        folderid: ''
      },
      rules: {
        foldername: [
          { required: true, message: '请输入文件夹名称', trigger: 'blur' },
@@ -284,7 +288,7 @@
        ],
        sort: [{ required: true, message: '请输入排序', type: 'number', trigger: 'blur' }]
      },
      formLabelWidth: '100px',
      formLabelWidth: '120px',
      beforeIndex: 0,
      fileName: '',
      checkedArr: [],
@@ -343,9 +347,13 @@
            })
            this.updateFileNameFormVisible = false
            this.file.fileName = ''
            var folderid = this.activities[0].id
            if (this.folderform.folderid !== '' && this.folderform.folderid !== null) {
              folderid = this.folderform.folderid
            }
            // 生成查询文件的条件
            var initFileParams = {
              folderid: this.activities[this.beforeIndex].id,
              folderid: folderid,
              filesname: this.fileName
            }
            this.initFile(initFileParams)
@@ -567,7 +575,12 @@
      }
    },
    beforeAvatarUpload(file) {
      this.fileDate.folderid = this.activities[this.beforeIndex].id
      if (this.folderform.folderid === '' || this.folderform.folderid === null) {
        this.fileDate.folderid = this.activities[0].id
      } else {
        this.fileDate.folderid = this.folderform.folderid
      }

      const isLt50M = file.size / 1024 / 1024 < 50
      if (!isLt50M) {
        this.$message.error('上传文件不能超过 50MB!')
@@ -593,9 +606,14 @@
      this.updateNum++
      if (this.updateNum === fileList.length) {
        this.updateNum = 0
        var folderid = this.activities[0].id
        if (this.folderform.folderid !== '' && this.folderform.folderid !== null) {
          folderid = this.folderform.folderid
        }

        // 生成查询文件的条件
        var params = {
          folderid: this.activities[this.beforeIndex].id,
          folderid: folderid,
          filesname: this.fileName
        }
        this.initFile(params)
@@ -621,10 +639,17 @@
          type: 'warning'
        })
      } else {
        var filename = '下载文件'
        if (this.folderform.folderid === '' || this.folderform.folderid === null) {
          filename = this.activities[0].timestamp
        } else {
          filename = this.folderform.foldername
        }

        const loadingInstance = Loading.service({ fullscreen: true })
        // 生成查询文件的条件
        var params = { fileids: checke.join(',') }
        this.$download('hr/filesUpload/download', { ...params }, this.activities[this.beforeIndex].timestamp + '.zip').then(() => {
        this.$download('hr/filesUpload/download', { ...params }, filename + '.zip').then(() => {
          loadingInstance.close()
          this.$message({
            message: '下载成功!',
@@ -664,9 +689,16 @@
      }
    },
    mvfolder(formName) {
      if (this.folderform.folderid === this.activities[this.beforeIndex].id) {
      // if (this.mvfolderform.folderid === this.activities[this.beforeIndex].id) {
      //   this.$message({
      //     message: '文件在同一目录!',
      //     type: 'warning'
      //   })
      //   return
      // }
      if (this.mvfolderform.folderid === '') {
        this.$message({
          message: '文件在同一目录!',
          message: '选择文件夹!',
          type: 'warning'
        })
        return
@@ -683,24 +715,21 @@
          type: 'warning'
        })
      } else {
        this.$refs[formName].validate(valid => {
          if (valid) {
            // 生成查询文件的条件
            var params = { fileids: checke.join(','), folderid: this.folderform.folderid }
            this.$post('hr/filesUpload/mvFiles', { ...params }).then(() => {
              this.$message({
                message: '移动成功!',
                type: 'success'
              })
              this.mvdialogFormVisible = false
              // 生成查询文件的条件
              var initFileParams = {
                folderid: this.activities[this.beforeIndex].id,
                filesname: this.fileName
              }
              this.initFile(initFileParams)
            })
        // 生成查询文件的条件
        var params = { fileids: checke.join(','), folderid: this.mvfolderform.folderid }
        this.$post('hr/filesUpload/mvFiles', { ...params }).then(() => {
          this.$message({
            message: '移动成功!',
            type: 'success'
          })
          this.mvdialogFormVisible = false
          this.mvfolderform.folderid = ''
          // 生成查询文件的条件
          var initFileParams = {
            folderid: this.activities[this.beforeIndex].id,
            filesname: this.fileName
          }
          this.initFile(initFileParams)
        })
      }
    }
@@ -802,8 +831,8 @@
}
.avatar-uploader{
  .el-upload-dragger{
    width: 65px !important;
    height: 65px !important;
    width: 75px !important;
    height: 75px !important;
    .el-icon-upload{
      font-size: 40px;
      color: #8c939d;