Merge remote-tracking branch 'origin/master'

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

+import request from '@/utils/request'
+// 资质json数据
+let aptitudeCode= function aptitudeCode(param) {
+  return request({
+    url: 'https://files.jiansheku.com/file/json/common/aptitudeCode.json',
+    method: 'get',
+  })
+}
+// 人员json数据
+let personCert= function personCert(param) {
+  return request({
+    url: 'https://files.jiansheku.com/file/json/common/personCert.json',
+    method: 'get',
+  })
+}
+// 备案网站
+let searchDic= function searchDic(param) {
+  return request({
+    url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
+    method: 'get',
+  })
+}
+// 备案网站
+let regionWebList= function regionWebList(param) {
+  return request({
+    url: '/nationzj/enterprice/regionWebList',
+    method: 'get',
+  })
+}
+
+export default {aptitudeCode,personCert,searchDic,regionWebList}
\ No newline at end of file

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

@@ -158,3 +158,28 @@ export function addXGQY(param) {
     data:param
   })
 }
+
+//删除相关企业
+export function delXGQY(param) {
+  return request({
+    url: '/business/company/remove/'+param,
+    method: 'DELETE',
+  })
+}
+//查询资料文档
+export function getZLWD(param) {
+  return request({
+    url: '/business/file/list',
+    method: 'GET',
+    params:param
+  })
+}
+
+//删除资料文档
+export function delZLWD(param) {
+  return request({
+    url: '/business/file/remove',
+    method: 'POST',
+    data:param
+  })
+}

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

+import request from '@/utils/request'
+// 导入客户列表
+let importData= function importData(param) {
+  return request({
+    url: '/customer/importData',
+    method: 'POST',
+    data: param
+  })
+}
+export default {importData}
\ No newline at end of file

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

@@ -656,6 +656,7 @@
         background: #F6F9FD;
         border-radius: 6px;
         padding: 24px;
+        border: 1px solid #F6F9FD;
         //box-sizing: content-box;
         box-sizing: border-box;
         >div{
@@ -676,7 +677,6 @@
       }
     }
 
