Merge remote-tracking branch 'origin/master'

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

@@ -74,4 +74,12 @@ public class BusinessOpportunityRadarController {
     public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
         return opportunityRadarService.jskBidPlanPage(compose);
     }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlan/getCapitalSourceSelect")
+    public AjaxResult getCapitalSourceSelect() {
+        return opportunityRadarService.getCapitalSourceSelect();
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -27,4 +27,7 @@ public interface BusinessOpportunityRadarService {
     AjaxResult bondProjectPage(ComposeQueryDto compose);
 
     AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+
+    AjaxResult getCapitalSourceSelect();
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -82,4 +82,10 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult getCapitalSourceSelect() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

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

@@ -28,7 +28,6 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
     /*
      * 1金额倒序，2金额正序，3计划开工时间倒序，4计划开工时间正序，13计划完工时间倒序，14计划完工时间正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 }

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

@@ -32,7 +32,6 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
     /*
      * 1金额倒序，2金额正序，3时间倒序，4时间正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
     /**

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

@@ -27,7 +27,6 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
     /*
      * 排序字段：1金额倒序，2金额正序，3发布时间倒序，4发布时间正序，15预计招标时间倒序，16预计招标时间正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 

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

@@ -33,7 +33,6 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage {
     /*
      * 1金额倒序，2金额正序，3时间倒序，4时间正序，11面积倒序，12面积正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 }

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

@@ -27,7 +27,6 @@ public class EnterpriseProjectSpecialDebtProjectPageBody extends BasePage {
     /*
      * 排序字段：1总投资金额倒序，2总投资金额正序，17项目资本金倒序，18项目资本金正序，19专项债用作资本金倒序，20专项债用作资本金正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 }

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

@@ -23,7 +23,6 @@ public class EnterpriseUipSearchBody extends BasePage {
     /*
      * 1供应商倒序，2供应商正序，3拟建项目倒序，4拟建项目正序，5招标公告倒序，6招标公告正序,7土地倒序，8土地正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
     /**

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

@@ -7,4 +7,13 @@ let importData= function importData(param) {
     data: param
   })
 }
-export default {importData}
\ No newline at end of file
+// 查询条件字段
+let searchDic= function searchDic(param) {
+  return request({
+    url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
+    method: 'get',
+
+  })
+}
+
+export default {importData,searchDic}
\ No newline at end of file

dsk-operate-ui/src/assets/js/common.js

@@ -49,7 +49,13 @@ function changePath(that, pathName){
   }
 }
 
+//保留小数N位
+function saveFixed(field, num=2){
+  return parseFloat(field.toFixed(num))
+}
+
 export {
   encodeStr,
-  changePath
+  changePath,
+  saveFixed
 }

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

@@ -181,6 +181,7 @@
       margin-top: 2px;
       &:hover{
         background: url("../../assets/images/project/add_1.png") no-repeat center center;
+        background-size: 100%;
       }
     }
     .tips{
@@ -890,6 +891,7 @@
       float: left;
       margin-right: 8px;
       margin-top: -2px;
+      width: 24px;
     }
   }
 }

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

@@ -45,8 +45,8 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input v-model="form.value" :placeholder="form.placeholder"></el-input>
-                <span @click="changeSelect">搜索</span>
+                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <span :id="'detailFocus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
             <!-- 多选 -->
@@ -117,6 +117,9 @@ export default {
   methods: {
     changeSelect(){
       this.$emit('handle-search')
+    },
+    clickFocus(e){
+      document.getElementById(e).classList.toggle('span-ba')
     }
   }
 }
@@ -183,13 +186,18 @@ export default {
           border-left: 0;
           cursor: pointer;
         }
+        .span-ba{
+          color: #ffffff;
+          background: #0081FF;
+          border: 1px solid #0081FF;
+        }
         ::v-deep .el-input{
           flex: 1;
         }
         ::v-deep .el-input__inner {
           border-right: 0;
           border-radius: 2px 0 2px 0;
-          width: 259px;
+          width: 180px;
         }
       }
       .fromTime{
@@ -208,6 +216,22 @@ export default {
     ::v-deep .form-content-width{
       width: 170px;
     }
+    ::v-deep .selectTag{
+      .el-select__tags{
+        .el-tag{
+          &:first-child{
+            width: 90px;
+          }
+        }
+      }
+    }
+    ::v-deep .el-select__tags{
+      .el-tag{
+        &:first-child{
+          width: 100%;
+        }
+      }
+    }
   }
 }
 </style>

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

@@ -35,7 +35,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input clearable @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
                 <span :id="'focus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>

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

+<template>
+  <div class="no-data">
+    <div class="no-data-box">
+      <img :src="noData" alt="暂时没有找到相关数据" />
+      <span>暂时没有找到相关数据</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "NoData",
+  props: {
+
+  },
+  data() {
+    return {
+      noData: require("@/assets/images/detail/noData.png")
+    }
+  },
+  methods:{
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    width: 100%;
+    height: 100%;
+    min-height: 140px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 54px;
+        height: 69px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+</style>

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

@@ -21,11 +21,11 @@
       @sort-change="sortChange"
     >
       <template slot="agency" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency" v-html="scope.row.agency"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency" v-html="scope.row.agency"></router-link>
         <div v-else v-html="scope.row.agency || '--'"></div>
       </template>
       <template slot="projectInfo" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.projectInfo.bid&&scope.row.projectInfo.dealTitle" v-html="scope.row.projectInfo.dealTitle"></router-link>
+        <router-link :to="`/radar/Tender/details/${scope.row.projectInfo.bid}`" tag="a" class="a-link" v-if="scope.row.projectInfo.bid&&scope.row.projectInfo.dealTitle" v-html="scope.row.projectInfo.dealTitle"></router-link>
         <div v-else v-html="scope.row.projectInfo.dealTitle || '--'"></div>
         <div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
       </template>

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

@@ -19,7 +19,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="name" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name" v-html="scope.row.name"></router-link>
+        <router-link :to="`/radar/BidRecord/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name" v-html="scope.row.name"></router-link>
         <div v-else v-html="scope.row.name || '--'"></div>
       </template>
       <template slot="source" slot-scope="scope">
@@ -80,9 +80,11 @@ export default {
       this.tableDataTotal = res.total
     },
     handlePic(url){
+      if(url){
         window.open(url, "_blank")
       }
     }
+  }
 }
 </script>
 <style lang="scss" scoped>

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

@@ -27,7 +27,7 @@
         <template slot="dealTitle" slot-scope="scope">
           <div class="flex-box">
             <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.fileUrlL" @click="handlePic(scope.row.fileUrlL)"/>
-            <router-link to="" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
+            <router-link :to="`/radar/Tender/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
             <span v-else v-html="scope.row.dealTitle || '--'"></span>
           </div>
         </template>
@@ -45,20 +45,10 @@ import {bidCooperatePage} from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
 
 export default {
-  props: {
-    'data': {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    'title': {
-      type: String,
-      default: () => {
-        return ''
-      }
-    }
-  },
+  props: [
+    'data',
+    'title'
+  ],
   components: {
     HeadDetailForm
   },
@@ -106,7 +96,9 @@ export default {
       this.amountTotal = res.totalAmount
     },
     handlePic(url){
+      if(url){
         window.open(url, "_blank")
+      }
     },
     cancel() {
       this.$emit('cancel')

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

@@ -27,7 +27,8 @@
         <template slot="projectAllName" slot-scope="scope">
           <div class="flex-box">
             <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.sourceUrl" @click="handlePic(scope.row.sourceUrl)"/>
-            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>
+            <div class="a-link" @click="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div>
+<!--            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
             <span v-else v-html="scope.row.projectAllName || '--'"></span>
           </div>
         </template>
@@ -45,26 +46,11 @@ import {clientProjectPage} from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
 
 export default {
-  props: {
-    'data': {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    'company-id': {
-      type: Number,
-      default: () => {
-        return 0
-      }
-    },
-    'title': {
-      type: String,
-      default: () => {
-        return ''
-      }
-    }
-  },
+  props: [
+    'data',
+    'company-id',
+    'title'
+  ],
   components: {
     HeadDetailForm
   },
@@ -114,7 +100,9 @@ export default {
       this.amountTotal = res.totalAmount
     },
     handlePic(url){
+      if(url){
         window.open(url, "_blank")
+      }
     },
     cancel() {
       this.$emit('cancel')