修改

dsk-operate-ui/src/views/component/CustomMoneySelect.vue

@@ -148,6 +148,12 @@ export default {
           case '10亿以上':
             moneyStr = [100000]
             break;
+          case '5亿以上':
+            moneyStr = [50000]
+            break;
+          case '2亿以上':
+            moneyStr = [20000]
+            break;
           case '一亿以上':
             moneyStr = [10000]
             break;

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

@@ -61,6 +61,9 @@
           <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
           <div v-else v-html="scope.row.companyName || '--'"></div>
         </template>
+        <template slot="stockPercent" slot-scope="scope">
+          <div>{{scope.row.stockPercent || '--'}}{{scope.row.stockPercent ?  '%':''}}</div>
+        </template>
       </tables>
     </div>
 </template>
@@ -92,7 +95,7 @@
           {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', 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'},
         ],
@@ -308,9 +311,12 @@
         }else{
           this.queryParams[name] = []
         }
+        if(this.paramsData){
           this.paramsData.companyType=this.queryParams.companyType
           this.paramsData.companyTypes=this.queryParams.companyTypes
-        this.handleQuery(this.paramsData);
+          this.paramsData.pageNum =1
+        }
+        this.handleQuery(this.paramsData ? this.paramsData : this.queryParams);
       },
       handleChange(key,name) {
         if(key === '1'){
@@ -319,6 +325,10 @@
           }else {
             this.queryParams.companyType=name
           }
+          if(this.paramsData){
+            this.paramsData.companyType=this.queryParams.companyType
+            this.paramsData.pageNum =1
+          }
         }
         if(key === '2'){
           if(name === this.cgblName){
@@ -347,11 +357,15 @@
             this.queryParams.minStockPercent=''
             this.queryParams.maxStockPercent=''
           }
+          if(this.paramsData){
+            this.paramsData.minStockPercent=this.queryParams.minStockPercent
+            this.paramsData.maxStockPercent=this.queryParams.maxStockPercent
+            this.paramsData.pageNum =1
+          }
         }
-        this.handleQuery();
+        this.handleQuery(this.paramsData ? this.paramsData : this.queryParams);
       },
       getAreaList(params){
-        console.log(params)
         if(params.province&&params.province.length>0){
           let arr = this.$children[0].$refs.cascader[0].getCheckedNodes()
           console.log(this.$children[0].$refs.cascader)

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

@@ -97,7 +97,7 @@
         })
       },
       handleClick(e, data) {
-        this.title=this.name+data.qualificationName+'（'+ data.companyCount +'）'
+        this.title=this.name+'-'+data.qualificationName+'（共'+ data.companyCount +'条）'
         this.rowData = data
         this.isDetails = true
       },

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

@@ -7,6 +7,10 @@
       :with-header="false"
       @closed="cancel">
       <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+      <div class="head" v-if="!isSkeleton">
+        <img class="tip-img" src="@/assets/images/icon.png" />
+        <span>{{title}}</span>
+      </div>
       <tables
         v-if="!isSkeleton"
         :tableLoading="tableLoading"
