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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -88,10 +88,12 @@ public class BusinessFileController extends BaseController {
 
             //校验是否上传同名文件
             File newFile = new File(filePath);
-            // 获取当前目录下的文件和文件夹
-            File[] files = newFile.listFiles();
-            for (File allFile : files) {
-                if(filename.equals(allFile.getName())) return error("文件已存在");
+            if (newFile.exists()) {
+                // 获取当前目录下的文件和文件夹
+                File[] files = newFile.listFiles();
+                for (File allFile : files) {
+                    if (filename.equals(allFile.getName())) return error("文件已存在");
+                }
             }
 
             // 上传并返回文件全路径

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEnterprisesController.java

@@ -35,6 +35,6 @@ public class RegionalEnterprisesController {
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return regionalEnterprisesService.enterprisePage(object);
+        return regionalEnterprisesService.enterprisePage(compose);
     }
 }

dsk-operate-ui/src/assets/styles/public.css

@@ -158,11 +158,11 @@ select {
 }
 
 .el-popper[x-placement^=top] {
-	margin-bottom: 12px;
+	margin-bottom: 4px;
 }
 
 .el-popper[x-placement^=bottom] {
-	margin-top: 12px;
+	margin-top: 4px;
 }
 
 .el-select-dropdown .popper__arrow {
@@ -390,12 +390,13 @@ select {
 	height: 0px;
 	opacity: 1;
 	border-bottom: 1px solid #EFEFEF;
-	margin: 16px 0px;
+	margin-top: 20px;
+	margin-bottom: 24px;
 }
 
 .content_item .search-new {
 	width: 100%;
-	padding-bottom: 16px;
+	padding-bottom: 24px;
 }
 
 .content_item .search-new span:last-child {
@@ -433,6 +434,7 @@ select {
 	border-color: #0081FF;
 }
 
+
 .toolbar-right-download {
 	padding: 6px 18px;
 	margin: 0px;
@@ -1181,6 +1183,6 @@ select {
 	font-weight: 400;
 	color: #999999;
 	line-height: 18px;
-	margin-bottom: 24px;
+	padding-bottom: 48px;
 	text-align: center;
 }
\ No newline at end of file

dsk-operate-ui/src/views/detail/party-a/business/index.vue

@@ -59,7 +59,7 @@ import BasicIinformation from "./component/basicIinformation"
 import ElCardinput from "./component/elCardinput"
 export default {
   name: 'Business',
-  props: ['customerIds', 'companyInfo'],
+  props: ['customerIds', 'companyInfo', 'customerInfo'],
   components: {
     Info,
     BasicIinformation,
@@ -99,25 +99,40 @@ export default {
     }
   },
   created() {
+    this.handleQuery()
+    this.infos = this.customerInfo
+  },
+  mounted(){
     this.customerInfos()
-    //企业性质
-    getDictType('company_nature_type').then(result=>{
-      this.companyType.companyNaturelist = result.code == 200 ? result.data:[]
-    })
-    //企业级别
-    getDictType('company_level_type').then(result=>{
-      this.companyType.companyLevellist = result.code == 200 ? result.data:[]
-    })
-    //资信等级
-    getDictType('credit_level_type').then(result=>{
-      this.companyType.creditLevellist = result.code == 200 ? result.data:[]
-    })
   },
   methods: {
+    async handleQuery() {
+      let [type1,type2,type3] = await Promise.all([
+        getDictType('company_nature_type'),
+        getDictType('company_level_type'),
+        getDictType('credit_level_type')
+      ])
+      if(type1.code==200){
+        type1.data.forEach(item => {
+          this.companyType.companyNaturelist.push({dictLabel:item.dictLabel,dictValue:item.dictLabel})
+        })
+      }
+      if(type2.code==200){
+        type2.data.forEach(item => {
+          this.companyType.companyLevellist.push({dictLabel:item.dictLabel,dictValue:item.dictLabel})
+        })
+      }
+      if(type3.code==200){
+        type3.data.forEach(item => {
+          this.companyType.creditLevellist.push({dictLabel:item.dictLabel,dictValue:item.dictLabel})
+        })
+      }
+      this.isInfo = true
+    },
+
     customerInfos(){
       customerInfo(this.customerIds).then(res=>{
         this.infos = res.data
-        this.isInfo = true
       })
     },
     focusNowedits(e){

dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue

@@ -320,5 +320,7 @@ export default {
 ::v-deep .el-table__fixed::before, ::v-deep .el-table__fixed-right::before{
   background-color:unset;
 }
-
+::v-deep .el-dialog__headerbtn{
+  z-index: 9;
+}
 </style>

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

@@ -44,11 +44,11 @@
           <OpenacourtsessionNotice v-if="currentPath.pathName=='openacourtsessionNotice'" :company-id="companyId" />
           <template v-if="customerId">
             <!-- 商务信息 -->
-            <Business v-if="currentPath.pathName=='business'" :customer-ids="customerId" :companyInfo="companyInfo" />
+            <Business v-if="currentPath.pathName=='business'" :customer-ids="customerId" :companyInfo="companyInfo" :customerInfo="customerInfo" />
             <!-- 招标偏好 -->
-            <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" />
+            <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" :customerInfo="customerInfo" />
             <!-- 合作情况 -->
-            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail" @detail="cooperateDetail" />
+            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail" :customerInfo="customerInfo" @detail="cooperateDetail" />
             <!-- 决策链条 -->
             <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 跟进记录 -->
@@ -64,6 +64,7 @@
 <script>
 import { idRemark } from '@/api/common'
 import { infoHeader } from '@/api/detail/party-a/index'
+import { customerInfo } from '@/api/detail/party-a/cooperate'
 import elementResizeDetectorMaker from "element-resize-detector"
 import Header from "./component/Header"
 import SideBar from "./component/Sidebar"
@@ -146,6 +147,7 @@ export default {
   data() {
     return {
       companyInfo: {},
+      customerInfo: {},
       companyId: '',  //企业Id（测试默认3068）
       customerId: '',  //企业Id（测试默认'a00d582a6041f32c16aac804e4924736'）
       currentPath: {
@@ -176,9 +178,6 @@ export default {
     if (this.$route.query.path) { // 获取跳转对应板块
       this.currentPath.pathName = this.$route.query.path
     }
-    if (this.$route.query.customerId) { // 判断是否显示
-      this.customerId = this.$route.query.customerId
-    }
   },
   mounted() {
   },
@@ -197,6 +196,7 @@ export default {
           this.listenSider()
         })
         this.handleQuery()
+        this.association(this.$route.query.customerId)
       }
     },
     async handleQuery() {
@@ -216,7 +216,23 @@ export default {
     },
     closeDetail(){
       this.cooDetail = false
+    },
+    // 判断客户是否关联显示修改
+    association(id){
+      customerInfo(id).then(res=>{
+        if(res.code == 200){
+          if(res.data.companyId == this.companyId && res.data.userId == this.$store.state.user.userId){
+            this.customerInfo = res.data
+            this.customerId = res.data.customerId
+          }else{
+            this.currentPath.pathName = 'overview'
+          }
+        }
+      }).catch(err=>{
+        this.currentPath.pathName = 'overview'
+      })
     }
+
   }
 }
 </script>

dsk-operate-ui/src/views/detail/party-a/preference/index.vue

@@ -160,7 +160,7 @@ export default {
   components: {
 
   },
-  props: ['customerIds'],
+  props: ['customerIds','customerInfo'],
   data() {
     return {
       autosize: {
@@ -181,6 +181,9 @@ export default {
     }
   },
   created() {
+    this.queryParams = this.customerInfo
+  },
+  mounted(){
     this.customerInfos()
   },
   computed: {

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

@@ -689,7 +689,7 @@ export default {
 		if(val.length>0){
 			this.checkuipExecutive=false;
 		}else if(val.length==0){
-			this.checkuipExecutive==true;
+			this.checkuipExecutive=true;
 		}
 		this.search();
 		

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

@@ -5,13 +5,13 @@
 			<div class="content_item">
 			    <div class="content_right item_ckquery_list">
 			        <el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
-						<div slot="append" class="btn-search" @click="submitbtn">搜索</div>
+						<div slot="append" class="btn-search" @click="search">搜索</div>
 					</el-input>
-			        <template v-if="ename">
+			        <!-- <template v-if="ename">
 			            <span v-for=" (item,k)  in enameQueryTypeList" :key="k" style="margin-right: 24px;">
 			                <el-radio v-model="enameQueryType" :label="item.key">{{item.value}}</el-radio>
 			            </span>
-			        </template>
+			        </template> -->
 			    </div>
 			</div>
 			<div class="content_item">
@@ -243,7 +243,7 @@
 					<div class="select-popper">
 					
 						<el-dropdown trigger="click" ref="establishPopper" placement='bottom-start'>
-							<div class=" "
+							<div class="el-dropdown-link"
 								:class="(establishText!='不限'&&establishText!='自定义')||(establishText=='自定义'&&startTimetext.length>0)?'select-active':''">
 								成立年限{{(establishText!='不限'&&establishText!='自定义')||(establishText=='自定义'&&startTimetext.length>0)?('1项'):''}}
 								<i class="el-icon-caret-bottom"></i>
@@ -417,7 +417,7 @@
 		
 		    <div class="content_item content_item_nopadding ">
 		    	<div class="search-new" >
-		    		<span @click="submitbtn()">查询</span>
+		    		<span @click="search()">查询</span>
 		    		<span @click="reset()">重置</span>
 		    	</div>
 		    
@@ -441,7 +441,7 @@
 					</el-popover>
 					<div class="toolbar-right-search">
 					  <el-input placeholder="请输入企业名称关键词" class="toolbar-right_input" v-model="resultEname">
-					    <div slot="append" class="result-search" @click="submitbtn()">过滤企业</div>
+					    <div slot="append" class="result-search" @click="search()">过滤企业</div>
 					  </el-input>
 					</div>
 				</div>
@@ -1418,7 +1418,7 @@
 			 });
 			 this.getRegionWebList();
 			  this.getaddressList();
-			  this.submitbtn();
+			  this.search();
 			
 		},
 		mounted() {
@@ -2608,6 +2608,7 @@
 				
 				this.getaddressList();
 				this.getRegionWebList();
+				this.search();
 				
 			},
 			reloadPage() {
@@ -2642,8 +2643,7 @@
 				}
 
 			},
-			// submitbtn
-		submitbtn(page, limit,exportFlag){
+		search(page, limit,exportFlag){
         // return false;
         if (!page) {
           this.page = 1;

dsk-operate-ui/src/views/project/projectList/component/xmsl.vue

@@ -36,7 +36,7 @@
           <div class="con i" style="width: 100%;">
             <span style="float: left;margin-top: 2px">项目标签 ：</span>
             <div class="flex tipinput">
-              <div class="tips" v-for="(item,index) in tipslit">{{item}}<img v-if="isDisabled == false" @click="deltip(item)" src="@/assets/images/project/del.png"></div>
+              <div class="tips" v-for="(item,index) in tipslit">{{item.label}}<img v-if="isDisabled == false" @click="deltip(item)" src="@/assets/images/project/del.png"></div>
               <div style="position: relative">
               <el-input placeholder="待添加" :disabled="isDisabled" v-model="tipsvalue" @input="getValue" :style="spanWidth"></el-input><span class="spanText">{{ tipsvalue }}</span>
               </div>
@@ -323,10 +323,10 @@
         })
         // this.tipslit.push(this.tipsvalue)
       },
-      deltip(value){
+      deltip(item){
         let param={
           businessId:this.id,
-          label:value
+          id:item.id
         }
         removeLabel(JSON.stringify(param)).then(res=>{
           if (res.code == 200){
@@ -341,7 +341,11 @@
       getXMSL(){
         getXMSL(this.id).then(result=> {
           this.xmjd = result.data.projectStage
-          this.tipslit = result.data.labelList
+          if(result.data.labelList == null || result.data.labelList == "" || result.data.labelList == undefined){
+            this.tipslit = []
+          }else {
+            this.tipslit = JSON.parse(result.data.labelList)
+          }
           this.xmsldata = result.data
           this.isDisabled = result.data.isFounder == 1 ? false:true
           const spanStyle = document.querySelector(".rig1");

dsk-operate-ui/src/views/radar/BidRecord/details.vue

@@ -45,7 +45,7 @@
 		      :data="tableData"
 		      element-loading-text="Loading"
 		      border
-		      fit
+		     
 		      highlight-current-row
 		    >
 		      <el-table-column  label="序号" width="80">
@@ -56,7 +56,7 @@
 			  
 		      <el-table-column  label="项目名称" >
 				  <template slot-scope="scope">
-					  <router-link v-if="scope.row.companyId" :to="'/company/' + encodeStr(scope.row.companyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
+					  <router-link v-if="scope.row.id" :to="'/company/' + encodeStr(scope.row.id)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
 				  </template>
 			  </el-table-column>
 			  
@@ -376,6 +376,11 @@
 		.main5 {
 			.table-item {
 				margin-top: 22px;
+				.blue {
+					color: #0081FF !important;
+					cursor: pointer;
+				
+				}
 			}
 			.pagination {
 				padding: 14px;

dsk-operate-ui/src/views/radar/Establishment/details.vue

@@ -84,7 +84,7 @@
 				</p>
 				<p>
 					<label class="label">项目联系方式</label>
-					<span>{{textList.money||'--'}}</span>
+					<span>{{textList.personTel||'--'}}</span>
 					<label class="label">行业分类</label>
 					<span>{{textList.projectIndustry||'--'}}</span>
 				</p>

dsk-operate-ui/src/views/radar/Land/details.vue

@@ -19,12 +19,12 @@
 						<p class="list-content-text">
 							<span>成交金额：</span>
 							<span v-if="textList.transactionPrice">{{textList.transactionPrice}}万元</span>
-							<span>--</span>
+							<span v-else>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>总面积：</span>
-							<span v-if="textList.transactionPrice">{{textList.transactionPrice}}平方米</span>
-							<span>--</span>
+							<span v-if="textList.acreage">{{textList.acreage}}平方米</span>
+							<span v-else>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>合同签订：</span>
@@ -76,7 +76,7 @@
 				</p>
 				<p>
 					<label class="label">面积（平方米）</label>
-					<span>{{textList.buildArea||"--"}}</span>
+					<span>{{textList.acreage||"--"}}</span>
 					<label class="label">土地来源</label>
 					<span>{{textList.landSource||"--"}}</span>
 				</p>
@@ -134,7 +134,7 @@
 				<p>
 					<label class="label">地块名称</label>
 					<span>{{textList.landName||"--"}}</span>
-					<label class="label">建筑面积</label>
+					<label class="label">建筑面积(平方米)</label>
 					<span>{{textList.buildArea||"--"}}</span>
 				</p>
 				<p>

dsk-operate-ui/src/views/radar/bxprozbgg/details.vue

@@ -37,19 +37,24 @@
 				<div class="common-title-list">
 					<p>
 						<img src="@/assets/images/bxpro/pdf.png" alt="">
-						<span>竞争对手</span>
+						<span v-if="textList.marketAnalysis" @click="download(textList.marketAnalysis,'项目简析')">竞争对手</span>
+						<span v-else class="spanset">竞争对手</span>
 					</p>
 					<p>
 						<img src="@/assets/images/bxpro/pdf.png" alt="">
-						<span>项目简析</span>
+						<span v-if="textList.projectCharacteristics" @click="download(textList.projectCharacteristics,'项目简析')">项目简析</span>
+						<span v-else class="spanset">项目简析</span>
 					</p>
 					<p>
 						<img src="@/assets/images/bxpro/pdf.png" alt="">
-						<span>成本分析</span>
+						<span v-if="textList.costAnalysis" @click="download(textList.costAnalysis,'成本分析')">成本分析</span>
+						<span v-else class="spanset">成本分析</span>
 					</p>
 					<p>
 						<img src="@/assets/images/bxpro/pdf.png" alt="">
-						<span>招标文件</span>
+						<span v-if="textList.fileUrl&&textList.fileUrl.length>0"  @click="download(textList.fileUrl[0],'招标文件')">招标文件</span>
+						<span v-else class="spanset">招标文件</span>
+						
 					</p>
 					
 				</div>
@@ -215,7 +220,6 @@
 			}
 		},
 		created() {
-			console.log(this.$route.params)
 			this.id = this.$route.params.id;
 			this.bidNoticeProDetail();
 		},
@@ -224,12 +228,36 @@
 				api.bidNoticeProDetail({
 					id: this.id
 				}).then(res => {
-					// console.log(res);
 					this.textList = res.data;
+					if(this.textList.eligibleEnterprisesUrl){
+					  let tempUrl = this.textList.eligibleEnterprisesUrl.replace('http://', 'https://')
+					  this.textList.eligibleEnterprisesUrl = tempUrl
+					}
+					if(this.textList.fileUrl&&this.textList.fileUrl.length>0){
+					    this.textList.fileUrl=this.textList.fileUrl.substr(2,this.textList.fileUrl.length-4);
+						this.textList.fileUrl=this.textList.fileUrl.split(',');
+					  this.textList.fileUrl = this.textList.fileUrl.map(item=>{
+					    let it = item.replace('http://', 'https://')
+					    return it
+					  })
+					}
+					
 				}).catch(error => {
 					
 				});
 			},
+			download(url,name){
+				console.log(url);
+				 const a = document.createElement('a');
+				    a.style.display = 'none';
+				    a.download = name;
+				    a.href = url;
+					a.target="_blank";
+				    document.body.appendChild(a);
+				    a.click(); 
+				    document.body.removeChild(a);
+					
+			}
 
 		}
 	}
@@ -466,6 +494,10 @@
 						width: 14px;
 						margin-right: 4px;
 					}
+					.spanset{
+						color: #23232366;
+						cursor: text;
+					}
 				}
 				p:hover{
 					color: #0081FF;

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

@@ -211,7 +211,8 @@
 					<div  class="list-content">
 						<p class="list-content-text" v-if="item.companyName">
 							<span>项目业主：</span>
-							<router-link  :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link>
+							<span><router-link  :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link></span>
+							
 						</p>
 						
 						<p class="list-content-text"v-if="item.money">

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

@@ -236,45 +236,44 @@
 							 <router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
 						</p>
 						
-						<div  class="list-content">
-							<p class="list-content-text">
+						<div  class="list-content"  v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
+							<p class="list-content-text"  v-if="item.companyName">
 								<span>受让人：</span>
-								<span v-if="item.companyName">
+								<span >
 									<router-link :to="'/company/' + encodeStr(item.companyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
 								</span>
-								<span v-else>--</span>
 								
 							</p>
-							<p class="list-content-text">
+							<p class="list-content-text" v-if="item.transactionPrice">
 								<span>成交金额：</span>
 								<span>{{item.transactionPrice||'--'}}万元</span>
 							</p>
-							<p class="list-content-text">
+							<p class="list-content-text" v-if="item.acreage">
 								<span>总面积：</span>
 								<span>{{item.acreage||'--'}}㎡</span>
 							</p>
-							<p class="list-content-text">
+							<p class="list-content-text"  v-if="item.contractSignTime">
 								<span>合同签订：</span>
 								<span>{{item.contractSignTime||'--'}}</span>
 							</p>
 						</div>
-						<div  class="list-content">
-							<p class="list-content-text">
+						<div  class="list-content"  v-if="item.landUse||item.industry||item.supplyLandWay">
+							<p class="list-content-text"  v-if="item.landUse">
 								<span>土地用途：</span>
 								<span >{{item.landUse||'--'}}</span>
 							</p>
-							<p class="list-content-text">
+							<p class="list-content-text"  v-if="item.industry">
 								<span>行业分类：</span>
 								<span >{{item.industry||'--'}}</span>
 							</p>
-							<p class="list-content-text">
+							<p class="list-content-text"  v-if="item.supplyLandWay">
 								<span>供应方式：</span>
 								<span >{{item.supplyLandWay||'--'}}</span>
 							</p>
 						</div>
-						<div  class="list-content list-addree">
+						<div  class="list-content list-addree"  v-if="item.province||item.city||item.area||item.landAddr">
 							<img src="@/assets/images/addree.png" alt="">
-							<p class="list-content-text">
+							<p class="list-content-text"  v-if="item.province||item.city||item.area">
 								<span>行政区划：</span>
 								<span >
 									 {{item.province}}
@@ -286,10 +285,9 @@
 								   </template>
 								</span>
 							</p>
-							<p class="list-content-text">
+							<p class="list-content-text"  v-if="item.landAddr">
 								<span>土地坐落：</span>
-								<span v-if="item.landAddr" v-html="item.landAddr"></span>
-								<span v-else>--</span>
+								<span  v-html="item.landAddr"></span>
 							</p>
 						</div>
 					</li>

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

@@ -373,11 +373,44 @@
 				</el-table-column>
 				<el-table-column prop="zj" label="项目金额" width="161" >
 							<template slot-scope="scope">
-								{{ scope.row.projectAmount||'--'}}
+								<ul class="bxpro_list_money">
+								  <template v-if="scope.row.projectInvestmentAmount ||
+								  scope.row.projectContractAmount ||
+								  scope.row.projectSafeAmount ||
+								  scope.row.projectSurveyAmount ||
+								  scope.row.projectDesignAmount">
+								    <li v-if="scope.row.projectInvestmentAmount">
+								      <span >
+								        <span >投资额：{{ scope.row.projectInvestmentAmount }}万元</span>
+								      </span>
+								    </li>
+								    <li v-if="scope.row.projectContractAmount">
+								      <span >
+								        <span >控制价：{{ scope.row.projectContractAmount }}万元</span>
+								      </span>
+								    </li>
+								    <li v-if="scope.row.projectSafeAmount">
+								      <span >
+								        <span >建安费：{{ scope.row.projectSafeAmount }}万元</span>
+								      </span>
+								    </li>
+								    <li v-if="scope.row.projectSurveyAmount">
+								      <span >
+								        <span >勘察费：{{ scope.row.projectSurveyAmount }}万元</span>
+								      </span>
+								    </li>
+								    <li v-if="scope.row.projectDesignAmount">
+								      <span >
+								        <span >设计费：{{ scope.row.projectDesignAmount }}万元</span>
+								      </span>
+								    </li>
+								  </template>
+								  <li v-else>--</li>
+								</ul>
 							</template>
 								
 				 </el-table-column>
-				 <el-table-column prop="zj" label="债券保证金（万元）" width="146" >
+				 <el-table-column prop="zj" label="投标保证金（万元）" width="146" >
 				 			<template slot-scope="scope">
 				 				{{ scope.row.projectEnsureAmount||'--'}}
 				 			</template>
@@ -1962,6 +1995,16 @@
 			.list-titel-a{
 				color:#0081FF;
 			}
+			.bxpro_list_money{
+			  li{
+			    margin-bottom: 8px;
+			    line-height: 18px;
+			    display: flex;
+			    &:last-child{
+			      margin-bottom: 0;
+			    }
+			  }
+			}
 			
 		}
 		.bottomlist-content{

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

 <template>
 	<div>
 		<div class="content">
-			<div class="content_item">
+			<div class="content_item content_item_padding0">
 			    <div class="label">项目名称</div>
 			    <div class="content_right">
 			        <el-input class="ename_input" 
@@ -13,7 +13,7 @@
 			        </template>
 			    </div>
 			</div>
-			<div class="content_item">
+			<div class="content_item ">
 			    <div class="label">项目主体</div>
 			    <div class="content_right">
 			        <div class="item_ckquery_list" >
@@ -21,7 +21,7 @@
 			        		<el-input  ref="inp"
 			        			v-model="projectEntity" autocomplete="off" type="text"
 			        			class="register_count_ipt" placeholder="请输入企业名称">
-			        			<el-dropdown trigger="click" slot="prepend" style="cursor:pointer;"
+			        			<el-dropdown trigger="click" slot="prepend" placement="bottom-start"  style="cursor:pointer;"
 			        				@command="changeCommand">
 			        				<span class="el-dropdown-link">
 			        					{{chargeDepartment.value}}<i class="el-icon-caret-bottom"></i>
@@ -35,7 +35,7 @@
 			        </div>
 			    </div>
 			</div>
-			<div class="content_item">
+			<div class="content_item content_item16">
 			    <div class="label">项目地区</div>
 			    <div class="content_right">
 			       <div class="select-popper">
@@ -51,7 +51,7 @@
 			       </div>
 			    </div>
 			</div>
-			<div class="content_item">
+			<div class="content_item content_item16">
 			    <div class="label">项目类型</div>
 			    <div class="content_right">
 					<!-- <div class="content-projecttype">
@@ -178,16 +178,16 @@
 				projectName:'',
 				nameTypeList: [{
 				        key: 'like',
-				        status: false,
+				        status: true ,
 				        value: '模糊搜索',
 				    },
 				    {
 				        key: 'match',
-				        status: true,
+				        status: false,
 				        value: '精准匹配',
 				    },
 				],
-				nameType: 'match',
+				nameType: 'like',
 				projectEntity:'',
 				countTypelist: [{
 						key: '1',
@@ -550,10 +550,11 @@
 <style lang="scss" scoped>
 	.content{
 	  padding: 0px 16px;
+	  padding-top: 16px;
       border-radius: 4px 4px 4px 4px;
 	   background: #FFFFFF;
 	   .content_item{
-		   padding-top: 12px;
+		   padding-top: 20px;
 		   display: flex;
 		   align-items: center;
 	       .label{
@@ -577,6 +578,7 @@
 		
 		}
 		
+		
 		 .item_ckquery_list .el-input__icon {
 			position: relative;
 			top: 1px;
@@ -593,6 +595,10 @@
 		}
 		::v-deep .el-input-group__prepend{
 			padding: 0 8px;
+			background-color:#F3F4F5;
+			border-radius:2px;
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
 		}
 		.content-projecttype{
 			display: flex;
@@ -626,8 +632,12 @@
 	   .content_item_padding0{
 		   padding: 0;
 	   }
+	   .content_item18{
+	   	padding-top: 16px;
+	   }
 		
 	}
+	
 	.bottomlist{
 		width: 100%;
 		background-color: #FFFFFF;
@@ -679,7 +689,8 @@
 				}
 			}
 			.content-label{
-				margin-top: 7px;
+				margin-top: 5px;
+				margin-bottom: 5px;
 				.list-label{
 					background: #F3F3FF;
 					color: #8491E8;
@@ -703,7 +714,7 @@
 					display: flex;
 					justify-content: start;
 					align-items: center;
-					margin-right: 27px;
+					margin-right: 32px;
 					font-size: 14px;
 					
 					span:first-child{

dsk-operate-ui/src/views/radar/debtProject/details.vue

@@ -154,13 +154,12 @@
 				<el-table :data="tableData" element-loading-text="Loading" border fit highlight-current-row>
 					<el-table-column prop="name" label="债券简称">
 						<template slot-scope="scope">
-							<router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a"
-								class="a-link">{{ scope.row.bondAbbreviation}}</router-link>
+							{{ scope.row.bondAbbreviation}}
 						</template>
 					</el-table-column>
 					<el-table-column prop="tenderDate" label="招标日期" width="220" />
 					<el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" />
-					<el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
+					<el-table-column prop="isUsedProjectScale" label="用于项目规模(万元)" width="260" />
 					
 					<el-table-column label="是否资本金" width="200">
 						<template slot-scope="scope">

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

@@ -9,9 +9,10 @@
 							<p>{{itme.value}}</p>
 						</div>
 					</div>
-					<p class="solid"></p>
+					
 				</div>
 			</div>
+			<p class="solid"></p>
 		</div>
 		<!-- 企业专项债 -->
 		<debtProject v-if="personnelHerf=='debtProject'" />
@@ -168,8 +169,11 @@
 		top: -1px;
 		margin-right: 6px;
 	}
+	.app-container .content{
+		position: relative;
+	}
 
-	.app-container .combined-title .title-right .solid {
+	.app-container   .solid {
 		width: 100%;
 		height: 1px;
 		background-color: #EEEEEE;

dsk-system/src/main/java/com/dsk/system/domain/BusinessIdDto.java

@@ -15,6 +15,11 @@ public class BusinessIdDto {
      */
     private Integer businessId;
 
+    /**
+     * 项目标签id
+     */
+    private Integer labelId;
+
     /**
      * 项目标签名称
      */

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java

@@ -2,8 +2,6 @@ package com.dsk.system.domain.vo;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author lxl
  * @Description:
@@ -90,7 +88,7 @@ public class BusinessBrowseVo {
     /**
      * 项目标签
      */
-    private List<String> labelList;
+    private String labelList;
 
     /** 建设单位 */
     private String constructionUnit;

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessLabelVo.java

+package com.dsk.system.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/27 下午 2:51
+ **/
+@Data
+public class BusinessLabelVo {
+
+    //主键
+    private Integer id;
+
+    //标签
+    private String label;
+}

dsk-system/src/main/java/com/dsk/system/service/RegionalEnterprisesService.java

 package com.dsk.system.service;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
 
 /**
  * @ClassName EconomicService
@@ -19,5 +19,5 @@ public interface RegionalEnterprisesService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult enterprisePage(JSONObject compose) throws Exception;
+    AjaxResult enterprisePage(ComposeQueryDto compose) throws Exception;
 }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.dsk.system.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.config.RuoYiConfig;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
@@ -21,10 +22,10 @@ import com.dsk.system.domain.BusinessListDto;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
 import com.dsk.system.domain.vo.BusinessBrowseVo;
+import com.dsk.system.domain.vo.BusinessLabelVo;
 import com.dsk.system.domain.vo.BusinessListVo;
 import com.dsk.system.mapper.BusinessInfoMapper;
 import com.dsk.system.mapper.BusinessLabelMapper;
-import com.dsk.system.mapper.BusinessRelateCompanyMapper;
 import com.dsk.system.mapper.BusinessUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import lombok.extern.slf4j.Slf4j;
@@ -36,7 +37,6 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 项目详情Service业务层处理
@@ -52,8 +52,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Resource
     private BusinessUserMapper businessUserMapper;
     @Resource
-    private BusinessRelateCompanyMapper businessRelateCompanyMapper;
-    @Resource
     private BusinessLabelMapper businessLabelMapper;
     @Resource
     private ReadBusinessInfoExcel readBusinessInfoExcel;
@@ -108,12 +106,15 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //商务团队
         businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
         //查询是否是项目创建人
-        Long userId = SecurityUtils.getLoginUser().getUserId();
-        if (userId == null) throw new BaseException("请登录");
+//        Long userId = SecurityUtils.getLoginUser().getUserId();
+//        if (userId == null) throw new BaseException("请登录");
+        Long userId = 103l;
         Integer founder = businessUserMapper.selectFounder(businessId, userId);
         businessBrowseVo.setIsFounder(founder == null ? 0 : founder);
         //查询项目标签
-        businessBrowseVo.setLabelList(businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId)).stream().map(p -> p.getLabel()).collect(Collectors.toList()));
+        List<BusinessLabel> labels = businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId));
+        String labelList = CollectionUtil.isEmpty(labels) ? null : JSONObject.toJSONString(BeanUtil.copyToList(labels, BusinessLabelVo.class));
+        businessBrowseVo.setLabelList(labelList);
         //相关数据统计
         BusinessBrowseVo total = businessInfoMapper.selectTotal(businessId);
         businessBrowseVo.setBacklogCount(total.getBacklogCount());

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -48,16 +48,6 @@ public class CustomerServiceImpl implements ICustomerService {
     @Override
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
         dto.setUserId(SecurityUtils.getUserId());
-//        List<CustomerListVo> vos = baseMapper.selectList(dto);
-//        vos.parallelStream().forEach(vo -> {
-//            //合作项目
-//            vo.setCooperationProject(businessInfoService.selectCountByStatusAndCustomerId(2, vo.getCustomerId()));
-//            //跟进项目
-//            vo.setFollowProject(businessInfoService.selectCountByStatusAndCustomerId(1, vo.getCustomerId()));
-//            //储备项目
-//            vo.setReserveProject(businessInfoService.selectCountByStatusAndCustomerId(0, vo.getCustomerId()));
-//        });
-//        return vos;
         return baseMapper.selectList(dto);
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/RegionalEnterprisesServiceImpl.java

@@ -2,10 +2,10 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.model.EnterpriseInfoHeaderBody;
+import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.service.RegionalEnterprisesService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -31,8 +31,8 @@ public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesServic
     private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
-    public AjaxResult enterprisePage(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",object);
+    public AjaxResult enterprisePage(ComposeQueryDto pageDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(pageDto, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
         if (code.equals(HttpStatus.OK.value())) {
             Map data = MapUtils.getMap(map, "data", null);

dsk-system/src/main/resources/mapper/business/BusinessLabelMapper.xml

@@ -62,7 +62,7 @@
     <delete id="deleteBusinessLabelById">
         delete
         from business_label
-        where business_id = #{businessId} and label = #{label}
+        where id = #{labelId}
     </delete>
 
     <delete id="deleteBusinessLabelByIds" parameterType="String">

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -10,17 +10,6 @@
         ct.performance_characteristic, ct.other_ms_characteistic, ct.create_id, ct.create_time, ct.update_id, ct.update_time
     </sql>
 
-    <select id="selectList1" resultType="com.dsk.system.domain.customer.vo.CustomerListVo">
-        select
-             u.nick_name followUser,
-             <include refid="Base_Bean"></include>
-        from customer ct
-        join customer_user ctu on ct.customer_id = ctu.customer_id
-        join sys_user u on ctu.user_id = u.user_id
-        where ctu.user_id = #{dto.userId}
-        <if test="dto.companyName != null and dto.companyName != '' "> and ct.company_name like concat('%',#{dto.companyName},'%')</if>
-    </select>
-
     <select id="selectList" resultType="com.dsk.system.domain.customer.vo.CustomerListVo">
         select
             u.nick_name followUser, bi1.num reserveProject, bi2.num followProject, bi3.num cooperationProject,