From 18063129485e3aeb998ce3688d0c363931d5b745 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 31 Mar 2022 11:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/uploadFile/file.vue   |  10 +-
 .../library/docDetail/index.vue               | 259 +++++++++---------
 .../components/DocumentLibrary.vue            |  26 +-
 3 files changed, 154 insertions(+), 141 deletions(-)

diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index b6391cf2c..a080fe493 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -5,6 +5,7 @@
         accept='*.*'
         :disabled="disabled"
         class="ant-upload-list"
+        :class="{'uploadFile':isUploadFile}"
         name="file"
         :file-list="myfileList"
         :multiple="true"
@@ -14,10 +15,10 @@
         :before-upload="beforeUpload"
         :remove='remove'
         @change="handleChange">
-        <p>
+        <p v-if="!isUploadFile">
           <a-icon class="action-upload" type="cloud-upload"/>
         </p>
-        <p class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{this.$t('clickUpload')}}</p>
+        <p v-if="!isUploadFile" class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{this.$t('clickUpload')}}</p>
       </a-upload-dragger>
     </a-modal>
   </div>
@@ -31,7 +32,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType'],
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType','isUploadFile'],
     data() {
       return {
         visible: false,
@@ -210,4 +211,7 @@
     font-size: 67px;
     color: #c0c4cc;
   }
+  .uploadFile{
+
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index b224225d4..e1e442237 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -52,67 +52,109 @@
                   <span class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
                         :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                  <span class="text-field-right" v-else-if="ol.field_show_type == 7">
+                     <a-button type="primary" class="button-text"
+                               v-if="ol.value"
+                               @click="clickButtonToUpload(ol.value)">
+                      {{ (ol.value === 'null' || ol.value === '' ||
+                      ol.value == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                      }}
+                    </a-button>
+                    <span v-else>--</span>
+                  </span>
+                  <span @click="relatedClick(ol)" class="text-field-right text-field-right-color"
+                        v-else-if="ol.field_show_type == 10" :title="ol.value">
+                    {{ol.value ? ol.value : '--'}}
+                  </span>
                   <span class="text-field-right" v-else :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
                 </div>
               </div>
-              <div class="TextInformation" v-if="val == $t('textInformation')">
-                <!--                <div class="TextInformationContent" v-for="(ol,index1) in item[val]" style="width: 100%">-->
-                <!--              <span class="TextInformationContentLeft"-->
-                <!--                    :class="{'TextInformationContentLeft-left':-->
-                <!--                    ol.db_field_txt == (item[val][index1-1] && item[val][index1-1].db_field_txt?item[val][index1-1].db_field_txt:'')}">-->
-                <!--                 <span :title="ol.db_field_txt"-->
-                <!--                       v-if=" ol.db_field_txt != (item[val][index1-1] &&-->
-                <!--                        item[val][index1-1].db_field_txt?item[val][index1-1].db_field_txt:'')">-->
-                <!--                   {{ol.db_field_txt}}-->
-                <!--                 </span>-->
-                <!--              </span>-->
-                <!--                  <span style="margin-top: 2px">-->
-                <!--                 <span class="TextInformationContentcontent">-->
-                <!--                         <span style="cursor: pointer" :title="ol.value ? ol.value.fileName:''"-->
-                <!--                               @click="pdfPreview(ol.value)">-->
-                <!--                           {{ol.value ? ol.value.fileName : '&#45;&#45;'}}-->
-                <!--                         </span>-->
-                <!--                </span>-->
-                <!--              <span class="TextInformationContentright">-->
-                <!--                <span v-show="ol.value" @click="download(ol.value)">-->
-                <!--                  <a-icon type="vertical-align-bottom"/>-->
-                <!--                   {{$t('download')}}-->
-                <!--                </span>-->
-                <!--              </span>-->
-                <!--              </span>-->
-                <!--                </div>-->
+              <div class="TextInformation" v-else-if="val == $t('textInformation')">
                 <table class="tableInformation">
                   <tr v-for="(ol,index1) in item[val]" class="trInformation">
                     <td class="tdInformation LeftTdInformation" :rowspan="ol.count"
-                        v-if=" index1 == 0 || (index1 > 0 && ol.db_field_txt != item[val][index1 - 1].db_field_txt) ">
+                        v-if=" index1 == 0 || (index1 > 0 && ol.db_field_txt != item[val][index1 - 1].db_field_txt)">
                       {{ol.db_field_txt}}
                     </td>
-                    <td class="tdInformation conteTdInformation">
-                          <span style="cursor: pointer" :title="ol.value ? ol.value.fileName:''"
+                    <td class="tdInformation conteTdInformation" v-if="ol.field_show_type==='7'">
+                          <span class="leftconteTdInformation" style="cursor: pointer"
+                                :title="ol.value ? ol.value.fileName:''"
                                 @click="pdfPreview(ol.value)">
                       {{ol.value ? ol.value.fileName : '--'}}
                       </span>
                       <span class="Standard-breakdown" v-if="ol.splitFlag == 1" @click="breakdown(ol)">{{$t('StandardBreakdown')}}</span>
-                    </td>
-                    <td class="tdInformation rightTdInformation">
-                       <span v-if="ol.field_show_type==='7'" v-show="ol.value" @click="download(ol.value)">
+                      <span class="rightTdInformation" v-if="ol.field_show_type==='7'" v-show="ol.value"
+                            @click="download(ol.value)">
                            <a-icon type="vertical-align-bottom"/>
                             {{$t('download')}}
                        </span>
                     </td>
+                    <td class="tdInformation TextInformationContentcontentButton" v-else-if="ol.field_show_type==='10'">
+                        <span style="cursor: pointer" @click="relatedClick(ol)" v-if="ol.value"
+                              :title="ol.value">{{ol.value}}</span>
+                      <span style="cursor: pointer" v-else>--</span>
+                    </td>
+                    <td class="tdInformation TextInformationContentcontent" v-else>
+                       <span v-if="ol.urlClick" @click="urlClick(ol)"
+                             :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                      <span :title="ol.value" v-else>{{ol.value ? ol.value:'--'}}</span>
+                    </td>
                   </tr>
                 </table>
               </div>
               <div class="TextInformation" v-else-if="val == $t('relatedInformation')">
-                <div class="TextInformationContent" v-for="(ol,index1) in item[val]" style="width: 100%">
-                   <span class="TextInformationContentLeft">
-                         <span :title="ol.db_field_txt"
-                         >{{ol.db_field_txt}}</span>
-                   </span>
-                  <span class="TextInformationContentcontentButton">
-                         <span style="cursor: pointer" @click="relatedClick(ol)"
-                               :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                <table class="tableInformation">
+                  <tr v-for="(ol,index1) in item[val]" class="trInformation">
+                    <td class="tdInformation LeftTdInformation" :rowspan="ol.count"
+                        v-if=" index1 == 0 || (index1 > 0 && ol.db_field_txt != item[val][index1 - 1].db_field_txt)">
+                      {{ol.db_field_txt}}
+                    </td>
+                    <td class="tdInformation conteTdInformation" v-if="ol.field_show_type==='7'">
+                        <span class="leftconteTdInformation" style="cursor: pointer"
+                              :title="ol.value ? ol.value.fileName:''"
+                              @click="pdfPreview(ol.value)">
+                      {{ol.value ? ol.value.fileName : '--'}}
+                      </span>
+                      <span class="Standard-breakdown" v-if="ol.splitFlag == 1" @click="breakdown(ol)">{{$t('StandardBreakdown')}}</span>
+                      <span class="rightTdInformation" v-if="ol.field_show_type==='7'" v-show="ol.value"
+                            @click="download(ol.value)">
+                           <a-icon type="vertical-align-bottom"/>
+                            {{$t('download')}}
+                       </span>
+                    </td>
+                    <td class="tdInformation TextInformationContentcontentButton" v-else-if="ol.field_show_type==='10'">
+                        <span style="cursor: pointer" @click="relatedClick(ol)" v-if="ol.value"
+                              :title="ol.value">{{ol.value}}</span>
+                      <span style="cursor: pointer" v-else>--</span>
+                    </td>
+                    <td class="tdInformation TextInformationContentcontent" v-else>
+                       <span v-if="ol.urlClick" @click="urlClick(ol)"
+                             :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                      <span :title="ol.value" v-else>{{ol.value ? ol.value:'--'}}</span>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <div class="content-text" v-else>
+                <div class="text-field" v-for="(ol,index1) in item[val]">
+                  <span class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
+                  <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
+                        :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                  <span class="text-field-right" v-else-if="ol.field_show_type == 7">
+                     <a-button type="primary" class="button-text"
+                               v-if="ol.value"
+                               @click="clickButtonToUpload(ol.value)">
+                      {{ (ol.value === 'null' || ol.value === '' ||
+                      ol.value == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                      }}
+                    </a-button>
+                    <span v-else>--</span>
                   </span>
+                  <span @click="relatedClick(ol)" class="text-field-right text-field-right-color"
+                        v-else-if="ol.field_show_type == 10" :title="ol.value">
+                    {{ol.value ? ol.value : '--'}}
+                  </span>
+                  <span class="text-field-right" v-else :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
                 </div>
               </div>
             </div>
@@ -182,14 +224,19 @@
         </span>
       </a-table>
     </a-modal>
+    <uploadFile ref="uploadFile" :isUploadFile="true" :disabled="true"></uploadFile>
   </div>
 </template>
 <script>
   import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
   import { Base64 } from 'js-base64'
+  import uploadFile from '@/components/uploadFile/file'
 
   export default {
     name: 'docIndex',
+    components: {
+      uploadFile
+    },
     data() {
       return {
         url: {
@@ -254,6 +301,17 @@
           }
         })
       },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        getAction('sys/common/getFileInfos', { id: item.id }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
       pdfPreview(fileQuery) {
         let fileName = fileQuery.fileName
         let index1 = fileName.lastIndexOf('.')
@@ -357,6 +415,10 @@
   .highlight-class {
     color: #00B3BE;
   }
+
+  .uploadFile .ant-upload {
+    display: none !important;
+  }
 </style>
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
@@ -450,90 +512,6 @@
           }
         }
       }
-
-      .TextInformation {
-        height: auto;
-
-        .TextInformationContent {
-          height: 56px;
-
-          .TextInformationContentLeft {
-            width: 268px;
-            height: 56px;
-            float: left;
-            border-top: 1px #eff1f3 solid;
-            border-left: 1px #eff1f3 solid;
-            display: inline-block;
-            background: #f7f7f8;
-            text-align: center;
-            color: #040B29;
-            line-height: 56px;
-            font-weight: bold;
-            font-size: 14px;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-          }
-
-          .TextInformationContentLeft-left {
-            border-top: none;
-          }
-
-          .TextInformationContentcontent {
-            width: calc(100% - 388px);
-            float: left;
-            height: 56px;
-            border-top: 1px #eff1f3 solid;
-            border-left: 1px #eff1f3 solid;
-            line-height: 56px;
-            display: inline-block;
-            text-align: center;
-            color: #01A0AC;
-            font-size: 14px;
-            font-weight: 400;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-          }
-
-          .TextInformationContentright {
-            width: 120px;
-            height: 56px;
-            cursor: pointer;
-            float: left;
-            display: inline-block;
-            border-right: 1px #eff1f3 solid;
-            border-top: 1px #eff1f3 solid;
-            line-height: 56px;
-            color: #00B3BE;
-            font-size: 14px;
-            font-weight: 400;
-            text-align: right;
-            padding: 0 20px 0 0;
-            box-sizing: border-box;
-          }
-
-          .TextInformationContentcontentButton {
-            width: calc(100% - 268px);
-            border-top: 1px #eff1f3 solid;
-            border-left: 1px #eff1f3 solid;
-            border-right: 1px #eff1f3 solid;
-            line-height: 56px;
-            display: inline-block;
-            text-align: center;
-            color: #00B3BE;
-            font-size: 14px;
-            font-weight: 400;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-          }
-        }
-
-        .TextInformationContent:last-child {
-          border-bottom: 1px #eff1f3 solid;
-        }
-      }
     }
   }
 