@@ -63,7 +67,7 @@ export default {
     }
   },
   created() {
-    this.drawer = true
+    this.drawer = true;
     this.handleQuery()
   },
   methods: {
@@ -100,11 +104,15 @@ export default {
     ::v-deep .client-drawer{
       background: #FFFFFF;
     }
+    .head{
+      height: 48px;
+      line-height: 48px;
+      border-bottom: 1px solid #E1E1E1;
+    }
     .tip-img{
-      width: 14px;
-      height: 14px;
-      margin-right: 4px;
-      cursor: pointer;
+      width: 17px;
+      height: 17px;
+      margin: 0 8px -2px 12px;
     }
   }
 </style>

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

@@ -153,7 +153,6 @@ export default {
   },
   methods: {
     changeSelect(){
-      console.log("111")
       this.$emit('handle-search')
     },
     clickEXCEL() {

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

@@ -173,7 +173,8 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="大项目最新招标" name="second">
-            <div class="list">
+            <skeleton v-if="zhaobiaoIsSkeleton" style="padding: 16px"></skeleton>
+            <div v-if="!zhaobiaoIsSkeleton" class="list">
               <div class="item" v-for="(item,index) in zbList" :key="index">
                 <p class="list-title"><router-link :to="`/biddetail/${item.bid}`" tag="a" class="a-link" v-if="item.bid" v-html="item.projectName"></router-link></p>
                 <div class="list-content">
@@ -192,7 +193,7 @@
                 </div>
               </div>
             </div>
-            <div class="pagination-box" v-if="zbTableTotal>queryParams2.pageSize">
+            <div class="pagination-box" v-if="zbTableTotal>queryParams2.pageSize && !zhaobiaoIsSkeleton">
               <el-pagination background :current-page="queryParams2.pageNum" :page-size="queryParams2.pageSize" :total="zbTableTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
           </el-tab-pane>
@@ -202,9 +203,9 @@
             <el-form-item prop="amount">
               <custom-money-select
                 :moneyList="moneyList"
-                v-model="queryParams2.amount"
+                v-model="amount"
                 placeholder="中标金额"
-                @handle-search="changeSelect" />
+                @handle-search="changeSelect3" />
             </el-form-item>
             <el-form-item prop="provinceId">
               <el-select v-model="queryParams2.provinceId" placeholder="项目地区" style="width: 150px;">
@@ -679,6 +680,7 @@ export default {
         pageNum:1,
         pageSize:10
       },
+      amount:'',
       timeList: ['近三天', '近七天', '近半月', '自定义'],
       moneyList: ['2亿以上', '5亿以上', '10亿以上', '自定义'],
       projectList:[],
@@ -686,6 +688,7 @@ export default {
       totalCount:0,
       zbTableTotal:0,
       zxzbIsSkeleton:true,
+      zhaobiaoIsSkeleton:true,
     };
   },
   created() {
@@ -700,10 +703,13 @@ export default {
   },
   methods: {
     getBigWinningBidsPage(){
-      let params={}
+      let params=this.queryParams2;
+      if(params.amount){
+
+      }
+
       this.zxzbIsSkeleton=true
       bigWinningBidsPage(this.queryParams2).then(res=>{
-        console.log(res)
         this.zxzbIsSkeleton=false;
         if(res.code == 200){
           this.projectList=res.rows;
@@ -712,9 +718,10 @@ export default {
       })
     },
     getBigBidPage(){
-      let params={}
+      let params={};
+      this.zhaobiaoIsSkeleton=true
       bigBidPage(this.queryParams2).then(res=>{
-        console.log(res)
+        this.zhaobiaoIsSkeleton=false
         if(res.code == 200){
           this.zbList=res.rows;
           this.zbTableTotal=res.total;
@@ -1056,11 +1063,29 @@ export default {
       console.log("11111")
       // this.$emit('handle-search')
     },
+    changeSelect3(){
+      console.log(this.amount)
+      return
+      this.queryParams2.pageNum = 1
+      if(this.activeName === 'first'){
+        this.getBigWinningBidsPage()
+      }
+      if(this.activeName === 'second'){
+        this.getBigBidPage()
+      }
+    },
     handleCurrentChange(){
 
     },
     handleSizeChange(){
-
+      this.queryParams2.pageNum = 1
+      this.queryParams2.pageSize = val
+      if(this.activeName === 'first'){
+        this.getBigWinningBidsPage()
+      }
+      if(this.activeName === 'second'){
+        this.getBigBidPage()
+      }
     },
   }
 };

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

@@ -28,7 +28,7 @@
       <div class="table-item">
         <el-table
           :data="tableData"
-          element-loading-text="Loading"
+          v-loading="tableLoading"
           border
           fit
           max-height="640"
@@ -168,7 +168,8 @@ export default {
       this.aptitudeCodeList=aptitudeCode
     },
     async querySubmit(){
-      this.isSkeleton = true;
+      // this.isSkeleton = true;
+      this.tableLoading = true;
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize}
       if(this.queryParams.field){
         params.field=this.queryParams.field
@@ -196,6 +197,7 @@ export default {
       }
       enterprise(params).then(res => {
         this.isSkeleton = false
+        this.tableLoading = false
         if(res.code === 200){
           this.tableData=res.data.list;
           this.tableDataTotal=res.data.total;

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

@@ -144,7 +144,6 @@
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
-      <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="table-item">
         <div v-if="tableDataTotal > 0  && !isSkeleton">
           <el-table
@@ -237,6 +236,7 @@
             <!--<el-table-column prop="bl" label="开发区类别" width="160" />-->
           </el-table>
         </div>
+        <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
         <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，没找到相关数据</div>
@@ -366,9 +366,6 @@ export default {
     this.dataRegion()
     this.getType()
     this.dataQuery=this.$route.params;
-    // console.log(this.dataQuery)
-    // console.log(this.$route.query)
-    // console.log(this.$route.params)
     if(this.dataQuery.provinceId){
       if(Array.isArray(this.dataQuery.province)){
         this.province=this.dataQuery.province[0];
@@ -459,8 +456,8 @@ export default {
     },
     // 查询提交
     async querySubmit() {
-      // this.tableLoading = true;
-      this.isSkeleton = true
+      this.tableLoading = true;
+      // this.isSkeleton = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize,type:Number(this.queryParams.radio)}
       const param={}
       // if(this.queryParams.address.length > 0){
@@ -537,7 +534,8 @@ export default {
       }
 
       urbanInvestmentPage(params).then(res => {
-        this.isSkeleton = false
+        this.isSkeleton = false;
+        this.tableLoading = false;
         this.tableData = res.data.list;
         this.tableDataTotal = res.data.totalCount
       })