-
     .rec_detail:hover{
       .operate{
         display: block;

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

@@ -507,4 +507,188 @@ select {
 .viewlist-el-popover .pup_list_export li .lowerRate_imgzhc {
 	width: 39px;
 	height: 14px;
-}
+}
\ No newline at end of file
+
+
+.content_item_ckquery .item_ckquery_list {
+	display: flex;
+
+}
+
+.content_item_ckquery .item_ckquery_list .el-input__icon {
+	position: relative;
+	top: 1px;
+}
+
+.content_item_ckquery .item_ckquery_distance {
+	margin-top: 8px;
+}
+
+.ckquery_list_right {
+	width: 716px;
+}
+
+.content_item_ckquery .item_ckquery_btn {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	cursor: pointer;
+	text-align: center;
+	color: #ffffff;
+	margin-left: 8px;
+	margin-right: 32px;
+	width: 115px;
+	height: 34px;
+	line-height: 34px;
+	border: 1px solid #0081FF;
+	font-weight: 400;
+	color: #0081FF;
+}
+
+.content_item_ckquery .item_ckquery_btn:hover {
+	background: #0074E5;
+	color: #fff;
+}
+
+.content_item_ckquery .el-radio__label {
+	margin-left: 0px;
+	padding-left: 4px;
+	margin-right: 24px;
+}
+.content_item_list {
+	line-height: 34px;
+}
+
+.content_item_zizi .el-radio__label {
+	margin-right: 0;
+}
+
+.content_item_zizi .el-cascader-node>.el-radio {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 40px;
+	opacity: 0;
+}
+.select-list {
+	color: #666;
+	line-height: 24px;
+	font-size: 14px;
+	padding: 0;
+	user-select: none;
+	min-width: 100px;
+	max-width: 380px;
+	max-height: 400px;
+	overflow: auto;
+	
+	box-shadow: none;
+	border-radius: 0;
+	background-color: #fff;
+	padding: 6px 0px;
+}
+
+.select-radio::-webkit-scrollbar-thumb {
+	background-color: #b9b9b9 !important;
+	border-radius: 6px !important;
+}
+
+.select-radio::-webkit-scrollbar {
+	width: 6px !important;
+	height: 6px !important;
+}
+
+.select-radio::-webkit-scrollbar-track {
+	background: #fff !important;
+}
+
+.select-radio::-webkit-scrollbar-corner {
+	background: #fff !important;
+}
+
+.select-list li {
+	cursor: pointer;
+	display: block;
+	padding: 0;
+}
+
+.select-list li:hover {
+	color: #0381fa;
+	background: #f2f7ff;
+}
+
+.select-list li .el-icon--right {
+	float: right;
+	margin-top: 4px;
+}
+.select-list .el-dropdown-menu__item{
+	padding: 0;
+}
+.select-list .el-dropdown-menu__item :hover{
+	color: #0381fa;
+	background: #f2f7ff;
+}
+
+.select-list .select-list-li {
+	text-align: left;
+	padding: 0px 16px;
+	line-height: 32px;
+	position: relative;
+}
+
+.select-list-li .ivu-date-picker .ivu-select-dropdown {
+	/* position: absolute;
+	top: 0;
+	left: 0;
+	width: 96px;
+	opacity: 0; */
+	left: 120px !important;
+	z-index: 1000;
+}
+
+.ivu-select-dropdown {
+	z-index: 9000;
+}
+
+.select-list-li-span {
+	width: 96px;
+}
+
+.select-list .active {
+	color: #0381fa;
+	background: #f2f7ff;
+}
+
+.select-list .active .el-radio__label {
+	color: #0381fa;
+}
+
+.select-list-left {
+	border-left: 1px solid #ccc;
+	margin-left: 2px;
+}
+.select-list .el-radio {
+	display: block;
+	line-height: 36px;
+	margin: 0;
+}
+
+.select-list .el-radio .el-radio__label {
+	padding-left: 16px;
+	padding-right: 16px;
+	display: block;
+	margin: 0;
+	
+}
+
+.select-list .el-radio .el-radio__label:hover {
+	/* color: #0381fa;
+	background: #f2f7ff; */
+}
+
+.select-list .el-radio__input.is-checked+.el-radio__label {
+	background: #f2f7ff;
+}
+
+.select-list .el-radio__input {
+	display: none;
+}

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

@@ -24,8 +24,8 @@
     left: 0;
     z-index: 1001;
     // overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    // -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    // box-shadow: 2px 0 6px rgba(0,21,41,.35);
     //展开、收起箭头
     .side-expand{
       position: absolute;

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

@@ -173,7 +173,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="bottems" v-if="tableData.total>0">
+          <div class="bottems" v-if="tableData.total>searchParam.pageSize">
             <el-pagination
               background
               :page-size="searchParam.pageSize"

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

@@ -99,7 +99,7 @@
             <div class="trendcon">{{item.text}}</div>
             <div class="time">{{item.time}}</div>
           </div>
-          <div class="tables" style="width: 100%">
+          <div class="tables" style="width: 100%" v-if="datalist.length>10">
             <div class="bottems">
               <el-pagination
                 background
@@ -236,7 +236,7 @@ export default {
           {
             name: '',
             type: 'bar',
-            barWidth: '20%',
+            barWidth: '12px',
             data: [100, 152, 200, 334, 390, 330, 220,256,178],
             itemStyle:{
               normal: {
@@ -280,7 +280,7 @@ export default {
           {
             name: '',
             type: 'bar',
-            barWidth: '20%',
+            barWidth: '12px',
             data: [110, 112, 190, 234, 310, 350, 220,276,198],
             itemStyle:{
               normal:{
@@ -551,6 +551,12 @@ export default {
         line-height: 18px;
         padding-bottom: 16px;
       }
+
+      &:last-child{
+        .trendcon{
+          border: none;
+        }
+      }
       .time{
         position: absolute;
         right: 16px;

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

@@ -323,8 +323,8 @@ export default {
           // trigger: 'axis'
         },
         legend: {
-          right: '151px',
-          top:"0px",
+          left: '12px',
+          top:"15px",
           data: ['成交金额', '储备项目', '跟进动态']
         },
         series: [
@@ -513,12 +513,12 @@ export default {
   }
 }
 .chart-bot{
-  height: 354px;
+  height: auto;
   margin-bottom: 12px;
   .left{
     float: left;
     width: 353px;
-    height: 100%;
+    height: 354px;
     background: url("../../../assets/images/project/glbj.png")no-repeat top center;
     background-size: 100% 100%;
     color: #FFFFFF;
@@ -569,11 +569,11 @@ export default {
   }
   .right{
     float: right;
-    height: 100%;
+    height: auto;
     width: calc(100% - 369px);
     .records{
       margin-top: -17px;
-      height: 327px;
+      height: 627px;
       overflow-y: auto;
       width: 100%;
       padding-right: 47px;
@@ -621,6 +621,7 @@ export default {
 
 .chart2{
   width: 100%;
+  padding: 0 0 0 16px;
   height: 285px;
   margin-top: -20px;
 }

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

@@ -34,7 +34,7 @@
           <el-option v-for="(item,index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="投资估算：" class="row">
+      <el-form-item label="投资估算（万元）：" class="row">
         <el-input type="text" placeholder="请输入金额" @input="number" v-model="queryParam.investmentAmount"></el-input>
       </el-form-item>
       <el-form-item label="可见范围：" class="row">

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

@@ -4,10 +4,8 @@
     <el-card class="box-card noborder">
       <div class="cardtitles">相关企业</div>
       <div class="searchbtns">
-        <el-select class="select" placeholder="企业类型">
-          <el-select  placeholder="请选择" v-model="searchParam.companyType">
-            <el-option v-for="(item,index) in companytype" :label="item.dictLabel" :value="item.dictValue"></el-option>
-          </el-select>
+        <el-select class="select"  placeholder="企业类型" v-model="searchParam.companyType" @change="handleCurrentChange(1)">
+          <el-option v-for="(item,index) in companytype" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
         <div class="searchInput">
           <el-input type="text" placeholder="输入关键词查询" v-model="searchParam.companyName"></el-input>
@@ -15,7 +13,7 @@
         </div>
         <div class="btn btn_primary h32 b3" @click="opennew"><div class="img img1"></div>添加相关企业</div>
       </div>
-      <div class="document">
+      <div class="document tables">
         <el-table
           :data="tableData.rows"
           style="width: 100%"
@@ -59,23 +57,29 @@
             width="">
             <template slot-scope="scope">
               <div class="hoverbtn">
-                <div class="sc" @click="delQY(scope.row.id)">删除</div>
+                <div class="sc" @click="ondel = scope.row.id">删除</div>
               </div>
             </template>
           </el-table-column>
         </el-table>
-
-        <div class="tables" v-if="tableData.total > searchParam.pageSize">
-          <div class="bottems">
-            <el-pagination
-              background
-              :page-size="searchParam.pageSize"
-              :current-page="searchParam.pageNum"
-              @current-change="handleCurrentChange"
-              layout="prev, pager, next"
-              :total="tableData.total">
-            </el-pagination>
+          <div class="delform" v-if="ondel != -1">
+            <div class="words">是否将企业删除</div>
+            <div>
+              <div class="btnsmall btn_primary h28" @click="delQY()">确定</div>
+              <div class="btnsmall btn_cancel h28" @click="ondel = -1">取消</div>
+            </div>
           </div>
+        <div class="tables" v-if="tableData.total > searchParam.pageSize">
+        <div class="bottems" v-if="ondel != -1">
+          <el-pagination
+            background
+            :page-size="searchParam.pageSize"
+            :current-page="searchParam.pageNum"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="tableData.total">
+          </el-pagination>
+        </div>
         </div>
       </div>
       <el-dialog
@@ -131,7 +135,7 @@
 
 <script>
   import "@/assets/styles/project.scss"
-  import {getXGQY,addXGQY} from '@/api/project/project'
+  import {getXGQY,addXGQY,delXGQY} from '@/api/project/project'
   import {getDictType} from '@/api/main'
   export default {
     name: 'xgqy',
@@ -186,6 +190,7 @@
           companyType:"",
           companyName:'',
         },
+        ondel:-1,
       }
     },
     created(){
@@ -198,10 +203,18 @@
       getDictType('company_role').then(result=>{
         this.companyrole = result.code == 200 ? result.data:[]
       })
+      this.getlist()
     },
     methods:{
-      delQY(id){
-
+      delQY(){
+        let id = this.ondel
+        delXGQY(id).then(res=>{
+          if(res.code == 200){
+            this.$message.success('删除成功')
+            this.ondel = -1
+            this.getlist()
+          }
+        })
       },
       addqy(){
         addXGQY(this.queryParam).then(res=>{
@@ -215,7 +228,8 @@
       },
       getlist(){
         getXGQY(this.searchParam).then(result=>{
-          this.tableData = result.data
+          console.log(result)
+          this.tableData = result
         })
       },
       //翻页
@@ -274,4 +288,8 @@
   .box-card{
     position: relative;
   }
+
+  .delform{
+    position: fixed; left:50%; top:50%; transform:translate(-50%,-50%)
+  }
 </style>

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

@@ -113,7 +113,7 @@
       </div>
       <div class="datalist">
         <div class="datali" v-for="(item,index) in datalist">
-          <div class="det-title" @click="toDetail(item.id)">{{item.projectName}}<span v-if="activeName!='first'" class="people"><i>A</i>四川-李丽  <font color="#FA8A00" v-if="activeName!='first'">正在跟进</font></span></div>
+          <div class="det-title" @click="toDetail(item.id)">{{item.projectName}}<span v-if="activeName!='first'" class="people"><i>{{item.nickName1}}</i>{{item.nickName}}  <font color="#FA8A00" v-if="activeName!='first'">正在跟进</font></span></div>
           <div class="det-tips"><span class="tips tip1" v-if="item.label">{{item.label}}</span><span v-if="item.address" class="tips tip2">{{item.address}}</span></div>
           <div class="det-contets">
             <div class="det-con">
@@ -133,7 +133,7 @@
               <span class="wordprimary">{{item.ownerCompany}}</span>
             </div>
           </div>
-          <el-divider></el-divider>
+          <el-divider v-if="index != datalist.length-1"></el-divider>
           <div class="operates"  v-if="activeName=='first'">
             <div class="i1"><img src="@/assets/images/follow.png">跟进</div>
             <div class="i2"><img src="@/assets/images/edit.png">编辑</div>
@@ -294,6 +294,7 @@ export default {
             if(item.districtName != ""&& item.districtName != null)
               str += '-' +item.districtName
             item.address = str
+            item.nickName1 = item.nickName?item.nickName.slice(0,1):''
           })
         }
       })

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

@@ -7,7 +7,7 @@
 			        <el-input class="ename_input" 
 					placeholder="请输入项目名称关键字" v-model="ename" @input="enamebtn('ename',ename)"></el-input>
 			        <template v-if="ename">
-			            <span v-for=" (item,k)  in enameQueryTypeList" :key="k">
+			            <span v-for=" (item,k)  in enameQueryTypeList" :key="k" style="margin-right: 24px;">
 			                <el-radio v-model="enameQueryType" :label="item.key">{{item.value}}</el-radio>
 			            </span>
 			        </template>