@@ -588,14 +566,17 @@
   }
 
   .conteTdInformation {
-    width: calc(100% - 388px);
     color: #01A0AC;
     font-size: 14px;
     font-weight: 400;
+  }
+
+  .leftconteTdInformation {
+    width: calc(100% - 388px);
+    display: inline-block;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    border-right: none;
   }
 
   .rightTdInformation {
@@ -607,7 +588,9 @@
     text-align: right;
     padding: 0 20px 0 0;
     box-sizing: border-box;
-    border-left: none;
+    display: inline-block;
+    position: absolute;
+    right: 30px;
   }
 
   .Standard-breakdown {
@@ -617,4 +600,26 @@
     margin-top: 1px;
     cursor: pointer;
   }
+
+  .TextInformationContentcontentButton {
+    width: calc(100% - 268px);
+    text-align: center;
+    color: #01A0AC;
+    font-size: 14px;
+    font-weight: 400;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
+  .TextInformationContentcontent {
+    width: calc(100% - 268px);
+    text-align: center;
+    color: #040B29;
+    font-size: 14px;
+    font-weight: 400;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 8c04303db..870399025 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -4,7 +4,7 @@
       <div class="text-left">
         <div class="text-left-wrap" v-for="(item,index) in searchOption" :key="index">
           <div class="text-left-select" v-if="item.field_show_type == '0'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <a-tree-select
               class="text-select"
               v-model="queryParamOne[item.db_field_name]"
@@ -18,18 +18,18 @@
           </div>
           <div class="text-left-select" v-if="item.field_show_type == '1' || item.field_show_type == '8' ||
                      item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <a-input class="text-select"
                      v-model="queryParamOne[item.db_field_name]"
                      :placeholder="$t('PleaseEnter')+item.db_field_txt"/>
           </div>
           <div class="text-left-select" v-if="item.field_show_type == '2'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <a-input-number class="text-select" :placeholder="$t('PleaseEnter')+item.db_field_txt"
                             v-model="queryParamOne[item.db_field_name]" :min="1" :max="99999999"/>
           </div>
           <div class="text-left-select" v-if="item.field_show_type == '3'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <j-dict-select-tag class="text-select" v-model="queryParamOne[item.db_field_name]"
                                :placeholder="$t('PleaseSelect')+item.db_field_txt"
                                :type="'select'"
@@ -38,7 +38,7 @@
                                :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
           <div class="text-left-select" v-if="item.field_show_type == '4'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <j-multi-select-tag class="text-select" v-model="queryParamOne[item.db_field_name]"
                                 :db_field_name="item.db_field_name"
                                 @changeQuery="changeQuery"
@@ -46,14 +46,14 @@
                                 :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
           <div class="text-left-select" v-if="item.field_show_type == '5'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <a-date-picker class="text-select"
                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
                            @change="dateChange(item.db_field_name)"
                            v-model="queryParamOne[item.db_field_name]"/>
           </div>
           <div class="text-left-select" v-if="item.field_show_type == '6'">
-            <span class="text-sel">{{item.db_field_txt}}</span>
+            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <a-range-picker class="text-select" v-model="queryParamOne[item.db_field_name]"
                             :placeholder="$t('PleaseSelect')+item.db_field_txt"
                             @change="onChange(item.db_field_name)"></a-range-picker>
@@ -155,7 +155,7 @@
                         <span style="cursor: pointer" v-html="item.file_name" @click="titleClick(item)"></span>
                       </a-tooltip>
                     </div>
-                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-if="!queryParam.selectValue">
+                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-if="selectModel == ''">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
@@ -164,14 +164,14 @@
                       </div>
                     </a-tooltip>
                     <a-tooltip placement="topLeft" :mouseEnterDelay="0.5"
-                               v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
+                               v-else-if="(item.file_text instanceof Array) && selectModel != ''">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
                       <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
                     </a-tooltip>
                     <a-tooltip placement="topLeft" :mouseEnterDelay="0.5"
-                               v-else-if="!item.file_text && queryParam.selectValue">
+                               v-else-if="!item.file_text && selectModel != ''">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
@@ -678,6 +678,10 @@
     height: 18px !important;
     line-height: 18px !important;
   }
+
+  .text-left-select .ant-select {
+    max-width: calc(100% - 126px) !important;
+  }
 </style>
 <style lang="less" scoped>
 
@@ -708,7 +712,7 @@
               color: #000F16;
               text-align: right;
               margin-right: 14px;
-              width: 83px;
+              width: 112px;
               white-space: nowrap;
               overflow: hidden;
               text-overflow: ellipsis;