Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-common/src/main/java/com/dsk/common/core/domain/model/IndexBigBidPageBody.java

 package com.dsk.common.core.domain.model;
 
+import com.dsk.common.utils.DateUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -17,11 +18,11 @@ public class IndexBigBidPageBody extends BasePage
     /**
      * 开始时间
      */
-    private Date timeStart;
+    private Date timeStart = DateUtils.addDays(new Date(), -7);
     /**
      * 截止时间
      */
-    private Date timeEnd;
+    private Date timeEnd = new Date();
     /**
      * 金额起 默认2亿
      */

dsk-common/src/main/java/com/dsk/common/core/domain/model/IndexBigWinningBidsPageBody.java

 package com.dsk.common.core.domain.model;
 
+import com.dsk.common.utils.DateUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -16,11 +17,11 @@ public class IndexBigWinningBidsPageBody extends BasePage {
     /**
      * 开始时间
      */
-    private Date timeStart;
+    private Date timeStart = DateUtils.addDays(new Date(), -7);
     /**
      * 截止时间
      */
-    private Date timeEnd;
+    private Date timeEnd = new Date();
     /**
      * 金额起 默认2亿
      */

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

@@ -189,7 +189,7 @@
     }
 
     .main-container {
-      margin-left: 54px;
+      margin-left: 48px;
     }
 
     .submenu-title-noDropdown {

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

@@ -54,6 +54,7 @@
         :forData="forData"
         :tableDataTotal="tableDataTotal"
         :queryParams="queryParams"
+        :MaxPage=500
         @handle-current-change="handleCurrentChange"
         @sort-change="sortChange"
       >
@@ -91,13 +92,13 @@
           companyType:'',
         },
         forData: [
-          {label: '企业名称', prop: 'companyName', minWidth: '200', slot: true},
+          {label: '企业名称', prop: 'companyName', minWidth: '250', slot: true},
           {label: '成员层级', prop: 'combineMemberLevel', minWidth: '100'},
           {label: '法定代表人', prop: 'corporatePerson', minWidth: '100'},
           {label: '注册资本', prop: 'regCapital', minWidth: '150', sortable: 'custom', descending: '3', ascending: '4'},
-          {label: '持股比例', prop: 'stockPercent', minWidth: '150', slot: true, sortable: 'custom', descending: '3', ascending: '4'},
-          {label: '成立日期', prop: 'registeredDate', minWidth: '150'},
-          {label: '企业地区', prop: 'address', minWidth: '150'},
+          {label: '持股比例', prop: 'stockPercent', minWidth: '100', slot: true, sortable: 'custom', descending: '3', ascending: '4'},
+          {label: '成立日期', prop: 'registeredDate', minWidth: '100'},
+          {label: '企业地区', prop: 'address', minWidth: '200'},
         ],
         formData: [
           { type: 4, fieldName: 'combineMemberLevels', value: '', placeholder: '成员层级', options:[]},
@@ -244,9 +245,11 @@
       },
       handleQuery(params){
         this.paramsData=params;
+        this.tableLoading=true
         let data = this.getAreaList(params || this.queryParams)
         memberList(data).then(res=>{
           this.isSkeleton = false
+          this.tableLoading = false
           if(res.code === 200){
             this.tableData = res.rows
             this.tableDataTotal = res.total
@@ -315,6 +318,7 @@
           this.paramsData.companyType=this.queryParams.companyType
           this.paramsData.companyTypes=this.queryParams.companyTypes
           this.paramsData.pageNum =1
+          this.queryParams.pageNum =1
         }
         this.handleQuery(this.paramsData ? this.paramsData : this.queryParams);
       },
@@ -328,6 +332,7 @@
           if(this.paramsData){
             this.paramsData.companyType=this.queryParams.companyType
             this.paramsData.pageNum =1
+            this.queryParams.pageNum =1
           }
         }
         if(key === '2'){
@@ -361,6 +366,7 @@
             this.paramsData.minStockPercent=this.queryParams.minStockPercent
             this.paramsData.maxStockPercent=this.queryParams.maxStockPercent
             this.paramsData.pageNum =1
+            this.queryParams.pageNum =1
           }
         }
         this.handleQuery(this.paramsData ? this.paramsData : this.queryParams);
