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

1fa13ff5 · huangjie · 18f3c4a4 · 9124a0ec · 1fa13ff5 · 1fa13ff5
Commit 1fa13ff5 authored Jun 20, 2023 by huangjie
37 changed files
--- a/dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java
+++ b/dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java
@@ -44,6 +44,8 @@ public class CompanySearchController {
    public AjaxResult page(@RequestBody ComposeQueryDto compose) {
        compose.getPage().setPage(compose.getPageNum());
        compose.getPage().setLimit(compose.getPageSize());
+        compose.getPage().setField(compose.getField());
+        compose.getPage().setOrder(compose.getOrder());
        return opportunityRadarService.enterprisePage(compose);
    }
 }
--- a/dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java
+++ b/dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java
@@ -74,7 +74,6 @@ public class RegionalEconomicDataController {
    public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
        String ip = IpUtil.getIpAddr(request);
        vo.setIp(ip);
-        log.info("location====================================>" +ip);
        return economicService.location(vo);
    }

--- a/dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java
+++ b/dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java
@@ -34,6 +34,10 @@ public class BasePage {
 	 */
 	private Integer pageMaxSize;
+	private String field;
+	private String order;
 	public Integer getPageIndex() {
 		return pageNum;
@@ -74,6 +78,22 @@ public class BasePage {
 		this.pageIndex = pageNum;
 	}
+	public String getField() {
+		return field;
+	}
+	public void setField(String field) {
+		this.field = field;
+	}
+	public String getOrder() {
+		return order;
+	}
+	public void setOrder(String order) {
+		this.order = order;
+	}
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();

--- a/dsk-operate-ui/src/assets/icons/svg/enterpriseTag.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/enterpriseTag.svg
--- a/dsk-operate-ui/src/assets/icons/svg/enterpriseTags.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/enterpriseTags.svg
--- a/dsk-operate-ui/src/assets/styles/public.css
+++ b/dsk-operate-ui/src/assets/styles/public.css
@@ -270,6 +270,9 @@ select {
 	cursor: pointer;
 	position: relative;
 }
+.select-popper  .select-active{
+	color: #0381fa;
+}
 .content_item .select-popper:hover .select-caret {
 	color: #0074E5;

--- a/dsk-operate-ui/src/layout/components/Navbar.vue
+++ b/dsk-operate-ui/src/layout/components/Navbar.vue
@@ -58,7 +58,7 @@ export default {
  },
  methods: {
    async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'

--- a/dsk-operate-ui/src/router/index.js
+++ b/dsk-operate-ui/src/router/index.js
@@ -99,7 +99,7 @@ export const constantRoutes = [
        path: '/enterprise/:id',
        component: () => import('@/views/detail/party-a/index'),
        name: 'PartyA',
-        meta: { title: '甲方详情' },
+        meta: { title: '甲方详情', icon: 'enterprise' },
      }
    ]
  },
@@ -113,7 +113,7 @@ export const constantRoutes = [
        path: '/company/:id',
        component: () => import('@/views/detail/party-b/index'),
        name: 'Company',
-        meta: { title: '已方详情' }
+        meta: { title: '乙方详情' }
      }
    ]
  },

--- a/dsk-operate-ui/src/views/detail/party-a/component/HeadDetailForm.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/component/HeadDetailForm.vue
@@ -45,7 +45,7 @@
            <!-- 输入框 -->
            <template v-if="form.type==3">
              <div class="cooperate-name">
-                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                <span :id="'detailFocus'+i" @click="changeSelect">搜索</span>
              </div>
            </template>
