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

dsk-operate-ui/src/api/enterpriseData/enterpriseData.js

@@ -123,6 +123,14 @@ let centralEnterprseChild= function centralEnterprseChild(param) {
 	data: param
   })
 }
+// 央企子集团更多
+let centralEnterprseChildPage= function centralEnterprseChildPage(param) {
+  return request({
+    url: '/combine/info/centralEnterprse/child/page',
+    method: 'post',
+	data: param
+  })
+}
 // 地方国企
 let centralEnterprselocal= function centralEnterprselocal(param) {
   return request({
@@ -131,6 +139,14 @@ let centralEnterprselocal= function centralEnterprselocal(param) {
 	data: param
   })
 }
+// 地方国企更多
+let centralEnterprselocalPage= function centralEnterprselocalPage(param) {
+  return request({
+    url: '/combine/info/centralEnterprse/local/page',
+    method: 'post',
+	data: param
+  })
+}
 // 民营集团
 let centralEnterprsesocial= function centralEnterprsesocial(param) {
   return request({
@@ -139,8 +155,22 @@ let centralEnterprsesocial= function centralEnterprsesocial(param) {
 	data: param
   })
 }
+// 民营集团更多
+let centralEnterprsesocialPage= function centralEnterprsesocialPage(param) {
+  return request({
+    url: '/combine/info/centralEnterprse/social/page',
+    method: 'post',
+	data: param
+  })
+}
+//企业标签
+let label= function label(param) {
+  return request({
+    url: '/enterprise/label',
+    method: 'post',
+	data: param
+  })
+}
 
 
-
-
-export default {centralEnterprsesocial,centralEnterprselocal,centralEnterprseChild,searchCentralEnterprse,centralEnterprse,region,aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,cancelClaim,enterprisePage,infoHeader,historyClaim,customerStatus}
+export default {label,centralEnterprsesocialPage,centralEnterprselocalPage,centralEnterprseChildPage,centralEnterprsesocial,centralEnterprselocal,centralEnterprseChild,searchCentralEnterprse,centralEnterprse,region,aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,cancelClaim,enterprisePage,infoHeader,historyClaim,customerStatus}

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

@@ -23,7 +23,7 @@
         :queryParams="queryParams"
         @handle-current-change="handleCurrentChange"
       >
-      <template slot="sourceType" slot-scope="scope">
+        <template slot="sourceType" slot-scope="scope">
           <div class="flex-box">
             <div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
             <span v-else v-html="scope.row.sourceType || '--'"></span>

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

@@ -10,7 +10,7 @@
       <head-detail-form
         :form-data="formData"
         :query-params="queryParams"
-        :total="tableDataTotal"
+        :total="data.total"
         :amountTotal="amountTotal"
         @handle-search="handleSearch"
       />
@@ -19,13 +19,14 @@
         :tableLoading="tableLoading"
         :tableData="tableData"
         :forData="forData"
-        :tableDataTotal="tableDataTotal"
+        :tableDataTotal="data.total"
         :queryParams="queryParams"
         @handle-current-change="handleCurrentChange"
       >
-        <template slot="projectAllName" slot-scope="scope">
+        <template slot="sourceType" slot-scope="scope">
           <div class="flex-box">
-            <span  v-html="scope.row.projectAllName || '--'"></span>
+            <div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
+            <span v-else v-html="scope.row.sourceType || '--'"></span>
           </div>
         </template>
       </tables>
@@ -52,8 +53,8 @@ export default {
     return {
       drawer: false,
       queryParams: {
-        cid: this.data.companyId,
-        unitId: this.companyId,
+        companyId: this.data.companyId,
+        cid: this.companyId,
         pageNum: 1,
         pageSize: 20
       },
@@ -62,11 +63,11 @@ export default {
         { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
       ],
       forData: [
-        {label: '项目名称', prop: 'projectAllName', fixed: true, slot: true},
-        {label: '公布时间', prop: 'winBidTime', width: '100'},
-        {label: '本次合同金额（万元）', prop: 'winBidAmount', width: '160'},
-        {label: '项目类型', prop: 'boundType', width: '130'},
-        {label: '数据来源', prop: 'sourceName', width: '90', slot: true}
+        {label: '项目名称', prop: 'projectName', fixed: true},
+        {label: '公布时间', prop: 'time', width: '100'},
+        {label: '本次合同金额（万元）', prop: 'amount', width: '160'},
+        {label: '项目类型', prop: 'projectType', width: '130'},
+        {label: '数据来源', prop: 'sourceType', width: '90', slot: true}
       ],
       //列表
       tableLoading:false,
@@ -99,7 +100,7 @@ export default {
     },
     linkTo(scope){
       this.drawer = false
-      this.$router.push(`/biddetail/${scope.row.id}`)
+      this.$router.push(`/biddetail/${scope.row.sourceId}`)
     },
     cancel() {
       this.$emit('cancel')

dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js

@@ -83,8 +83,11 @@ export default {
     },
     //排序
     sortChange(e){
+      console.log(e)
       let item = this.forData.find(item => item.prop === e.prop)
       this.queryParams.sort = item[e.order]
+      console.log(this.queryParams)
+
       this.handleSearch()
     }
   }

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

@@ -28,7 +28,7 @@
               </el-popover>
             </div>
             <span style="float: left;" :class="!labelArr.includes(companyInfo.businessStatus)?'label-bg1':'label-bg3'" v-if="companyInfo.businessStatus">{{companyInfo.businessStatus}}</span>
-<!--            <span style="float: left;" :class="item.state===0?'label-bg2':'label-bg3'" v-for="(item, index) in labelList" :key="index">{{item.labelName}}</span>
+           <span style="float: left;" :class="item.state===0?'label-bg2':'label-bg3'" v-for="(item, index) in labelList" :key="index">{{item.labelName}}</span>
             <template v-if="enterpriseLabel.length > 0">
               <template v-for="(item,index) in enterpriseLabel">
                 <template v-if="item.children.length > 0">
@@ -61,7 +61,7 @@
                   <span v-else class="enterpriseLabel-span" :style="{'background':item.bgColor,'color':item.fontColor,'cursor':item.linkUri ? 'pointer' : ''}">{{item.labelName}}</span>
                 </template>
               </template>
-            </template>-->
+            </template>
           </div>
         </div>
       </div>
@@ -98,6 +98,19 @@
       <div class="company-swiper">
         <div class="swiper-containers swiper-info" :style="graphList.length<=6?'margin-left:0px; width: 100%;':''">
           <ul class="swiper-wrapper">
+            <li class="swiper-slide" v-if="statistic.combineMember">
+                <div class="flex-box" >
+                  <img src="@/assets/images/detail/overview/company_ssjt.png" alt="所属集团" title="所属集团" class="swiper-img">
+                  <div class="swiper-item">
+                    <span class="swiper-name">
+                      所属集团{{statistic.combineMember.companyName}}
+                    </span>
+                    <div  >
+                        <span >集团成员：</span><i class="num" @click="linkTo(statistic.combineMember)">{{statistic.combineMember.memberNum}}</i>
+                      </div>
+                  </div>
+                </div>
+              </li>
             <template  v-for="(item, index) in graphList" >
               <li class="swiper-slide" :key="index">
                 <div class="flex-box" @click="handleGraph(item)">
@@ -203,6 +216,11 @@ export default {
   mounted() {
     this.handleWidth()  //企业背景是否收起
     this.companySwiper()  //swiper滚动板块
+    api.label({companyId:this.companyId}).then(res=>{
+      if(res.code==200){
+        this.labelList = res.data
+      }
+    })
   },
   methods: {
     //认领
@@ -336,6 +354,9 @@ export default {
           break
       }
     },
+    linkTo(item){
+      this.$router.push({path:`/groupAccount/${item.companyId}?name=${item.companyName}`})
+    },
     //swiper子项点击
     handleGraphChild(item, it){
       if(it.id==101 && it.val){

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -227,7 +227,7 @@
 	  	<ul class="bottomlist-content" v-if="tableData.length>0&& !isSkeleton">
 	  		<li class="bottomlist-list" v-for="item in tableData">
 	  			<p class="list-titel">
-	  				 <router-link  :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"  ></router-link>
+	  				 <router-link  :to="'/radar/Bidding/details/'+ item.uuid" tag="a" class="list-titel-a" v-html="item.projectName"  ></router-link>
 	  				 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
 	  			</p>
 	  			<div class="content-label" v-if="(item.province||item.city||item.area)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">

dsk-operate-ui/src/views/radar/components/Tender/index.vue

@@ -236,7 +236,7 @@
 						</p>
 						
 					</div>
-					<div  class="list-content" v-if="item.bidMoney||item.contact">
+					<div  class="list-content" v-if="item.bidMoney||item.contactTel || item.agencyContactTel">
 						<p class="list-content-text" v-if="item.bidMoney">
 							<span>预算金款：</span>
 							<span>{{item.bidMoney||'--'}}万元</span>