修改

dsk-operate-ui/src/assets/styles/index.scss

@@ -121,7 +121,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 16px;
+  //padding: 16px;
   //margin-top: 56px;
 }
 
@@ -223,6 +223,7 @@ ul, li {
 .app-container {
   margin: 12px 24px;
   background-color: #f5f5f5;
+  padding-bottom: 16px !important;
   .el-input__inner{
     border-color: #D9D9D9;
     color: #232323;

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -88,7 +88,7 @@ export default {
   overflow: inherit;
   /*position: relative;*/
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  /*box-shadow: 0 1px 4px rgba(0,21,41,.08);*/
   position: fixed;
   top:0;
   z-index: 999;

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="app-container">
       <el-card class="box-card noborder">
-        <div class="tables">
+        <div class="tables ">
           <div class="empty" v-if="tableData.total==0 && !isSkeleton">
             <img src="@/assets/images/project/empty.png">
             <div class="p1">抱歉，没找到相关数据</div>
@@ -60,7 +60,8 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-show="!isSkeleton&&tableData.total > 0" class="fixed-table" max-height="640" ref="thistables"
+          <div class="table-item">
+            <el-table v-show="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="'always'" ref="thistables"
                       :data="tableData.rows"
                       stripe border
                       style="width: 100%">
@@ -68,7 +69,7 @@
                 prop="index"
                 label="序号"
                 fixed="left"
-              width="47">
+                width="60">
                 <template slot-scope='scope'>
                   <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
                 </template>
@@ -96,7 +97,7 @@
               <el-table-column
                 prop="cooperationProject"
                 label="合作项目"
-              width="76">
+                width="90">
                 <template slot-scope="scope">
                   {{scope.row.cooperationProject || '--'}}
                 </template>
@@ -104,7 +105,7 @@
               <el-table-column
                 prop="followProject"
                 label="跟进项目"
-              width="76">
+                width="90">
                 <template slot-scope="scope">
                   {{scope.row.followProject || '--'}}
                 </template>
@@ -112,7 +113,7 @@
               <el-table-column
                 prop="reserveProject"
                 label="储备项目"
-              width="76">
+                width="90">
                 <template slot-scope="scope">
                   {{scope.row.reserveProject || '--'}}
                 </template>
@@ -136,28 +137,28 @@
               <el-table-column
                 prop="registerCapitalStr"
                 label="注册资本金（万元）"
-              width="140">
+                width="160">
                 <template slot-scope="scope">
                   <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="creditLevel"
-              label="企业主体评级" width="100">
+                label="企业主体评级" width="120">
                 <template slot-scope="scope">
                   {{scope.row.creditLevel || '--'}}
                 </template>
               </el-table-column>
               <el-table-column
                 prop="isOn"
-              label="上市公司" width="76">
+                label="上市公司" width="90">
                 <template slot-scope="scope">
                   {{scope.row.isOn == 1?"是":"否"}}
                 </template>
               </el-table-column>
               <el-table-column
                 prop="isMajor"
-              label="局级大客户" width="88">
+                label="局级大客户" width="90">
                 <template slot-scope="scope">
                 <span v-if="scope.row.isMajor != null">
                 {{scope.row.isMajor == 1?"是":"否"}}
@@ -167,35 +168,35 @@
               </el-table-column>
               <el-table-column
                 prop="customerLevel"
-              label="客户等级" width="76">
+                label="客户等级" width="90">
                 <template slot-scope="scope">
                   {{scope.row.customerLevel || '--'}}
                 </template>
               </el-table-column>
               <el-table-column
                 prop="companyNature"
-              label="客户性质" width="76">
+                label="客户性质" width="90">
                 <template slot-scope="scope">
                   {{scope.row.companyNature || '--'}}
                 </template>
               </el-table-column>
               <el-table-column
                 prop="companyLevel"
-              label="客户级别" width="76">
+                label="客户级别" width="90">
                 <template slot-scope="scope">
                   {{scope.row.companyLevel || '--'}}
                 </template>
               </el-table-column>
               <el-table-column
                 prop="address"
-              label="企业母公司" width="268">
+                label="企业母公司" width="200">
                 <template slot-scope="scope">
                   <div class="">{{scope.row.superCompany || '--'}}</div>
                 </template>
               </el-table-column>
               <el-table-column :key="keys"
                                prop="mainBusiness"
-              label="主营业务" width="400">
+                               label="主营业务" width="300">
                 <template slot-scope="scope">
                   <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
                   <div v-if="scope.row.mainBusiness1">
@@ -207,7 +208,7 @@
               </el-table-column>
               <el-table-column
                 prop="companyAttribute" :key="keys+2"
-              label="发包属性" width="400">
+                label="发包属性" width="300">
                 <template slot-scope="scope">
                   <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
                   <div v-if="scope.row.companyAttribute1">
@@ -225,6 +226,7 @@
                 </template>
               </el-table-column>
             </el-table>
+          </div>
           <div class="bottems" v-if="tableData.total>searchParam.pageSize">
             <el-pagination
               background

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" max-height="640"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="'always'" max-height="640"
             :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -26,7 +26,7 @@
               prop="index"
               label="序号"
               fixed="left"
-              width="47">
+              width="60">
               <template slot-scope='scope'>
                 <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
               </template>
@@ -51,7 +51,7 @@
             <el-table-column
               prop="cooperationProject"
               label="合作项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.cooperationProject || '--'}}
               </template>
@@ -59,7 +59,7 @@
             <el-table-column
               prop="followProject"
               label="跟进项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.followProject || '--'}}
               </template>
@@ -67,7 +67,7 @@
             <el-table-column
               prop="reserveProject"
               label="储备项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.reserveProject || '--'}}
               </template>
@@ -91,7 +91,7 @@
             <el-table-column
               prop="registerCapitalStr"
               label="注册资本金（万元）"
-              width="140">
+              width="160">
               <template slot-scope="scope">
                 <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
               </template>

dsk-operate-ui/src/views/custom/overview/index.vue

@@ -108,7 +108,7 @@
     <div class="content_wap3">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
-          <span class="title">跟进动态</span>
+          <span class="item_title">跟进动态</span>
         </div>
         <div class="flex-box time-label">
           <div class="labels">
@@ -689,14 +689,6 @@
           border: 1px solid #0081FF;
           color: #ffffff;
           background: #0081FF;
-          /*.el-button{*/
-            /*border: 1px solid #0081FF;*/
-            /*span{*/
-              /*color: #ffffff;*/
-              /*background: #0081FF;*/
-              /*border: 1px solid #0081FF;*/
-            /*}*/
-          /*}*/
         }
 
 
@@ -856,7 +848,7 @@
       .query-box{
         padding:16px;
       }
-      .title{
+      .item_title{
         font-weight: 700;
         color: #232323;
         font-size: 16px;

dsk-operate-ui/src/views/detail/groupAccount/component/Sidebar.vue

@@ -53,12 +53,14 @@ export default {
         {title: '集团成员', pathName: 'members'},
         {title: '集团资质', pathName: 'qualifications'},
         {title: '集团业绩', pathName: 'performance'},
+        {title: '集团招标', pathName: 'zhaobiao'},
       ],
       defaultRoute: [],
       customer:[
         'members',
         'qualifications',
         'performance',
+        'zhaobiao',
       ],
       uniqueOpened:false,
       searchIndex: ''

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -171,7 +171,7 @@
         qyType:[],
         cgblList:['100%','50%以上','20%以上','5%以上','1%-5%'],
         cgblName:'',
-        paramsData:[],  //储存组件筛选的条件
+        paramsData:{},  //储存组件筛选的条件
       }
     },
     watch:{
@@ -244,7 +244,7 @@
         }
       },
       handleQuery(params){
-        this.paramsData=params;
+        this.paramsData=params || {};
         this.tableLoading=true
         let data = this.getAreaList(params || this.queryParams)
         memberList(data).then(res=>{
@@ -400,7 +400,11 @@
       },
       sortChange({ column, prop, order }){
         this.queryParams.orderName = prop
-        this.paramsData.orderName = prop
+        this.paramsData.orderName = prop;
+        this.paramsData.combineId = this.customerId;
+        this.paramsData.pageNum = 1;
+        this.paramsData.pageSize = 20;
+
         if(column.order === "ascending"){
           this.queryParams.orderType = 'asc'
           this.paramsData.orderType = 'asc'

dsk-operate-ui/src/views/detail/groupAccount/index.vue

@@ -15,6 +15,7 @@
           <Members v-if="currentPath.pathName=='members'" :customer-id="customerId" :isSkeleton="isSkeleton" />
           <Qualifications v-if="currentPath.pathName=='qualifications'" :customer-id="customerId" :isSkeleton="isSkeleton" :name="name"/>
           <Performance v-if="currentPath.pathName=='performance'" :customer-id="customerId" :isSkeleton="isSkeleton"/>
+          <Zhaobiao v-if="currentPath.pathName=='zhaobiao'" :customer-id="customerId" :isSkeleton="isSkeleton"/>
         </div>
       </div>
     </div>
@@ -27,12 +28,13 @@
   import Members from "./component/members"
   import Qualifications from "./component/qualifications"
   import Performance from "./component/performance"
+  import Zhaobiao from "./component/zhaobiao"
   import { infoHeader } from '@/api/detail/party-a/index'
   import elementResizeDetectorMaker from "element-resize-detector"
   export default {
     name: 'GroupAccount',
     components:{
-      SideBar,Members,Qualifications,Performance
+      SideBar,Members,Qualifications,Performance,Zhaobiao
     },
     data(){
       return{
@@ -83,6 +85,7 @@
     width: 100%;
     background: #FFFFFF;
     border-radius: 4px;
+    margin-bottom: 16px;
   }
   .part-header{
     font-size: 16px;

dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue

 <template>
   <div class="headForm">
-    <div class="flex-box query-box">
+    <div class="flex-box query-box" v-if="title === '集团招标'">
       <div class="flex-box query-params">
         <span class="common-title" v-if="title">{{ title }}</span>
         <div class="headForm-from">
@@ -102,6 +102,7 @@
       </div>
     </div>
   </div>
+
 </template>
 
 <script>

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -149,8 +149,8 @@
 		</div>
 		<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
 
-	  	<div class=" table-item-jf" v-if="!isSkeleton&&tableData.length>0">
-	  	  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" max-height="640"  class="table-item1 fixed-table"  border  highlight-current-row>
+	  	<div class="table-item table-item-jf" v-if="!isSkeleton&&tableData.length>0">
+	  	  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'always'"  class="table-item1 fixed-table"  border  highlight-current-row>
 	  			<el-table-column type="index" label="序号" fixed width="60">
 	  			 <template slot-scope="scope">
 	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
@@ -1194,13 +1194,13 @@ export default {
 				color:#0081FF;
 			}
 			::v-deep .el-table--border .el-table__cell:first-child .cell{
-				padding:0px 8px;
+				padding:0px 8px ;
 				padding-left:12px;
 				font-size: 12px;
 				font-weight: 400;
 			}
 			 ::v-deep .el-table th.el-table__cell > .cell{
-				padding:0px 8px;
+				padding:0px 8px !important;
 				padding-left:12px;
 				font-size: 12px;
 				font-weight: 400;

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -22,6 +22,7 @@
           v-loading="tableLoading"
           :data="tableData"
           border
+          v-horizontal-scroll="'always'"
           highlight-current-row
           @sort-change="sortChange"
           :default-sort = "{prop: 'gdp', order: 'descending'}"

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -20,6 +20,7 @@
           collapse-tags
           clearable></el-cascader>
         <el-input placeholder="输入关键词查询" v-model="queryParams.ename" clearable @clear="handleSearch()">
+          <i slot="prefix" class="el-icon-search"></i>
           <el-button slot="append" @click="handleSearch()">搜索</el-button>
         </el-input>
         <span class="total">共{{tableDataTotal}}条</span>
@@ -31,7 +32,7 @@
           v-loading="tableLoading"
           border
           fit
-          max-height="640"
+          v-horizontal-scroll="'always'"
           @sort-change="sortChange"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"
@@ -353,11 +354,13 @@ export default {
           width: 180px;
           margin-right: 12px;
           height: 32px;
+          line-height: 32px !important;
           .el-input{
             width: 100%;
             height: 32px;
             .el-input__inner{
               height: 32px !important;
+              line-height: 32px !important;
             }
           }
           .el-cascader__tags{
@@ -378,8 +381,20 @@ export default {
           .el-input__suffix{
             margin-top: -1px;
           }
+          .el-icon-search{
+            font-size: 14px;
+            line-height: 32px;
+            color:#0081FF;
+            margin-left: 6px;
+            margin-right: 4px;
+          }
           .el-input__inner:focus{
-            border-color: #e0e0e0;
+            border-color: #0081FF;
+          }
+          .el-input__inner:focus ~.el-input-group__append{
+            border: 1px solid #0081FF;
+            color: #ffffff;
+            background: #0081FF;
           }
           .el-input-group__append{
             width: 60px;
@@ -388,8 +403,7 @@ export default {
             background: #F5F5F5;
             color:#0081FF;
             border-left: 0;
-            border-radius: 0;
-            border-right: 0;
+            border-radius: 2px;
           }
         }
         .total{

dsk-operate-ui/src/views/macro/financing/index.vue

@@ -437,7 +437,6 @@ export default {
     .content{
       background: #ffffff;
       padding: 16px;
-      margin-bottom: 16px;
       border-radius: 4px;
     }
     .common-title{

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -29,14 +29,13 @@
         </div>
       </div>
       <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
-      <!--v-horizontal-scroll="'always'"-->
       <div class="table-item">
         <el-table
           class="fixed-table"
           :data="tableData"
           element-loading-text="Loading"
           @sort-change="sortChange"
-          max-height="640"
+          v-horizontal-scroll="'always'"
           border
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -92,8 +92,8 @@
           </div>
         </div>
         <el-input class="search-input" placeholder="输入企业名称查询" v-model="queryParams.keyword" clearable @clear="handleKeyword()">
-          <template slot="prepend"><i class="el-icon-search"></i></template>
-          <el-button slot="append" @click="handleKeyword">搜索</el-button>
+          <i slot="prefix" class="el-icon-search"></i>
+          <el-button slot="append" @click="handleKeyword()">搜索</el-button>
         </el-input>
       </div>
       <div class="list-box">
@@ -152,7 +152,7 @@
             element-loading-text="Loading"
             @sort-change="sortChange"
             border
-            max-height="640"
+            v-horizontal-scroll="'always'"
             fit
             highlight-current-row
           >
@@ -830,7 +830,6 @@ export default {
     .content{
       background: #ffffff;
       padding: 16px;
-      margin-bottom: 16px;
       border-radius: 4px;
       .search{
         margin-top: 22px;
@@ -907,29 +906,30 @@ export default {
           /*::v-deep .el-input{*/
             width: 235px;
             height: 32px;
-            .el-input__inner:focus{
-              border-color: #e0e0e0;
-            }
-            .el-input-group__prepend:first-child{
-              padding: 0;
-              background-color:#ffffff;
-              border-right: 0;
-              padding-left: 8px;
-              i{
-                color:#0081FF;
-              }
-            }
             .el-input__inner{
-              border-left: 0;
               height: 32px;
               line-height: 32px;
               font-size: 12px;
-              padding-left: 8px;
               border-right: 0;
             }
             .el-input__suffix{
               margin-top: -1px;
             }
+            .el-icon-search{
+              font-size: 14px;
+              line-height: 32px;
+              color:#0081FF;
+              margin-left: 6px;
+              margin-right: 4px;
+            }
+            .el-input__inner:focus{
+              border-color: #0081FF;
+            }
+            .el-input__inner:focus ~.el-input-group__append{
+              border: 1px solid #0081FF;
+              color: #ffffff;
+              background: #0081FF;
+            }
             .el-input-group__append:last-child{
               width: 60px;
               padding: 0;
@@ -937,8 +937,7 @@ export default {
               background: #F5F5F5;
               color:#0081FF;
               border-left: 0;
-              border-radius: 0;
-              border-right: 0;
+              border-radius: 2px;
             }
           /*}*/
         }