Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/File.vue

@@ -38,7 +38,6 @@
             class="form-upload-btn"
         >
 <!--          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
-          上传
         </el-button>
       </template>
       <el-dialog
@@ -347,7 +346,12 @@ export default {
     handlePreview(file) {
       const attId = file.response.data.id
       if (this.preview) {
-
+        if (attId) {
+          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else {
         this.getBusStandFileByAttId(attId)
                 .then(res => {
                   console.log(res)
@@ -381,12 +385,6 @@ export default {
           console.log(e)
           this.$message.warning('文件不存在,预览失败')
         })
-      } else {
-        if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
-        } else {
-          this.$message.warning('文件不存在,下载失败')
-        }
       }
     },
 

src/components/CustomFormComponents/SelectArray.vue

@@ -16,6 +16,7 @@
         multiple
         @change="handleChange"
       >
+<!--        <el-option value="全选" label="全选" @click.native="clickOption"></el-option>-->
         <el-option
           v-for="opt in options"
           :key="opt.value"
@@ -73,6 +74,7 @@ export default {
     handleChange (event) {
       // const value = event.target.value
       this.$emit('input', event)
+
     }
   },
   watch: {