From 0635bee38e19c94c1a4843c8e4944bbef339e320 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 9 Mar 2022 16:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/libraryAddForm/index.vue    | 18 +++++++++++-------
 jero-web/src/components/uploadFile/file.vue    | 10 +++++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue
index 12db366eb..6c54e23c0 100644
--- a/jero-web/src/components/libraryAddForm/index.vue
+++ b/jero-web/src/components/libraryAddForm/index.vue
@@ -80,6 +80,7 @@
                   <a-date-picker class="box-input"
                                  :placeholder="$t('PleaseSelect')+item.db_field_txt"
                                  @change="dateChange(item)"
+                                 :disabledDate="disabledDate"
                                  format="YYYY-MM-DD"
                                  v-model="formInline[item.db_field_name]"
                                  :disabled="disabled"
@@ -115,9 +116,9 @@
                     formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
-<!--                  <span class="button-text-text" v-if="formInline[item.db_field_name]">-->
-<!--                    {{formInline[item.db_field_name].split(',').length}}-->
-<!--                  </span>-->
+                  <!--                  <span class="button-text-text" v-if="formInline[item.db_field_name]">-->
+                  <!--                    {{formInline[item.db_field_name].split(',').length}}-->
+                  <!--                  </span>-->
                 </a-form-model-item>
               </div>
             </a-col>
@@ -292,6 +293,9 @@
 
     },
     methods: {
+      disabledDate(current) {
+        return current && current < moment().subtract(1,"day");
+      },
       sumber() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
@@ -327,7 +331,7 @@
       onChange(item) {
         let dateOne = moment(this.formInline[item][0]).format('YYYY-MM-DD')
         let dateTwo = moment(this.formInline[item][1]).format('YYYY-MM-DD')
-        this.formInline[item] =dateOne ? [dateOne, dateTwo] : []
+        this.formInline[item] = dateOne ? [dateOne, dateTwo] : []
       },
 
       clickButtonToUpload(current) {
@@ -402,10 +406,10 @@
           }
           if (res.field_show_type === '1' || res.field_show_type === '2' ||
             res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10'
-            || res.field_show_type === '11'){
+            || res.field_show_type === '11') {
             rule.push({
               max: res.db_length,
-              message: res.db_field_txt+'不能超出'+res.db_length+'个字符',
+              message: res.db_field_txt + '不能超出' + res.db_length + '个字符',
               trigger: 'blur'
             })
           }
@@ -458,7 +462,7 @@
       },
       StandardselectionChange(value, id) {
         this.formInline[value + '_id'] = id
-        this.formInline = {...this.formInline}
+        this.formInline = { ...this.formInline }
       }
     }
   }
diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index aae9857dd..57f86bb91 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -10,6 +10,7 @@
         :multiple="true"
         :action='uploadAction'
         :headers="headers"
+        @preview="preview"
         :before-upload="beforeUpload"
         :remove='remove'
         @change="handleChange">
@@ -25,6 +26,7 @@
 <script>
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
 
   export default {
     name: 'file',
@@ -114,7 +116,6 @@
         })
       },
       mypreview(item) {
-        console.log(item)
         let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
         window.open(url, '_blank')
       },
@@ -193,6 +194,13 @@
       resetFileList() {
         this.myfileList = []
         this.fileList = []
+      },
+      preview(file) {
+        if (file.response) {
+          downloadFile('/sys/common/download', file.response.result.fileName, { id: file.response.result.id })
+        } else {
+          downloadFile('/sys/common/download', file.fileName, { id: file.id })
+        }
       }
     }
   }