@@ -197,7 +197,6 @@ export default {
        ::v-deep .el-input__inner {
          border-right: 0;
          border-radius: 2px 0 2px 0;
-          width: 180px;
        }
      }
      .fromTime{

--- a/dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
@@ -28,14 +28,14 @@
                prefix-icon="fromTime-icon"
                value-format="yyyy-MM-dd"
                range-separator="至"
-                start-placeholder="开始月份"
+                start-placeholder="开始日期"
-                end-placeholder="结束月份">
+                end-placeholder="结束日期">
              </el-date-picker>
            </template>
            <!-- 输入框 -->
            <template v-if="form.type==3">
              <div class="cooperate-name">
-                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                <span :id="'focus'+i" @click="changeSelect">搜索</span>
              </div>
            </template>
@@ -230,7 +230,6 @@ export default {
        }
        ::v-deep .el-input__inner {
          border-radius: 2px 0 2px 0;
-          width: 180px;
          border: 1px solid #D9D9D9;
          border-right: 0;
        }

--- a/dsk-operate-ui/src/views/detail/party-a/component/Header.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/component/Header.vue
@@ -2,8 +2,9 @@
  <div class="header-container">
    <div class="bread-crumb">
      <el-breadcrumb separator="/">
-        <el-breadcrumb-item :to="{ path: '/enterpriseData' }">企业数据</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
+<!--        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>-->
        <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>
@@ -17,7 +18,7 @@
 <script>
 export default {
  name: 'Header',
-  props: ['companyId', 'companyInfo'],
+  props: ['companyId', 'companyInfo', 'fromPath', 'fromName'],
  data() {
    return {
    }

--- a/dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
@@ -14,7 +14,7 @@
        <el-table-column
          v-if="isIndex"
          label="序号"
-          width="50"
+          :width="flexWidth(tableData)"
          align="left"
          :fixed="indexFixed"
          :resizable="false">
@@ -112,7 +112,6 @@ export default {
  },
  data() {
    return {
    }
  },
  methods:{
@@ -124,6 +123,14 @@ export default {
    },
    sortChange(e){
      this.$emit('sort-change',e)
+    },
+    flexWidth(tableData) {
+      let currentMax = this.queryParams.pageNum*this.queryParams.pageSize - this.queryParams.pageSize + tableData.length, wdth = 50
+      // return currentMax.toString().length*25 + 'px'
+      if(currentMax.toString().length>3){
+        wdth = wdth + (currentMax.toString().length-3)*10
+      }
+      return wdth+'px'
    }
  }
 }
@@ -136,4 +143,36 @@ export default {
 /*::v-deep .el-table__fixed{
  height: calc(100% - 16px) !important;
 }*/
+::v-deep .el-table__row{
+  &:nth-child(even){
+    background-color: #F9FCFF;
+    .more{
+      background: #F8FBFF;
+      span{
+        color: #0081FF;
+      }
+    }
+  }
+  &:nth-child(odd){
+    .more{
+      span{
+        color: #0081FF;
+      }
+    }
+  }
+}
+::v-deep .el-table th.el-table__cell.is-leaf,::v-deep .el-table td.el-table__cell {
+  border-bottom: 1px solid #E6EAF1;
+}
+::v-deep .el-table--border .el-table__cell {
+   border-right: 1px solid #E6EAF1;
+}
+::v-deep .el-table__body tr.hover-row.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped>td,::v-deep .el-table__body tr.hover-row>td{
+  background-color:#DCEBFF;
+  .more{
+    background: #DCEBFF;
+  }
+}
 </style>
--- a/dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
@@ -46,7 +46,7 @@
        <!-- 弹窗关联项目 -->
        <el-drawer
          title="添加合作情况"
-          size="40%"
+          size="45%"
          :visible.sync="drawer"
          :direction="direction"
          :with-header="false"
@@ -55,19 +55,19 @@
            <div class="addhzqk_top">
              <div class="addhzqk_top_t">
                <div class="top_t_h1">
-                  <img src="@/assets/images/economies/icon.png" />{{ info.companyName }}
+                  <img src="@/assets/images/economies/icon.png" />{{ companyInfo.companyName }}
                </div>
                <div class="top_t_close"><i class="el-icon-close" @click="handleClose"></i></div>
              </div>
              <div class="addhzqk_top_d">
                <div class="top_d_item">
-                  法定代表人：<span>{{ info.legalPerson }}</span>
+                  法定代表人：<span>{{ companyInfo.corporatePerson }}</span>
                </div>
                <div class="top_d_item">
-                  注册资本：<span>{{ info.registerCapital }}万</span>
+                  注册资本：<span>{{ companyInfo.regCapital }}</span>
                </div>
                <div class="top_d_item">
-                  注册地址：<span>{{ info.registerAddress }}</span>
+                  注册地址：<span>{{ companyInfo.addressDetail }}</span>
                </div>
              </div>
            </div>
@@ -143,7 +143,7 @@ export default {
  components: {
    Detail
  },
-  props: ['customerIds'],
+  props: ['customerIds','companyInfo'],
  data() {
    return {
      ifEmpty:false,
@@ -161,7 +161,7 @@ export default {
      formData: [
        { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
        { type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询'},
+        { type: 3, fieldName: 'projectName', value: '', placeholder: '输入项目名称关键字搜索'},
      ],
      stageOptions:[],
      statusOptions:[],
@@ -352,7 +352,7 @@ export default {
    },
    //输入数字
    number(value){
-      this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')//输入2位小数
+      this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入2位小数
    },
    //打开详情
    clickDetail(id){

--- a/dsk-operate-ui/src/views/detail/party-a/dealings/component/bidagencyDetail.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/dealings/component/bidagencyDetail.vue
@@ -63,7 +63,7 @@ export default {
        pageSize: 20
      },
      formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
      ],
      forData: [
        {label: '合作项目/工程名称', prop: 'dealTitle', width: '720', slot: true},

--- a/dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
@@ -68,7 +68,7 @@ export default {
        pageSize: 20
      },
      formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
      ],
      forData: [
        {label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true},

--- a/dsk-operate-ui/src/views/detail/party-a/index.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/index.vue
 <template>
  <div class="app-container part-container">
-    <Header :company-id="companyId" :companyInfo="companyInfo" v-if="companyId" />
+    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" v-if="companyId" />
    <div class="flex-box part-main">
      <div class="part-left">
        <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
@@ -46,7 +46,7 @@
            <!-- 招标偏好 -->
            <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" />
            <!-- 合作情况 -->
-            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" />
+            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" />
            <!-- 决策链条 -->
            <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
            <!-- 跟进记录 -->
@@ -147,9 +147,17 @@ export default {
      currentPath: {
        pathName: 'overview'  //默认展示页
      },
-      partBoxHeight: null
+      partBoxHeight: null,
+      fromPath: '',
+      fromName: ''
    }
  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.fromPath = from.path
+      vm.fromName = from.meta.title
+    })
+  },
  created() {
    if (this.$route.params.id) { // 获取companyId
      let companyId = this.$route.params.id

--- a/dsk-operate-ui/src/views/detail/party-a/opport/bond.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/opport/bond.vue
@@ -54,7 +54,7 @@ export default {
        {label: '专项债用作资本金（亿元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
      ],
      formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
      ],
      //列表
      tableLoading:false,

--- a/dsk-operate-ui/src/views/detail/party-a/opport/landtransaction.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/opport/landtransaction.vue
@@ -60,7 +60,7 @@ export default {
      ],
      formData: [
        { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []}
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220}
      ],
      //列表
      tableLoading:false,

--- a/dsk-operate-ui/src/views/detail/party-a/opport/proposed.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/opport/proposed.vue
@@ -60,7 +60,7 @@ export default {
        {label: '是否为民间推介项目', prop: 'isProjcet', width: '150', slot: true}
      ],
      formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
      ],
      //列表
      tableLoading:false,

--- a/dsk-operate-ui/src/views/detail/party-a/opport/tencent.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/opport/tencent.vue
@@ -56,6 +56,7 @@ export default {
      },
      forData: [
        {label: '项目名称', prop: 'projectName', minWidth: '320', slot: true},
+        {label: '发布日期', prop: 'pubdate', width: '110'},
        {label: '金额（万元）', prop: '', children: [
          { label: '建安费暂估', prop: 'projectSafeAmount', width: '88px'},
          { label: '勘察费暂估', prop: 'projectSurveyAmount', width: '88px'},
@@ -74,8 +75,7 @@ export default {
        {label: '分部分项', prop: 'projectSub', width: '130'},
        {label: '项目级别', prop: 'projectLevel', width: '130'},
        {label: '评标办法', prop: 'bidAssessmentWay', width: '130'},
-        {label: '项目属地', prop: 'province', width: '130', slot: true},
+        {label: '项目属地', prop: 'province', width: '130', slot: true}
-        {label: '发布日期', prop: 'pubdate', width: '130'}
      ],
      formData: [
        { type: 1, fieldName: 'projectType', value: '', placeholder: '项目类别', options: []},
@@ -131,6 +131,13 @@ export default {
      this.tableLoading = false
      if(res.code==200){
        this.tableData = res.rows
+        if(this.tableData&&this.tableData.length>0){
+          this.tableData.forEach(item => {
+            item.projectSafeAmount ? item.projectSafeAmount = parseFloat(parseFloat(item.projectSafeAmount).toFixed(4)) : ''
+            item.projectSurveyAmount ? item.projectSurveyAmount = parseFloat(parseFloat(item.projectSurveyAmount).toFixed(4)) : ''
+            item.projectEnsureAmount ? item.projectEnsureAmount = parseFloat(parseFloat(item.projectEnsureAmount).toFixed(4)) : ''
+          })
+        }
      }
      this.tableDataTotal = res.total
    }

--- a/dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue
-<template>
+<template xmlns="http://www.w3.org/1999/html">
  <div class="app-container detail-container">
    <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
      <el-tab-pane label="工商信息" name="first"></el-tab-pane>
@@ -10,6 +10,22 @@
      <template slot="provinceCode" slot-scope="scope">
        <span>{{showRegion(scope.data.provinceCode)}}</span>
      </template>
+      <template slot="term" slot-scope="scope">
+        <span v-if="scope.data.termStart&&scope.data.termEnd">{{ scope.data.termStart }} ~ {{ scope.data.termEnd }}</span>
+        <span v-else-if="scope.data.termStart&&!scope.data.termEnd">{{ scope.data.termStart }}起</span>
+        <span v-else-if="!scope.data.termStart&&scope.data.termEnd">{{ scope.data.termEnd }}止</span>
+        <span v-else>--</span>
+      </template>
+      <template slot="actualCapi" slot-scope="scope">
+        <span>
+          {{ scope.data.actualCapi?scope.data.actualCapi+'万元人民币':'--' }}
+        </span>
+      </template>
+      <template slot="colleguesNum" slot-scope="scope">
+        <span>
+          {{ scope.data.colleguesNum?scope.data.colleguesNum+'人':'--' }}
+        </span>
+      </template>
    </info-table>
    <tables
      :tableLoading="tableLoading"
@@ -53,18 +69,18 @@ export default {
        { name: '登记状态', prop: 'status' },
        { name: '成立日期', prop: 'startDate' },
        { name: '注册资本', prop: 'registCapi' },
-        { name: '实缴资本', prop: 'actualCapi' },
+        { name: '实缴资本', prop: 'actualCapi', slot: true },
        { name: '核准日期', prop: 'checkDate' },
        { name: '组织机构代码', prop: 'orgNo' },
        { name: '工商注册号', prop: 'regNo' },
        { name: '纳税人识别号', prop: 'creditNo' },
        { name: '企业类型', prop: 'econKind' },
-        { name: '营业期限', prop: 'termEnd' },
+        { name: '营业期限', prop: 'term', slot: true },
        { name: '纳税人资质', prop: 'qualification' },
        { name: '所属地区', prop: 'provinceCode', slot: true },
        { name: '登记机关', prop: 'belongOrg' },
-        { name: '人员规模', prop: 'colleguesNum' },
+        { name: '人员规模', prop: 'colleguesNum', slot: true },
-        { name: '参保人数', prop: 'colleguesNum' },
+        { name: '参保人数', prop: 'colleguesNum', slot: true },
        { name: '经营范围', prop: 'scope', style: true }
      ],
      forData: [

--- a/dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
@@ -185,7 +185,7 @@ export default {
        this.tableLoading = false
        if(res.code==200){
          this.dialogVisible=true
-          this.ifClaim = true
+          this.ifClaim = 1
        }
      }else{
        this.$message.warning('对不起，当前不能认领')
@@ -226,7 +226,7 @@ export default {
    },
    //获取认领状态
    getClaimStatus(){
-      this.ifClaim = this.companyInfo.regCapital
+      this.ifClaim = this.companyInfo.claimStatus
    },
    handleWidth(){
      if(this.companyInfo.introduction){

--- a/dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue
@@ -11,7 +11,12 @@
        <el-table-column label="序号" width="55" align="left" fixed>
          <template slot-scope="scope">{{ holderParams.pageNum * holderParams.pageSize - holderParams.pageSize + scope.$index + 1 }}</template>
        </el-table-column>
-        <el-table-column prop="stockName" min-width="140" label="股东名称"></el-table-column>
+        <el-table-column min-width="140" label="股东名称">
+          <template slot-scope="scope">
+            <router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName" v-html="scope.row.stockName"></router-link>
+            <div v-else v-html="scope.row.stockName  || '--'"></div>
+          </template>
+        </el-table-column>
        <el-table-column prop="shouldCapiConv" label="应缴金额"></el-table-column>
        <el-table-column prop="stockPercent" label="持股比例"></el-table-column>
        <el-table-column prop="" label="法定代表人">

--- a/dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue
@@ -46,8 +46,8 @@ export default {
        {label: '列入日期', prop: 'inDate', width: '95'},
        {label: '做出决定机关（移入）', prop: 'department', width: '264'},
        {label: '移出经营异常名录原因', prop: 'outReason', width: '320'},
-        {label: '移除日期', prop: 'outDate', width: '95'},
+        {label: '移出日期', prop: 'outDate', width: '95'},
-        {label: '做出决定机关（移除）', prop: 'outDepartment', width: '264'}
+        {label: '做出决定机关（移出）', prop: 'outDepartment', width: '264'}
      ],
      formData: [
        { type: 4, fieldName: 'years', value: '', placeholder: '列入时间', options: []}

--- a/dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
@@ -21,7 +21,7 @@
      <template slot="punishReason" slot-scope="scope">
        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
          <div v-html="scope.row.punishReason"></div>
-          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
+          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)" class="more">...<span>更多</span></span>
        </span>
      </template>
    </tables>

--- a/dsk-operate-ui/src/views/radar/components/Bidding/index.vue
+++ b/dsk-operate-ui/src/views/radar/components/Bidding/index.vue
@@ -185,11 +185,11 @@
 					</p>
 					<p class="list-content-text">
 						<span>预计招标时间：</span>
-						<span>{{item.issueTimestamp||'--'}}</span>
+						<span>{{item.planTenderDateStart||'--'}}</span>
 					</p>
 					<p class="list-content-text">
 						<span>来源网站：</span>
-						<span  >{{item.issueTimestamp||'--'}}</span>
+						<span  >{{item.sourceName||'--'}}</span>
 					</p>

--- a/dsk-operate-ui/src/views/radar/components/Establishment/index.vue
+++ b/dsk-operate-ui/src/views/radar/components/Establishment/index.vue
@@ -1057,8 +1057,6 @@
 			reset() {
 				Object.assign(this.$data, this.$options.data.call(this)); //重置data
 				this.init();
-				this.$emit("reset");
-				this.token = getCookie("tokenNew");
 			},
 			init() {
 				this.search();

--- a/dsk-operate-ui/src/views/radar/components/Land/index.vue
+++ b/dsk-operate-ui/src/views/radar/components/Land/index.vue
@@ -234,15 +234,19 @@
 						<div  class="list-content">
 							<p class="list-content-text">
 								<span>受让人：</span>
-								<router-link :to="'/company/' + encodeStr(item.id)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
+								<span v-if="item.companyName">
+									<router-link :to="'/company/' + encodeStr(item.id)  + '/?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">
 								<span>成交金额：</span>
-								<span>{{item.transactionPrice||'--'}}</span>
+								<span>{{item.transactionPrice||'--'}}万元</span>
 							</p>
 							<p class="list-content-text">
 								<span>总面积：</span>
-								<span>{{item.acreage||'--'}}</span>
+								<span>{{item.acreage||'--'}}㎡</span>
 							</p>
 							<p class="list-content-text">
 								<span>合同签订：</span>
@@ -254,6 +258,10 @@
 								<span>土地用途：</span>
 								<span >{{item.landUse||'--'}}</span>
 							</p>
+							<p class="list-content-text">
+								<span>行业分类：</span>
+								<span >{{item.industry||'--'}}</span>
+							</p>
 							<p class="list-content-text">
 								<span>供应方式：</span>
 								<span >{{item.supplyLandWay||'--'}}</span>
@@ -275,7 +283,8 @@
 							</p>
 							<p class="list-content-text">
 								<span>土地坐落：</span>
-								<span >{{item.landAddr||'--'}}</span>
+								<span v-if="item.landAddr" v-html="item.landAddr"></span>
+								<span v-else>--</span>
 							</p>
 						</div>
 					</li>
@@ -562,7 +571,7 @@
 			searchDic(){
 				api.searchDic().then(res=>{
 					this.landMarketIndustryList = res.landMarketIndustry;
-					this.landUseOptions = res.data.landUse
+					this.landUseOptions = res.landUse
 				}).catch(error=>{
 				});

--- a/dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
+++ b/dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
@@ -63,7 +63,7 @@
 		           工程类型{{jskBidNewsDto.projectType.length? jskBidNewsDto.projectType.length + "项": ""}}
 		           <i class="el-icon-caret-bottom"></i>
 		         </span>
-		         <el-select v-model="jskBidNewsDto.projectType" class="select-multiple" multipleplaceholder="请选择">
+		         <el-select v-model="jskBidNewsDto.projectType" class="select-multiple" multiple placeholder="请选择">
 		           <el-option v-for="(item, i) in projectTypeList" :key="i":label="item" :value="item">
 		           </el-option>
 		         </el-select>
@@ -283,7 +283,7 @@
 		    <div class="label">人员要求</div>
 		    <div class="content_right">
 		        <el-input class="ename_input" 
-				placeholder="请输入关键词句，如：建筑工程" v-model="jskBidNewsDto.personLimit" ></el-input>
+				placeholder="请输入关键词句，如：一级建造师" v-model="jskBidNewsDto.personLimit" ></el-input>
 				<span class="land_content_wrap_label_tipspan">
 				  <el-tooltip popper-class="explain_tooltip" content="根据输入的关键词全称进行匹配"
 				              placement="bottom" effect="light">
@@ -882,7 +882,8 @@
    created() {
      this.searchDic();
      this.clickProvince(0,1);
-	  this.bxproggSearch();
+	  this.search();
+	  this.changeDown(false)
    },
    mounted() {
    },
@@ -1002,7 +1003,7 @@
        }
        this.fieldText = this.fieldOptions[index].value;
        this.fieldOptions[index].status = true;
-        this.bxproggSearch();
+        this.search();
      },
      //项目级别
      addressListfn() {
@@ -1431,12 +1432,12 @@
      handleCurrentChange(e){
        this.page = e;
        this.jump1();
-        this.bxproggSearch(e, this.limit);
+        this.search(e, this.limit);
      },
      handleSizeChange(e){
        this.limit = e;
        this.jump1();
-        this.bxproggSearch(this.page, e);
+        this.search(this.page, e);
      },
      jump1() {
        // 用 class="d_jump" 添加锚点
@@ -1489,10 +1490,10 @@
      },
      lowerRateClick() {
-        this.bxproggSearch();
+        this.search();
      },
-      bxproggSearch(page, limit,exportFlag){
+      search(page, limit,exportFlag){
        // return false;
        if (!page) {
          this.page = 1;
@@ -1504,6 +1505,7 @@
          this.reloadPage();
        }
        var data = JSON.parse(JSON.stringify(this.jskBidNewsDto));
+		console.log(data);
        if(this.projectTerritoryId.length >0){
          for (var i=0;i<this.projectTerritoryId.length;i++){
@@ -1561,8 +1563,17 @@
      reset(){
        Object.assign(this.$data, this.$options.data.call(this)); //重置data
        // this.clickProvince(0,1);
-        this.bxproggSearch();
+        this.search();
      },
+		changeDown(isHeight){
+		  if(isHeight){
+			this.isHeight = false
+			this.maxHeight = 'auto'
+		  }else{
+			this.isHeight = true
+			this.maxHeight = '36px'
+		  }
+		},
      provinceChange(e){
        let obj=''

--- a/dsk-operate-ui/src/views/radar/components/debtProject/index.vue
+++ b/dsk-operate-ui/src/views/radar/components/debtProject/index.vue
@@ -7,8 +7,8 @@
 			        <el-input class="ename_input" 
 					placeholder="请输入项目名称关键字" v-model="projectName" ></el-input>
 			        <template v-if="projectName">
-			            <span v-for=" (item,k)  in enameQueryTypeList" :key="k" style="margin-right: 24px;">
+			            <span v-for=" (item,k)  in nameTypeList" :key="k" style="margin-right: 24px;">
-			                <el-radio v-model="enameQueryType" :label="item.key">{{item.value}}</el-radio>
+			                <el-radio v-model="nameType" :label="item.key">{{item.value}}</el-radio>
 			            </span>
 			        </template>
 			    </div>
@@ -66,7 +66,7 @@
 					    项目类型{{projectType.length? projectType.length + "项": ""}}
 					    <i class="el-icon-caret-bottom"></i>
 					  </span>
-					  <el-select v-model="projectType" class="select-multiple"  multipleplaceholder="请选择">
+					  <el-select v-model="projectType" class="select-multiple"  multiple placeholder="请选择">
 					    <el-option v-for="(item, i) in specialBondProjectType" :key="i":label="item" :value="item">
 					    </el-option>
 					  </el-select>
@@ -108,7 +108,7 @@
 					</div>
 					<div  class="list-content">
-						<p class="list-content-text" v-if="item.projectType">
+						<p class="list-content-text" v-if="item.projectType&&item.projectType!='空白'">
 							<span>项目类型：</span>
 							<span>{{item.projectType}}</span>
 						</p>
@@ -116,27 +116,27 @@
 							<span>项目总投资(亿)：</span>
 							<span>{{item.projectTotalInvestment}}</span>
 						</p>
-						<p class="list-content-text" v-if="item.specialCapital">
+						<p class="list-content-text" v-if="item.projectCapital">
 							<span>项目资本金(亿)：</span>
 							<span>{{item.projectCapital}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text" v-if="item.specialBondCapital">
 							<span>专项债金额(亿)：</span>
-							<span>{{item.specialCapital}}</span>
+							<span>{{item.specialBondCapital}}</span>
 						</p>
 					</div>
 					<div  class="list-content">
-						<p class="list-content-text" v-if="item.specialCapital">
+						<p class="list-content-text" v-if="item.projectEntity">
 							<span>项目主体：</span>
-							<span >{{item.projectEntity}}</span>
+							<span v-html="item.projectEntity"></span>
 						</p>
 						<p class="list-content-text" v-if="item.chargeDepartment">
 							<span>主管部门：</span>
-							<span >{{item.chargeDepartment}}</span>
+							<span  v-html="item.chargeDepartment"></span>
 						</p>
 						<p class="list-content-text"  v-if="item.piu">
 							<span>实施单位：</span>
-							<span >{{item.piu}}</span>
+							<span v-html="item.piu"></span>
 						</p>
 					</div>
 				</li>
@@ -171,20 +171,18 @@
 			return {
 				encodeStr,
 				projectName:'',
-				enameQueryTypeList: [{
+				nameTypeList: [{
-				        key: 'and',
+				        key: 'like',
 				        status: false,
 				        value: '模糊搜索',
-				        keyid: 'businessScope'
 				    },
 				    {
-				        key: 'or',
+				        key: 'match',
 				        status: true,
 				        value: '精准匹配',
-				        keyid: 'businessScope'
 				    },
 				],
-				enameQueryType: 'or',
+				nameType: 'match',
 				projectEntity:'',
 				countTypelist: [{
 						key: '1',
@@ -201,7 +199,7 @@
 				],
 				chargeDepartment: {
 					key: '3',
-					value: '实施单位'
+					value: '项目主体'
 				},
 				addressList: [],
 				addressType: [],
@@ -213,7 +211,7 @@
 				specialBondProjectType: [
 				],
 				projectTypeText: ['不限'],
-				projectType:['不限'],
+				projectType:[],
 				arrList:[],
 				pageFlag:true,
@@ -226,11 +224,14 @@
 			}
 		},
 		created() {
-			this.addressListfn();
+			this.init();
-			this.searchDic();
-			this.search();
 		},
 		methods: {
+			init(){
+				this.addressListfn();
+				this.searchDic();
+				this.search();
+			},
 		     searchDic(){
 				 api.searchDic().then(res=>{
 				this.specialBondProjectType=res.specialBondProjectType;
@@ -444,7 +445,7 @@
 			  if(this.projectName){
 				  params.specialBondProjectDto['projectName']=this.projectName;
-				  params.specialBondProjectDto['enameQueryType']=this.enameQueryType;
+				  params.specialBondProjectDto['nameType']=this.nameType;
 			  }
 			  if(this.projectEntity){
@@ -534,7 +535,8 @@
 				        return this.hasValue;
 			},
 			reset(){
+				Object.assign(this.$data, this.$options.data.call(this)); //重置data
+				this.init();
 			}
 		}
 	}

--- a/dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerBusinessSearchDto.java
+++ b/dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerBusinessSearchDto.java
@@ -19,6 +19,10 @@ public class CustomerBusinessSearchDto implements Serializable {
     * 企业id
     */
    private Long userId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
    /**
     * 项目阶段
     */

--- a/dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java
+++ b/dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java
@@ -130,5 +130,10 @@ public class BusinessBrowseVo {
     */
    private Integer fileCount;
+    /**
+     * 是否创建人(1 是,0 否)
+     */
+    private Integer isFounder;
 }
--- a/dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
+++ b/dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
@@ -56,7 +56,10 @@ public class EnterpriseService {
        companyData.put("claimStatus", 0);
        companyData.put("uipId", null);
-        Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = BeanUtil.beanToMap(body, false, false);
+        map.put("cid", body.getCompanyId());
+        Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", map);
        Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
        if (200 != uipCode) return R.ok(companyData);

--- a/dsk-system/src/main/java/com/dsk/system/mapper/BusinessUserMapper.java
+++ b/dsk-system/src/main/java/com/dsk/system/mapper/BusinessUserMapper.java
 package com.dsk.system.mapper;
 import com.dsk.common.core.domain.entity.BusinessUser;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
 /**
@@ -65,4 +67,11 @@ public interface BusinessUserMapper
     * @return
     */
    String selectCreatorByBusinessId(Integer businessId);
+    /**
+     * 查询是否为项目的创建人
+     * @param businessId
+     * @return
+     */
+    Integer selectFounder(@Param("businessId") Integer businessId,@Param("userId") Long userId);
 }
--- a/dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
+++ b/dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
@@ -2,6 +2,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.dsk.common.config.RuoYiConfig;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
@@ -70,7 +71,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
    @Override
    public BusinessInfo getConstruction(Integer id) {
-        return businessInfoMapper.getConstruction(id);
+        BusinessInfo businessInfo =businessInfoMapper.getConstruction(id);
+        return ObjectUtil.isEmpty(businessInfo) ? new BusinessInfo() : businessInfo;
    }
    /**
@@ -89,7 +91,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
            dto.setOthers(userId.intValue());
            //查询他人可见项目
            othersList = businessInfoMapper.selectBusinessInfoList(dto);
        }
        dto.setOthers(null);
        //查询自己参与的项目
@@ -103,9 +104,14 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
        BusinessBrowseVo businessBrowseVo = new BusinessBrowseVo();
        //查询项目基本信息
        BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
-        BeanUtil.copyProperties(businessInfo, businessBrowseVo);
+        if(ObjectUtil.isNotEmpty(businessInfo)) BeanUtil.copyProperties(businessInfo, businessBrowseVo);
        //商务团队
        businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
+        //查询是否是项目创建人
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+        if (userId == null) throw new BaseException("请登录");
+        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()));
        //相关数据统计

--- a/dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
+++ b/dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
@@ -388,6 +388,7 @@
        from business_info bi
        left join business_user bu on bi.id = bu.business_id
        where bi.customer_id = #{customerId} and (bu.user_id = #{userId} or bi.is_private = 1)
+        <if test="projectName != null and projectName != '' "> and bi.project_name like concat('%',#{projectName},'%') </if>
        <if test="projectStage != null and projectStage != '' "> and bi.project_stage = #{projectStage}</if>
        <if test="status != null "> and bi.status = #{status}</if>
        order by bi.create_time desc

--- a/dsk-system/src/main/resources/mapper/business/BusinessUserMapper.xml
+++ b/dsk-system/src/main/resources/mapper/business/BusinessUserMapper.xml
@@ -41,6 +41,12 @@
        where bu.is_founder = 1
        and i.id = #{BusinessId}
    </select>
+    <select id="selectFounder" resultType="java.lang.Integer">
+        select is_founder
+        from business_user
+        where business_id = #{businessId}
+        and user_id = #{userId}
+    </select>
    <insert id="insertBusinessUser" parameterType="com.dsk.common.core.domain.entity.BusinessUser" useGeneratedKeys="true" keyProperty="id">
        insert into business_user