评标助手

dsk-operate-ui/src/views/supplier/components/BatchImport.vue

@@ -122,16 +122,17 @@ import {importTemplate} from '@/api/supplier/assistant.js';
       importConfirmClick() {
         if (this.fileList.length > 0) {
           this.$refs["upload"].submit();
-          this.visible = false
+          this.visible = false;
           this.$emit("loadingFn")
         } else {
           this.$message("请先选择文件");
         }
       },
       importCancel(){
-        this.isUpload = false
-        this.addsuccess = false
-        this.fileList = []
+        this.isUpload = false;
+        this.visible = false;
+        this.addsuccess = false;
+        this.fileList = [];
         this.$emit('cancels')
       },
     }

dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue

@@ -74,7 +74,8 @@
                     <div class=" table-item-jf table-item " >
                         <div class="title_box">
                             <img :src="item.logoUrl?item.logoUrl:require('@/assets/images/enterprise.png')" >
-                            <span class="name_box" v-html="item.ename"></span>
+                            <router-link v-if="item.jskEid" :to="`/enterprise/${encodeStr(item.jskEid)}`" tag="a" class="name_box" v-html="item.ename"></router-link>
+                            <span v-else class="name_box" v-html="item.ename" ></span>
                             <span class="float_r">符合条件资质（{{ item.size }}）<span v-if="item.size>5" class="show_more" @click="showClick(item)">查看所有 ></span></span>
                         </div>
                         <el-table :data="item.aptitudeListude" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
@@ -115,8 +116,9 @@
                             </el-table-column>
                             <el-table-column label="经营范围" width="415">
                                 <template slot-scope="scope">
-                                    <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
-                                
+                                    <el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
+                                        <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
+                                    </el-tooltip>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -133,7 +135,8 @@
             <div class=" table-item-jf table-item " >
                 <div class="title_box">
                     <img src="@/assets/images/enterprise.png" >
-                    <span class="name_box" v-html="ename"></span>
+                    <span v-if="jskEid"  @click="linkTo(`/enterprise/${encodeStr(jskEid)}`)" class="name_box" v-html="ename"></span>
+                    <span v-else class="name_box" v-html="ename" ></span>
                     <span class="float_r">共有 <span style="color: #0081FF;">{{ dialogData.total }}</span> 个资质</span>
                 </div>
                 <el-table :data="dialogData.list" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'" class="table-item1 fixed-table" border highlight-current-row>
@@ -173,8 +176,9 @@
                     </el-table-column>
                     <el-table-column label="经营范围" width="415">
                         <template slot-scope="scope">
-                            <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
-                        
+                            <el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
+                                <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
+                            </el-tooltip>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -210,16 +214,19 @@ import skeleton from '@/views/project/projectList/component/skeleton';
 import ExportDialog from "@/views/component/export-dialog"
 import BatchImport from "./BatchImport"
 import aptitudeCode from '@/assets/json/aptitudeCode.json';
+import { encodeStr } from "@/assets/js/common.js";
 
 export default {
     components: { skeleton,ExportDialog,BatchImport },
     data(){
         return{
+            encodeStr,
             params:{},
             successDialog:false,
             loading:false,
             batchImport:false,
             ename: '',
+            jskEid:'',
             aptitudeDtoList: [
                 {
                     nameStr: '',
@@ -294,6 +301,10 @@ export default {
         this.search(1)
     },
     methods:{
+        linkTo(url){
+            this.showMore = false;
+            this.$router.push(url)
+        },
         reUpload(){
             this.$refs.batchImport.visible = true;
             this.successDialog = false
@@ -352,6 +363,7 @@ export default {
                 "limit": this.pageSize1
             }
             this.ename = item.ename;
+            this.jskEid = item.jskEid;
             params.eid=item.jskEid;
             this.params1 = params
             enterpriseAptitude(params).then(res=>{
@@ -462,8 +474,13 @@ export default {
     }
 }
 </script>
-
-<style lang="scss" scoped>  
+<style lang="scss">
+.el-tooltip__popper{
+        margin: 30px;
+    }
+</style>
+<style lang="scss" scoped> 
+    
     ::v-deep .search_aptittude_success_dialog{
         border-radius: 4px;
         .el-dialog__header{
@@ -574,8 +591,8 @@ export default {
                 }
             }
 
-            .content_item_list {
-                width: 280px;
+            ::v-deep .content_item_list {
+                width: 405px;
                 height: 32px;
                 line-height: 32px;
             }
@@ -594,6 +611,7 @@ export default {
                 .item_ckquery_btn{
                     height: 32px;
                     line-height: 32px;
+                    margin-left: 12px;
                     top: 1px;
                     border-color: #DCDFE6;
                     color: rgba(35, 35, 35, 0.8);
@@ -752,6 +770,7 @@ export default {
             .title_box{
                 font-size: 14px;
                 color: #232323;
+                margin-bottom: 12px;
                 .name_box{
                     font-size: 16px;
                     font-weight: 700;