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

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

@@ -282,7 +282,7 @@
   .el-table .el-table__header-wrapper th,.el-table th.el-table__cell.is-leaf{
     color: #4f4f4f;
     background: #F0F3FA;
-    font-size: 12px;
+    font-size: 13px;
     font-weight: 400;
   }
   .el-table__fixed::before{
@@ -306,7 +306,7 @@
     line-height: 20px;
     padding: 0 12px;
     color: #232323;
-    font-size: 12px;
+    font-size: 13px;
   }
   .el-table--border .el-table__cell{
     border-color: #E6EAF1;
@@ -897,7 +897,7 @@
     }
     .el-table__header-wrapper th{
       background: #FFFFFF;
-      font-size: 12px;
+      font-size: 13px;
       opacity: 0.8;
       font-weight: 400;
     }

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -4,7 +4,7 @@
       <tags-view />
     </div>
     <div ref="rightMenu" class="flex-box right-menu">
-      <div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>
+      <!--<div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>-->
       <i class="menu-line" />
       <el-dropdown class="avatar-container" trigger="hover">
         <div class="flex-box avatar-wrapper">

dsk-operate-ui/src/router/index.js

@@ -226,7 +226,13 @@ export const constantRoutes = [
 	      component: () => import('@/views/radar/Tender/details'),
 	      name: 'TenderDetails',
 	      meta: { title: '公招标讯详情', icon: 'radar' }
-	    }
+	    },
+      {
+        path: '/radar/Notice/details/:id',
+        component: () => import('@/views/radar/Tender/details'),
+        name: 'NoticeDetails',
+        meta: { title: '招标公告详情', icon: 'radar' }
+      }
 	  ]
 	},
 	{

dsk-operate-ui/src/utils/request.js

@@ -110,7 +110,11 @@ service.interceptors.response.use(res => {
     } else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
-    Message({ message: message, type: 'error', duration: 5 * 1000 })
+    if(message=='数据正在处理，请勿重复提交'){ //重复提交，提示样式特殊处理
+      Message({ message: message, type: 'warning', duration: 5 * 1000 })
+    }else{
+      Message({ message: message, type: 'error', duration: 5 * 1000 })
+    }
     return Promise.reject(error)
   }
 )

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -364,6 +364,7 @@ export default {
     },
     //获取建设库客户
     getCompany(value){
+      this.queryParam.companyId = null
       if (value.length>=2){
         let param = {
           keyword:value,
@@ -381,15 +382,21 @@ export default {
       }
     },
     selCompany(item){
-      console.log(item)
       this.queryParam.companyId = item.jskEid
       this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
       this.queryParam.legalPerson = item.legalPerson
-      this.queryParam.registerCapital = item.registeredCapitalStr
+      let registeredCapitalStr = ""
+      if(item.registeredCapitalStr == "0" || item.registeredCapitalStr == 0){
+        registeredCapitalStr = ''
+      }else{
+        registeredCapitalStr = item.registeredCapitalStr
+      }
+      this.queryParam.registerCapital = registeredCapitalStr
       this.queryParam.creditCode = item.creditCode
       this.queryParam.provinceId = item.provinceId
       this.queryParam.cityId = item.cityId
       this.queryParam.districtId = item.cityId
+
       let list = []
       if(item.provinceId != null && item.provinceId != "")
         list.push(item.provinceId)
@@ -403,11 +410,11 @@ export default {
     },
     //添加客户
     submitForm(formName) {
-      if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
-        this.$message.error({message:'请选择企业！',showClose:true})
-
-        return;
-      }
+      // if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
+      //   this.$message.error({message:'请选择企业！',showClose:true})
+      //
+      //   return;
+      // }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           addCustomer(this.queryParam).then(result=>{

dsk-operate-ui/src/views/custom/trends/index.vue

@@ -7,7 +7,7 @@
     </div>
 
     <div class="app-container">
-    <gjjl types="gjdt" :data="datas"></gjjl>
+    <gjjl types="gjdt" :data="datas" isDisabled=false></gjjl>
     </div>
   </div>
 </template>

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

@@ -62,6 +62,7 @@ export default {
     background: #FFFFFF;
     padding: 14px 16px;
     margin-top: 12px;
+    border-radius: 4px;
     .header-logo{
       width: 28px;
       height: 28px;

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

@@ -174,6 +174,7 @@ export default {
       min-height: calc(100vh - 170px);
       padding-bottom: 20px;
       background: #FFFFFF;
+      border-radius: 4px;
       .side-input{
         width: 128px;
         margin-top: 16px;
@@ -189,6 +190,7 @@ export default {
           }
         }
         .el-icon-search{
+          line-height: 34px;
           color: #0081FF;
           cursor: pointer;
         }
@@ -204,6 +206,7 @@ export default {
           padding: 0 0 0 16px !important;
           text-align: initial !important;
           &:hover, &:focus, &.is-active{
+            color: #0081FF !important;
             background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
           }
           .el-submenu__icon-arrow{

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>
+      <img :src="noData" alt="抱歉，没找到相关数据" />
+      <div>抱歉，没找到相关数据</div>
+      <span v-if="condition">建议调整关键词或筛选条件，重新搜索</span>
     </div>
   </div>
 </template>
@@ -11,7 +12,10 @@
 export default {
   name: "NoData",
   props: {
-
+    condition: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -27,28 +31,30 @@ export default {
 <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;
+    min-height: 120px;
     display: flex;
     justify-content: center;
     align-items: center;
     background: #ffffff;
-    border-radius: 0px 0px 0px 0px;
-    opacity: 1;
-    border: 1px solid #eeeeee;
+    //border: 1px solid #eeeeee;
     .no-data-box {
       display: flex;
       flex-direction: column;
       align-items: center;
       img {
-        width: 54px;
-        height: 69px;
-        margin-bottom: 16px;
+        width: 108px;
+        height: 109px;
+        margin-bottom: 22px;
+      }
+      div{
+        font-size: 16px;
+        color: #333333;
+      }
+      span{
+        margin-top: 4px;
       }
     }
   }

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

@@ -49,7 +49,7 @@
         <!-- 弹窗关联项目 -->
         <el-drawer
           title="添加合作情况"
-          size="45%"
+          size="50%"
           :visible.sync="drawer"
           :direction="direction"
           :with-header="false"
@@ -501,8 +501,25 @@ export default {
           font-size: 14px;
           color: rgba(35,35,35,0.4);
           margin-left: 28px;
+          display: flex;
+          //flex: 1;
           span{
             color: rgba(35,35,35,0.8);
+            display: inline-block;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+            cursor: pointer;
+            flex: 1;
+          }
+          &:nth-child(1){
+            max-width: 15%;
+          }
+          &:nth-child(2){
+            max-width: 30%;
+          }
+          &:nth-child(3){
+            max-width: 50%;
           }
         }
       }

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

@@ -25,7 +25,7 @@
         <div v-else v-html="scope.row.agency || '--'"></div>
       </template>
       <template slot="projectInfo" slot-scope="scope">
-        <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>
+        <router-link :to="`/radar/Notice/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/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="`/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>
+            <router-link :to="`/radar/Notice/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>

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

@@ -50,7 +50,7 @@
             <!-- 决策链条 -->
             <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 跟进记录 -->
-            <Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
+            <Gjjl v-if="currentPath.pathName=='gjjl'" :isDisabled='false' types="gjdt" :customer-ids="customerId" />
           </template>
 
         </div>
@@ -172,6 +172,16 @@ export default {
   },
   mounted() {
   },
+  activated(){
+    if (this.$route.query.path) { // 获取跳转对应板块
+      this.currentPath.pathName = this.$route.query.path
+    }else{
+      this.currentPath.pathName = 'overview'
+    }
+    if (this.$route.query.customerId) { // 判断是否显示
+      this.customerId = this.$route.query.customerId
+    }
+  },
   methods: {
     showPartPage(e){
       this.currentPath = e
@@ -218,5 +228,6 @@ export default {
     min-width: 1088px;
     width: 100%;
     background: #FFFFFF;
+    border-radius: 4px;
   }
 </style>

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

@@ -85,11 +85,11 @@ export default {
       this.tableLoading = false
       if(res.code==200){
         if(res.rows&&res.rows.length>0){
-          this.tableData = res.rows.map(item => {
+          res.rows.forEach(item => {
             item.smallContent = item.content.replace(/<.*?>/ig,"")
-            return item
           })
         }
+        this.tableData = res.rows
       }
       this.tableDataTotal = res.total
     },

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

@@ -22,7 +22,7 @@
       @sort-change="sortChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link :to="`/radar/Tender/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <router-link :to="`/radar/Notice/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
         <div v-else v-html="scope.row.projectName  || '--'"></div>
       </template>
       <template slot="province" slot-scope="scope">

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

@@ -65,14 +65,20 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="count"
             width="160"
+            align="right"
             label="合作次数">
+            <template slot-scope="scope">
+              <span style="padding-right: 88px;">{{ scope.row.count }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="amount"
             width="160"
+            align="right"
             label="合作总金额（万元）">
+            <template slot-scope="scope">
+              <span style="padding-right: 34px;">{{ scope.row.amount }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -142,16 +148,24 @@ export default {
       let option = {
         xAxis: {
           type: 'category',
+          boundaryGap: false,
           data: labels
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          splitNumber: 5,
+          splitLine : { //网格线
+            lineStyle: {
+              type: 'dashed' //设置网格线类型 dotted：虚线 solid:实线
+            },
+          }
         },
         grid:{
-          left:'6%',
+          left:'1',
           top:'8%',
           right:'2%',
           bottom:'8%',
+          containLabel: true
         },
         tooltip:{
           axisPointer:{ //悬浮于圆点展示标签
@@ -178,6 +192,7 @@ export default {
                 show:false
               }
             },
+            symbolSize:8,
             areaStyle: {
               color: {
                 type: 'linear',
@@ -235,9 +250,10 @@ export default {
             vertical-align: text-top;
           }
           .zbph-item-num{
+            font-size: 16px;
             font-weight: bold;
             display: block;
-            padding-top: 8px;
+            padding-top: 10px;
           }
         }
       }
@@ -271,6 +287,7 @@ export default {
             &.on{
               background: #0081FF;
               color: #FFFFFF;
+              border-color: #0081FF;
             }
             &:first-child{
               border-radius: 2px 0px 0px 2px;

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

@@ -98,6 +98,18 @@ export default {
           type: 'scroll',
           orient: 'horizontal',
           bottom: 20,
+          itemWidth: 14,
+          itemHeight: 9,
+          textStyle: {
+            padding: [-2, 20, -4, 0],
+            color: 'rgba(0,0,0,0.85)',
+            backgroundColor: "transparent",
+            fontSize: 10,
+            rich: {
+              a: {
+              },
+            },
+          },
           data: data,
           pageButtonPosition: 'end',
         },
@@ -114,6 +126,16 @@ export default {
                 shadowOffsetX: 0,
                 shadowColor: 'rgba(0, 0, 0, 0.5)'
               }
+            },
+            label: {
+              normal: {
+                show: true,
+                textStyle: {
+                  color: 'rgba(0,0,0,0.85)',
+                  fontSize: 10,
+                  fontWeight: 400
+                }
+              }
             }
           }
         ]
@@ -161,8 +183,7 @@ export default {
     .clue-box{
       width: 100%;
       justify-content: space-between;
-      align-items: normal;
-      margin-top: 8px;
+      margin: 8px 0 24px 0;
       .clue-echarts{
         width: calc(50% - 8px);
       }
@@ -186,6 +207,7 @@ export default {
       padding-left: 16px;
       padding-right: 16px;
       .clue-type-item{
+        font-size: 14px;
         color: #232323;
         cursor: pointer;
         &:hover{

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

@@ -303,7 +303,7 @@ export default {
 <style lang="scss" scoped>
   .info-container{
     margin: 0;
-    padding: 24px 16px;
+    padding: 24px 16px 10px 16px;
     background: #FFFFFF;
     border-radius: 4px;
     .company-swiper{

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

@@ -44,7 +44,7 @@
             <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName" v-html="scope.row.investName"></router-link>
             <div v-else v-html="scope.row.investName  || '--'"></div>
             <div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
-              <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
+              <span class="tag" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
               <span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
             </div>
           </template>
@@ -88,7 +88,8 @@ export default {
         pageNum: 1,
         pageSize: 5
       },
-      shipTotal: 0
+      shipTotal: 0,
+      labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业']
     }
   },
   created() {
@@ -159,6 +160,10 @@ export default {
             background: #E4F3FD;
             color: #41A1FD;
           }
+          &.style2{
+            background: #FFF1F1;
+            color: #FF3C3C;
+          }
         }
       }
       ::v-deep .el-table--border .el-table__cell{

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

@@ -8,14 +8,23 @@
         style="width: 100%"
         :default-sort = "{prop: 'date', order: 'descending'}"
       >
-        <el-table-column label="序号" width="55" align="left" fixed>
-          <template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
+        <el-table-column label="序号" width="55" align="left">
+          <template slot-scope="scope">{{ scope.row.serial }}</template>
         </el-table-column>
         <el-table-column
-          prop="name"
+          prop="userName"
           label="姓名"></el-table-column>
         <el-table-column
-          prop="jobTitle"
+          prop="userJob"
+          label="职务"></el-table-column>
+        <el-table-column label="序号" width="55" align="left">
+          <template slot-scope="scope">{{ scope.row.userNames?scope.row.serials:'' }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="userNames"
+          label="姓名"></el-table-column>
+        <el-table-column
+          prop="userJobs"
           label="职务"></el-table-column>
       </el-table>
     </div>
@@ -48,7 +57,22 @@ export default {
     async handleQuery(){
       let res = await keymembers(this.queryParams)
       if(res.code==200){
-        this.tableData = res.rows
+        let tempRows = []
+        if(res.rows&&res.rows.length>0){
+          let arrLength = res.rows.length%2==0?(res.rows.length/2):(Math.floor(res.rows.length/2)+1)
+          for(let i=0; i<arrLength; i++){
+            let obj = {
+              serial: 2*i+1,
+              userName:res.rows[2*i]?res.rows[2*i].name:'',
+              userJob:res.rows[2*i]?res.rows[2*i].jobTitle:'',
+              serials: 2*i+2,
+              userNames:res.rows[2*i+1]?res.rows[2*i+1].name:'',
+              userJobs:res.rows[2*i+1]?res.rows[2*i+1].jobTitle:''
+            }
+            tempRows.push(obj)
+          }
+        }
+        this.tableData = tempRows
       }
     }
   }

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

@@ -4,7 +4,7 @@
       <div class="common-title">招标公告</div>
       <template v-if="zbggList.length>0">
         <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
-          <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Tender/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
+          <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Notice/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
           <span class="tender-time">{{item.issueTime}}</span>
         </div>
       </template>

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

@@ -23,7 +23,7 @@
         <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>
         <div class="tags" v-if="scope.row.businessStatus">
-          <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
+          <span class="tag" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
           <span class="tag style1" v-if="scope.row.biddingCount">招标{{scope.row.biddingCount}}</span>
           <span class="tag style1" v-if="scope.row.landInfoCount">土地{{scope.row.landInfoCount}}</span>
           <span class="tag style1" v-if="scope.row.proposedProjectCount">拟建{{scope.row.proposedProjectCount}}</span>
@@ -65,6 +65,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业'],
     }
   },
   created() {
@@ -120,6 +121,10 @@ export default {
         background: #E4F3FD;
         color: #41A1FD;
       }
+      &.style2{
+        background: #FFF1F1;
+        color: #FF3C3C;
+      }
     }
   }
 }

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

@@ -22,7 +22,7 @@
         <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName " v-html="scope.row.investName"></router-link>
         <div v-else v-html="scope.row.investName  || '--'"></div>
         <div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
-          <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
+          <span class="tag" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
           <span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
         </div>
       </template>
@@ -86,6 +86,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业'],
     }
   },
   created() {
@@ -146,6 +147,10 @@ export default {
         background: #E4F3FD;
         color: #41A1FD;
       }
+      &.style2{
+        background: #FFF1F1;
+        color: #FF3C3C;
+      }
     }
   }
 }

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

@@ -147,7 +147,7 @@
               <div class="flex-box query-ability"><span>9</span>全部待办 ></div>
             </div>
             <div class="list">
-              <div class="item" v-for="(item,index) in gjjlData" :key="index">
+              <div class="item" v-for="(item,index) in gjjlData" :key="index" v-if='index < 3'>
                 <h3>{{item.title}}</h3>
                 <p>
                   <span>拜访时间：{{item.time}}</span>
@@ -1227,7 +1227,7 @@ export default {
           }
         }
         .list{
-          margin-top: 16px;
+          margin-top: 12px;
         }
         .item{
           min-height: 62px;

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -700,7 +700,7 @@ export default {
         .item{
           width: 19%;
           .item-title{
-            font-size: 12px;
+            font-size: 13px;
             color: rgba(35,35,35,0.8);
             i{
               width: 2px;
@@ -722,7 +722,7 @@ export default {
               width: 20px;
               height: 20px;
               margin-left: 22px;
-              margin-bottom: -2px;
+              margin-bottom: 2px;
             }
           }
           .item-text{
@@ -750,7 +750,7 @@ export default {
           border-right: 1px solid #E4E4E4;
           display: inline-block;
           color: rgba(35,35,35,0.8);
-          font-size: 12px;
+          font-size: 13px;
           padding-left: 16px;
           width: 20%;
           line-height: 26px;
@@ -773,7 +773,7 @@ export default {
             font-style: normal;
             margin-left: 4px;
             font-weight: 400;
-            font-size: 12px;
+            font-size: 13px;
           }
         }
         span:last-child{

dsk-operate-ui/src/views/macro/economies/index.vue

@@ -61,16 +61,26 @@ export default {
   },
   created() {
     this.dataQuery=this.$route.query;
-    location({}).then(res => {
-      this.province=res.data.province;
-      if(!this.dataQuery.provinceId){
-        this.dataQuery.provinceId=res.data.provinceId
-        this.dataQuery.province=this.province;
-        this.provinceId.push(res.data.provinceId)
-      }else {
-        this.provinceId.push(this.dataQuery.provinceId)
-      }
-    })
+    // let params={}
+    // if(this.dataQuery.provinceId){
+    //   params.provinceId=this.dataQuery.provinceId
+    // }
+    if(this.dataQuery.provinceId){
+      this.province=this.dataQuery.province;
+      this.provinceId.push(this.dataQuery.provinceId)
+    }else {
+      location({}).then(res => {
+        this.province=res.data.province;
+        if(!this.dataQuery.provinceId){
+          this.dataQuery.provinceId=res.data.provinceId
+          this.dataQuery.province=this.province;
+          this.provinceId.push(res.data.provinceId)
+        }else {
+          this.provinceId.push(this.dataQuery.provinceId)
+        }
+      })
+    }
+
     if(this.dataQuery.activeName){
       this.activeName=this.dataQuery.activeName;
     }

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -37,25 +37,25 @@
           <el-table-column label="序号" width="50" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="公司名称" align="left" width="300" fixed>
+          <el-table-column label="公司名称" align="left" fixed>
             <template slot-scope="scope">
               <router-link v-if="scope.row.jskEid"  :to="`/company/${encodeStr(scope.row.jskEid)}`" tag="a" class="a-link" v-html="scope.row.name" ></router-link>
               <span v-else v-html="scope.row.name" ></span>
             </template>
           </el-table-column>
-          <el-table-column label="注册地址" prop="domicile" width="150" :formatter="formatStatus"/>
-          <el-table-column label="资质资格" prop="aptitudeCountNew" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="专业人员" prop="persionCount" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="中标业绩" prop="recentlyCount" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>
-          <el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>
-          <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
-          <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="注册地址" prop="domicile" width="200" :formatter="formatStatus"/>
+          <el-table-column label="资质资格" prop="aptitudeCountNew" sortable="custom" width="120" :formatter="formatStatus"/>
+          <el-table-column label="专业人员" prop="persionCount" sortable="custom" width="120" :formatter="formatStatus"/>
+          <el-table-column label="中标业绩" prop="recentlyCount" sortable="custom" width="120" :formatter="formatStatus"/>
+          <!--<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
+          <!--<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
+          <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
+          <!--<el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
+          <!--<el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
+          <!--<el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>-->
+          <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
-          <el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>
+          <!--<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>-->
         </el-table>
         <div class="empty" v-if="tableDataTotal === 0">
           <img class="img" src="@/assets/images/project/empty.png">

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -75,27 +75,27 @@
       <div class="main3-box">
         <p>
           <label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-          <span>{{details.econData007}}倍</span>
+          <span>{{details.econData007 || '-'}}{{details.econData007 ? '倍' : ''}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本息</label>
-          <span>{{details.econData008}}倍</span>
+          <span>{{details.econData008 || '-'}}{{details.econData008 ? '倍' : ''}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总投资</label>
-          <span>{{details.econData009}}倍</span>
+          <span>{{details.econData009 || '-'}}{{details.econData009 ? '倍' : ''}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本金</label>
-          <span>{{details.econData010}}倍</span>
+          <span>{{details.econData010 || '-'}}{{details.econData010 ? '倍' : ''}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总债务融资本金</label>
-          <span>{{details.econData011}}倍</span>
+          <span>{{details.econData011 || '-'}}{{details.econData011 ? '倍' : ''}}</span>
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>{{details.projectForecastTotalRevenue}}亿</span>
+          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '亿' : ''}}</span>
         </p>
       </div>
     </div>
@@ -167,8 +167,8 @@ export default {
       })
     },
     getData(){
-      const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
-      // const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
+      // const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
+      const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
       bondPage(params).then(res => {
         this.tableData=res.data.list;
         this.tableDataTotal=res.data.totalCount;

dsk-operate-ui/src/views/macro/financing/index.vue

@@ -52,11 +52,11 @@
               <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
             </template>
           </el-table-column>
-          <el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="165" />
           <el-table-column prop="projectCapital" label="项目资本金（万元）" :formatter="formatStatus" align="right" sortable="custom"  width="155" />
           <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="150" />
           <!--<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
-          <el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="180" />
           <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
             <!--<template slot-scope="scope">-->
               <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -44,7 +44,7 @@
           </el-table-column>
           <el-table-column label="地区" min-width="150" align="left" fixed>
             <template slot-scope="scope">
-              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
+              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId,province:scope.row.province}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
             </template>
           </el-table-column>
           <el-table-column label="年度明细" prop="id" width="90" align="center" fixed>

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -69,7 +69,7 @@
             </el-table-column>
             <el-table-column prop="type" label="地区"/>
             <el-table-column prop="count" sortable label="招标数量" align="right"/>
-            <el-table-column prop="rate" sortable label="占比" align="right"/>
+            <el-table-column prop="rate" sortable label="占比（%）" align="right"/>
           </el-table>
         </div>
       </div>
@@ -527,6 +527,27 @@ export default {
         .el-table__cell.is-right{
           text-align: right;
         }
+        .has-gutter{
+          tr{
+            th:nth-child(4){
+              border-right:0;
+              .cell{
+                padding-right: 24px !important;
+              }
+            }
+          }
+        }
+        .el-table__cell.gutter{
+          background: #F0F3FA;
+          width: 16px !important;
+        }
+        .el-table__row{
+          td:last-child{
+            .cell{
+              padding-right: 24px !important;
+            }
+          }
+        }
       }
     }
   }

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -783,6 +783,20 @@ export default {
       .table-item{
         margin-top: 32px;
       }
+      .table-item {
+        ::v-deep .el-table {
+          .has-gutter{
+            tr{
+              th:nth-child(3){
+                border-right:0;
+                .cell{
+                  padding-right: 24px !important;
+                }
+              }
+            }
+          }
+        }
+      }
     }
     .table-item{
       ::v-deep .el-table{
@@ -794,6 +808,27 @@ export default {
         .el-table__cell.is-right{
           text-align: right;
         }
+        .has-gutter{
+          tr{
+            th:nth-child(6),th:nth-child(8){
+              border-right:0;
+              .cell{
+                padding-right: 24px !important;
+              }
+            }
+          }
+        }
+        .el-table__cell.gutter{
+          /*background: #F0F3FA;*/
+          width: 16px !important;
+        }
+        .el-table__row{
+          td:last-child{
+            .cell{
+              padding-right: 24px !important;
+            }
+          }
+        }
       }
     }
   }

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -165,7 +165,7 @@
           </el-table-column>
           <el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
             <template slot-scope="scope">
-              <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId}}" tag="a" class="a-link">
+              <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId,province:scope.row.province}}" tag="a" class="a-link">
                 {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
               </router-link>
               <!--<span v-else>-</span>-->
@@ -477,6 +477,7 @@ export default {
       } else {
         this.addresslength = 0;
       }
+      this.pageIndex = 1;
       this.querySubmit()
     },
     changeType(item,index){

dsk-operate-ui/src/views/project/overview/index.vue

@@ -249,10 +249,11 @@ export default {
       switch (type) {
         case 1:
           time = time.getDay()
-          // week.length = time
+          time = time == 0?7:time
           weekdata1.length = time
           weekdata2.length = time
           weekdata3.length = time
+          console.log(time)
           for(var i=0;i<7;i++){
             if(i > time){
               weekdata1.push('')
@@ -303,6 +304,8 @@ export default {
         default:
           break;
       }
+      console.log(datas)
+      console.log(labels)
       this.initDT(datas,labels)
     },
     resizeEcharts (){

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

@@ -100,6 +100,7 @@
               <div><strong>{{item.nickName}}</strong> <span v-if="item.visitWay">({{item.visitWay}})</span></div>
               <div><span>{{item.recordInfo}}</span></div>
               <div class="rec_text">
+                <span v-if="item.projectName && showtype == 'projectgjdt'">关联项目：{{item.projectName||'--'}}</span>
                 <span v-if="item.visitPerson">拜访对象：{{item.visitPerson||'--'}}</span>
                 <span v-if="item.position">职位：{{item.position||'--'}}</span>
                 <span v-if="item.creatTime">拜访时间：{{item.creatTime}}</span>
@@ -178,7 +179,6 @@
     computed: {
     },
     created(){
-      console.log(this.isDisabled)
       //获取拜访方式
       getDictType('visit_mode_type').then(result=>{
         this.bffslist = result.code == 200 ? result.data:[]
@@ -225,6 +225,7 @@
               this.$message.success(result.msg)
               this.handleCurrentChange(1)
               this.isEdit = false
+              this.resetForm()
             }else{
               this.$message.error(result.msg)
             }
@@ -245,12 +246,24 @@
               this.$message.success(result.msg)
               this.handleCurrentChange(1)
               this.isEdit = false
+              this.resetForm()
             }else{
               this.$message.error(result.msg)
             }
           })
         }
       },
+      resetForm(){
+
+        this.addParam={
+          customerId:'', //客户id
+            visitMode:'',//拜访方式
+            nextVisitTime:'',//下次拜访时间
+            name:'',//拜访对象姓名
+            position:'',//拜访对象职务
+            content:'',//拜访内容
+        }
+      },
       //删除跟进动态
       delRecord(id){
         this.isdel = true

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

 <template>
 
-  <div>
+  <div id="jsnr">
     <el-card class="box-card noborder">
       <div class="cardtitles">基本信息</div>
       <div class="baseinfo" style="padding-bottom: 8px">
@@ -208,7 +208,9 @@
         type: Number,
         default: 0
       },
-      isDisabled:false,
+      isDisabled:{
+        default: false
+      },
     },
     data(){
       return{
@@ -233,7 +235,7 @@
     watch:{
     },
     mounted(){
-      document.addEventListener('mouseup',(e) => {
+      document.getElementById('jsnr').addEventListener('mouseup',(e) => {
         if(this.isDisabled == true)
           return false
         let j = 0
@@ -305,19 +307,23 @@
         })
       },
       changes(str){
-        this.nowedit = -1
         let param = str
         param.id = this.id
         if(this.isDisabled == true)
           return false
         editXMNR(param).then(result=>{
-          if(result.code == 200)
+          if(result.code == 200){
             this.$message.success('修改成功!')
+            if(param.investmentAmount){//修改项目阶段
+              this.$emit('Refrehmoney')
+            }
+          }
           else{
-            this.$message.error(res.msg)
+            this.$message.error(result.msg)
             this.getJSNR()
           }
         })
+        this.nowedit = -1
       },
       //输入数字
       number(value){

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

 <template>
 
-  <div>
+  <div id="xmsl">
     <el-card class="box-card noborder">
       <div class="cardtitles">基本信息</div>
       <div class="baseinfo">
@@ -204,7 +204,7 @@
       this.getXMSL()
     },
     mounted(){
-      document.addEventListener('mouseup',(e) => {
+      document.getElementById('xmsl').addEventListener('mouseup',(e) => {
         if(this.isDisabled == true)
           return false
         let j = 0
@@ -236,13 +236,16 @@
                 param = {'constructionPrincipal':this.xmsldata.constructionPrincipal}
                 break;
               case 6 :
-                param = {'supervisorPhone':this.xmsldata.supervisorPhone}
+                // param = {'supervisorPhone':this.xmsldata.supervisorPhone}
+                this.isphone(1,this.xmsldata.supervisorPhone)
                 break;
               case 7 :
-                param = {'constructionPhone':this.xmsldata.constructionPhone}
+                // param = {'constructionPhone':this.xmsldata.constructionPhone}
+                this.isphone(1,this.xmsldata.constructionPhone)
                 break;
             }
-            this.editXMSL(param)
+            if(this.nowedit!=6 && this.nowedit!=7)
+              this.editXMSL(param)
           }
           this.nowedit = -1
         }
@@ -285,7 +288,7 @@
       //验证电话号码
       isphone(type,value){
         var regPartton = /1[3-9]+\d{9}/;
-        var regPartton1 = /^(0[0-9]{2,3}[\-]?[2-9][0-9]{6,7}[\-]?[0-9]?)$/;
+        var regPartton1 = /0\d{2,3}-\d{7,8}|\(?0\d{2,3}[)-]?\d{7,8}|\(?0\d{2,3}[)-]*\d{7,8}/;
         if (!regPartton.test(value) && !regPartton1.test(value)) {
           this.$message.error("请输入正确的电话");
         } else {

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -58,7 +58,7 @@
             </div>
             <div class="det-con con"  id="inputxt">
               <span>投资估算（万元）：</span>
-              <div class="inputxt i" :class="{'nomar':nowedit != 3}">
+              <div class="inputxt i" :class="{'nomar':nowedit != 3}" :key="keys2">
                 <div class="flex" v-if="nowedit == 3 && isDisabled == false">
                   <el-input v-model="ProjectData.investmentAmount" placeholder="待添加" @input="number"></el-input>
                   <div class="flex">
@@ -109,7 +109,7 @@
       <!--项目速览-->
       <xmsl v-if="thistag == 'xmsl'" :key="keys" @Refreshs="getsl" :detailId="detailId"></xmsl>
       <!--建设内容-->
-      <jsnr v-if="thistag == 'jsnr'" :isDisabled='isDisabled' :detailId="detailId"></jsnr>
+      <jsnr v-if="thistag == 'jsnr'" :key="keys1" :isDisabled='isDisabled' @Refrehmoney="getXMSL"  :detailId="detailId"></jsnr>
       <!--联系人-->
       <lxr v-if="thistag == 'lxr'" :isDisabled='isDisabled' :detailId="detailId"></lxr>
       <!--跟进记录-->
@@ -177,6 +177,8 @@
         ProjectData:{},
         isDisabled:false,
         keys:1,
+        keys1:2,
+        keys2:20,
       }
     },
     created(){
@@ -247,6 +249,7 @@
           }
           this.address = list.length>0?list:"待添加"
           this.addresstxt = txt == "" ? "待添加":txt
+          this.keys2 ++;
         })
       },
       locks(isPrivate){
@@ -263,6 +266,12 @@
         editXMNR(JSON.stringify(params)).then(res=>{
           if (res.code == 200){
             this.$message.success('修改成功！')
+            if(this.nowedit == 1){
+              let _this = this
+              setTimeout(function() {
+                _this.keys1++;
+              },1000)
+            }
           }else{
             this.$message.error(res.msg)
             this.getXMSL()

dsk-operate-ui/src/views/project/trends/index.vue

 <template>
   <div class="app-container">
-    <gjjl types="projectgjdt"></gjjl>
+    <gjjl types="projectgjdt" isDisabled=false></gjjl>
   </div>
 </template>
 

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -66,8 +66,8 @@ public class EnterpriseBussinessService {
         contentParam.put("strategy_id", mongoContentId);
         Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
 
+        log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
         Map contentData = MapUtils.getMap(contentMap, "data", null);
-        log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
             return BeanUtil.toBean(map, R.class);

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -127,8 +127,8 @@ public class EnterpriseProjectService {
         contentParam.put("strategy_id", contentId);
         Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
 
+        log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
         Map contentData = MapUtils.getMap(contentMap, "data", null);
-        log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
             return BeanUtil.toBean(map, R.class);