Merge pull request 'master' (#983) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/983

src/components/DetailComponent/FileComponent.vue

@@ -3,7 +3,7 @@
     <el-form-item :label="title" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign"  :style="{marginTop: '10px',marginLeft: tag!=='需求上报'?'15px':'0'}">
       <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
 <!--      :style="{width:isOpenPrint?'610px': '100%'}"  table-layout="auto"  id="printTable"-->
-      <fvTable style="width:100%;max-height: 160px;" v-if="processViewer"  height="160" :tableConfig="tableConfig"
+      <fvTable style="width:100%;max-height: 160px;" v-if="processViewer" :scrollbar-always-on="true" height="160" :tableConfig="tableConfig"
               :data="_value" :isSettingCol="false" :pagination="false">
         <template #empty>
           <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -81,7 +81,9 @@ const tableConfig = reactive({
     {
       prop: 'tag',
       label: '标签',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      minWidth: props.fileNameTableWidth,
     },
     {
       prop: 'size',

src/components/DetailComponent/ProjectAttachment.vue

@@ -36,7 +36,7 @@
                style="margin-left: 10px;">编辑
     </el-button>
   </div>
-  <fvTable style="width: 100%;min-height:311px;max-height: 311px" v-if="showAttachmentTable" height="311"
+  <fvTable style="width: 100%;min-height:311px;max-height: 311px" v-if="showAttachmentTable" height="311" :scrollbar-always-on="true"
            :tableConfig="executeTableConfig" class="execute-apply-table"
            :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
     <template #empty>
@@ -105,6 +105,7 @@ const executeTableConfig = reactive({
       label: '文件名',
       align: 'center',
       width: props.fileNameTableWidth,
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => (
           <div style="color: #2a99ff;cursor: pointer;" onClick={() => clickToPreview(row)}>{row.originalFileName}</div>)
     },
@@ -112,6 +113,7 @@ const executeTableConfig = reactive({
       prop: 'tag',
       label: '标签',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'size',

src/views/project-management/mobledetail/ApprovalDetailMoblie.vue

@@ -5,7 +5,7 @@
     <el-form :model="formData" label-width="auto">
       <file-component
         :title="getTagName(type)+'附件'"
-        :fileNameTableWidth="300"
+        :fileNameTableWidth="150"
         :tag="getTagName(type)"
         v-model:value="formData.fileList"
         :processViewer="processViewer"

src/views/project-management/mobledetail/CollectionDetailMoblie.vue

@@ -52,7 +52,7 @@
         <el-row>
         <el-col :span="24">
           <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件文件"></baseTitle>
-          <file-component title="" tag="需求征集" :fullscreen="true" :fileNameTableWidth="300"
+          <file-component title="" tag="需求征集" :fullscreen="true" :fileNameTableWidth="150"
                           v-model:value="formData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>

src/views/project-management/mobledetail/SpecialFundDetailMobile.vue

@@ -42,7 +42,7 @@
         <baseTitle title="关联项目"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height:160px" height="160" v-if="showTable" :tableConfig="projectTable"
+            <fvTable style="width: 100%;max-height:160px" height="160" v-if="showTable" :scrollbar-always-on="true" :tableConfig="projectTable"
                      :data="formData.projects" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -55,7 +55,7 @@
         <baseTitle title="附件文件"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 160px;" height="160"  v-if="showTable" :tableConfig="fileTable"
+            <fvTable style="width: 100%;max-height: 160px;" height="160"  v-if="showTable":scrollbar-always-on="true"  :tableConfig="fileTable"
                      :data="formData.files" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -134,12 +134,15 @@ const projectTable = reactive({
       prop: 'projectName',
       label: '项目名称',
       align: 'center',
+      showOverflowTooltip: false,
       width: 200,
     },
     {
       prop: 'specialFundAmount',
       label: '项目金额',
       align: 'center',
+      minWidth: 120,
+      showOverflowTooltip: false,
       currentRender:({row})=>{
         return <span>{toThousands(row.specialFundAmount)}</span>
       }

src/views/project-management/mobledetail/SummaryDetailMoblie.vue

@@ -74,7 +74,7 @@
 <!--        </el-col>-->
         <el-col :span="24">
           <file-component
-              tag="需求上报" :fileNameTableWidth="300" :fullscreen="true"
+              tag="需求上报" :fileNameTableWidth="150" :fullscreen="true"
               v-model:value="localFormData.fileList"
               :processViewer="processViewer"
               :file-list-show="fileListShow"

src/views/project-management/mobledetail/index.vue

@@ -26,7 +26,7 @@
                         :preProcessShow="preProcessShow"
                         v-model:value="auditOpinion"/>
         <div v-if="showActive == '30'">
-          <project-attachment fileNameTableWidth="300" :isLineBtn="true"/>
+          <project-attachment fileNameTableWidth="200" :isLineBtn="true"/>
         </div>
         <ApprovalDetail type="execute"
                         v-if="showActive == '40'"