@@ -368,7 +374,6 @@
       getAreaList(params){
         if(params.province&&params.province.length>0){
           let arr = this.$children[0].$refs.cascader[0].getCheckedNodes()
-          console.log(this.$children[0].$refs.cascader)
           let provinceIds = [], cityIds = [], districtIds = []
           for (var i in arr) {
             if (arr[i].parent) {
@@ -406,6 +411,18 @@
         this.pageIndex = 1;
         this.handleQuery()
       },
+      //分页
+      handleCurrentChange(e){
+        let params = this.formParams()
+        params.pageNum = e
+        this.queryParams.pageNum = e
+        this.handleQuery(params)
+        setTimeout(() => {
+          this.$nextTick(() => {
+            this.$children[1].$refs.tableRef.bodyWrapper.scrollTop = 0
+          });
+        }, 500);
+      },
     }
   }
 </script>
@@ -468,7 +485,7 @@
           .wrap_label{
             color: rgba(35,35,35,0.8);
             margin-right: 12px;
-            line-height: 30px;
+            line-height: 24px;
             width: 77px;
             text-align: right;
             /*float: left;*/

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

@@ -19,6 +19,7 @@
       :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
+      :MaxPage=500
       :tableDataTotal="tableDataTotal"
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
@@ -39,6 +40,12 @@
         <router-link :to="scope.row.projectUnitUipId?`/enterprise/${encodeStr(scope.row.projectUnitId)}`:`/company/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.projectUnit" v-html="scope.row.projectUnit"></router-link>
         <div v-else v-html="scope.row.projectUnit || '--'"></div>
       </template>
+      <template slot="stockPercent" slot-scope="scope">
+        <div>{{scope.row.stockPercent || '--'}}{{scope.row.stockPercent ?  '%':''}}</div>
+      </template>
+      <template slot="bidAmount" slot-scope="scope">
+        <div>{{scope.row.bidAmount || '--'}}{{scope.row.bidAmount ?  '万元':''}}</div>
+      </template>
     </tables>
   </div>
 </template>
@@ -67,9 +74,9 @@
         forData: [
           {label: '中标时间', prop: 'bidTime',slot: true,minWidth: '80'},
           {label: '中标成员', prop: 'companyName', slot: true,minWidth: '190'},
-          {label: '持股比例（%）', prop: 'stockPercent',minWidth: '95'},
+          {label: '持股比例', prop: 'stockPercent',slot: true,minWidth: '95'},
           {label: '项目名称', prop: 'projectName', slot: true,minWidth: '260'},
-          {label: '中标金额（万元）', prop: 'bidAmount',minWidth: '110'},
+          {label: '中标金额', prop: 'bidAmount',slot: true,minWidth: '110'},
           {label: '中标地区', prop: 'address',minWidth: '80'},
           {label: '业绩类型', prop: 'boundType',minWidth: '100'},
           {label: '项目类型', prop: 'projectType',minWidth: '100'},
@@ -159,6 +166,7 @@
           this.tableData = res.code == 200 ? res.rows:[]
           this.tableDataTotal = res.total
           this.isSkeleton = false
+          this.tableLoading = false
         })
       },
       formatDate(timestamp) {
@@ -244,6 +252,17 @@
         }
         return params
       },
+      //分页
+      handleCurrentChange(e){
+        let params = this.formParams()
+        params.pageNum = e
+        this.queryParams.pageNum = e
+        this.handleQuery(params)
+        console.log(this.$children[1].$refs.tableRef.bodyWrapper.scrollTop)
+        setTimeout(() => {
+          // this.$children[1].$refs.tableRef.bodyWrapper.scrollTop = 0
+        }, 500);
+      },
     }
   }
 </script>

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

@@ -14,6 +14,7 @@
       :defaultSort="defaultSort"
       :tableLoading="tableLoading"
       :tableData="tableData"
+      :MaxPage=500
       :forData="forData"
       :tableDataTotal="tableDataTotal"
       :queryParams="queryParams"

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

@@ -5,6 +5,7 @@
         v-loading="tableLoading"
         :data="tableData"
         element-loading-text="Loading"
+        ref="tableRef"
         border
         fit
         highlight-current-row
@@ -130,6 +131,14 @@ export default {
       current_page: this.queryParams.pageNum,
       show_page: this.paging
     }
+  },
+  watch:{
+    'queryParams.pageNum'(newVal,oldVal){
+      this.current_page=newVal
+    }
+  },
+  created() {
+
   },
   methods:{
     handleCurrentChange(e){