Merge remote-tracking branch 'origin/master'

luoyb

2021-03-17 fa855a79a71e83de4eab26779fb29e6c6f0c52a2

 src/views/user/archivesEdit.vue

@@ -1273,13 +1273,6 @@
            </div>
            <div class="jbxxCon">
              <div class="zs-main">
                <!--                <el-row class="search-title">-->
                <!--                  <el-col :span="18" class="title">-->
                <!--                    &lt;!&ndash;                  <div class="zs-title">上传附件</div>&ndash;&gt;-->
                <!--                    <p />-->
                <!--                  </el-col>-->

                <!--                </el-row>-->
                <el-container style="background-color: #fff;">
                  <el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
                    <h4 style="margin-top: 0">{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
@@ -1378,21 +1371,34 @@
                    <el-main style="background-color: #fff;margin-top: 5%;">
                      <el-row v-for="(data, index) in filesUploadData" :key="index">
                        <template v-for="(node, nodeIndex) in data.node">
                          <el-col v-if="node.isUpload === false" :key="node.filesid" :span="3">
                          <el-col v-if="node.isUpload === false" :key="node.accessoryid" :span="3">
                            <el-card
                              shadow="never"
                              @click.native="clickCard(index * 8 + nodeIndex)"
                            >
                              <img
                              <el-image
                                v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1"
                                :src="showFileImg(node.filesformat)"
                                class="uploading-image"
                              >
                              <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
                                :preview-src-list="srcList"
                                @click="clickImg(node)"
                              />
                              <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;text-align: center">
                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
                                </div>
                              </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-checkbox
                                    v-model="checkedArr[index * 8 + nodeIndex].isChecked"
                                    class="myRedCheckBox"
                                  >{{ node.filesname }}
                                  <el-image
                                    style="width: 100px; height: 80px;margin-top: -10px;"
                                    :src="getImg+node.accessoryid"
                                    :preview-src-list="srcList"
                                    @click="clickImg(node)"
                                  />
                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">

                                    {{ node.filesname }}
                                  </el-checkbox>
                                </div>
                              </el-tooltip>
@@ -3618,7 +3624,9 @@
      arbitrationTypeOptions: [],
      changeTypeOptions: [],
      dimissionTypeOptions: [],
      sexOptions: []
      sexOptions: [],
      srcList: [],
      getImg: pages.getAccessoryImage
    }
  },
  computed: {
@@ -3709,6 +3717,12 @@
    })
  },
  methods: {
    clickImg(node) {
      this.srcList = []
      if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
        this.srcList.push(this.getImg + node.accessoryid)
      }
    },
    typeFormat(row, column) {
      return this.selectDictLabel(this.physicalExamTypeOptions, row.physicalExamType)
    },
@@ -3793,6 +3807,10 @@
    },
    showFileImg(type) {
      switch (type) {
        case 'xls':
          return require('../../assets/uploading/xls.png')
        case 'xlsx':
          return require('../../assets/uploading/xls.png')
        case 'txt':
          return require('../../assets/uploading/txt.png')
        case 'apk':