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

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

@@ -2,6 +2,8 @@ package com.dsk.common.dtos;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 组合查询参数
  * @author Administrator
@@ -48,13 +50,16 @@ public class JskBidPlanDto {
 	String projectCapitalSource;
 	//发布时间
 	String issueTime;
+	//发布时间开始
+	Date startIssueTime;
+	//发布时间结束
+	Date endIssueTime;
 	//计划发布开始时间
 	String planTenderDateStart;
 	//计划发布截止时间
 	String planTenderDateEnd;
 	//来源网站
 	String sourceName;
-
 	/**
 	 * 修改时间
 	 */

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

@@ -25,7 +25,7 @@
 						<p class="list-content-text">
 							<span>招采单位：</span>
 							<span v-if="textList.tenderee">
-								<router-link  :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a blue" v-html="scope.row.tenderee"></router-link>
+								<router-link  :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
 							</span>
 							<span v-else>--</span>
 						</p>

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

@@ -49,7 +49,7 @@
 				<p>
 					<label class="label">项目法人</label>
 					<span>
-						<router-link v-if="textList.companyName"  :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
+						<router-link v-if="textList.companyName"  :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
 						<span v-else>--</span>
 					</span>
 					<label class="label">总投资（万元）</label>

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

@@ -454,7 +454,7 @@
 					 </el-table-column>
 					 <el-table-column prop="zj" label="招标人" width="280" >
 					 			<template slot-scope="scope">
-									<span class="list-titel-a"   @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee">
+									<span class="list-titel-a"   @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee">
 									</span>
 					 			
 					 			</template>

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

@@ -136,14 +136,14 @@
 			<div class="main4-box">
 				<label class="label">项目主体</label>
 				<span>
-					<router-link v-if="textList.projectEntity"  :to="scope.row.projectEntityUipId?'/enterprise/' + encodeStr(scope.row.projectEntityUipId) :'/company/' + encodeStr(scope.row.projectEntityId) " tag="a" class="list-titel-a blue" v-html="scope.row.projectEntity"></router-link>
+					<router-link v-if="textList.projectEntity"  :to="textList.projectEntityUipId?'/enterprise/' + encodeStr(textList.projectEntityUipId) :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
 				     <template v-else>--</template>
 				</span>
 				<label class="label">主管部门</label>
 				<span>{{textList.chargeDepartment||'--'}}</span>
 				<label class="label">实施单位</label>
 				<span>
-				<router-link v-if="textList.piu"  :to="scope.row.piuUipId?'/enterprise/' + encodeStr(scope.row.piuUipId) :'/company/' + encodeStr(scope.row.piuId) " tag="a" class="list-titel-a blue" v-html="scope.row.piu"></router-link>
+				<router-link v-if="textList.piu"  :to="textList.piuUipId?'/enterprise/' + encodeStr(textList.piuUipId) :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
 				 <template v-else>--</template>
 				</span>
 			</div>