*

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

@@ -512,7 +512,7 @@
   .types{
     display: flex;
     justify-content: space-between;
-    padding: 8px 0 24px;
+    padding: 24px 0;
     >div{
       cursor: pointer;
       >i{
@@ -872,6 +872,10 @@
     .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell{
       background: #F6F9FC;;
     }
+
+    .el-table__header-wrapper th, th.el-table__cell.is-leaf{
+      background: #fff;
+    }
     .hoverbtn{
       display: none;
       >div{
@@ -968,7 +972,7 @@
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 2;
+  z-index: 3;
   .upload{
     width: 528px;
     height: 430px;
@@ -1073,7 +1077,8 @@
     }
   }
   .success{
-    width: 240px;
+    min-width: 240px;
+    padding: 0 24px;
     height: 175px;
     background: #FFFFFF;
     border-radius: 4px;
@@ -1163,3 +1168,7 @@
     }
   }
 }
+.select-multiple,.select-popper .el-input{
+  //top: 10px !important;
+  line-height: 34px !important;
+}

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

 <template>
-  <div>
+  <div  @click = 'handleALL'>
     <div class="miantitle">
       <span>客户管理</span>
       <span> / 客户列表</span>
@@ -202,7 +202,7 @@
           <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
             <el-form-item label="企业名称：" class="row"  prop="companyName">
               <el-input type="text" placeholder="请输入" v-model="queryParam.companyName" @input="getCompany"></el-input>
-              <div class="resultlist" v-if="showlist">
+              <div class="resultlist" v-if="showlist" id="box">
                 <div v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name"></span></div>
               </div>
             </el-form-item>
@@ -302,6 +302,14 @@ export default {
     this.prvinceTree()
   },
   methods:{
+    handleALL(event){
+      var one = document.getElementById("box");
+      if(one){
+        if(!one.contains(event.target)){
+          this.showlist = false
+        }
+      }
+    },
     toct(){
       this.$router.push({path:'/macro/urban'})
     },
@@ -463,7 +471,10 @@ export default {
     },
     //输入数字
     number(value){
-      this.queryParam.registerCapital = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
+      if(value == '')
+        this.queryParam.registerCapital = value
+      else
+         this.queryParam.registerCapital = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
     }
   }
 }

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

@@ -8,7 +8,7 @@
     <div  @click = 'handleALL'>
     <div class="poptitle">
       <img src="@/assets/images/economies/icon.png">
-      <span>添加项目</span>
+      <span>新建商机</span>
     </div>
     <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
       <el-form-item label="项目名称：" class="row"  prop="projectName">
@@ -178,7 +178,7 @@
 
       //输入数字
       number(value){
-        this.queryParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')//输入2位小数
+        this.queryParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
       }
     }
   }

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

@@ -92,6 +92,7 @@
     },
     methods:{
       getmsg(){
+        this.importCancel()
         this.$emit('getdatas')
       },
       handleFileListChange(file, fileList) {
@@ -127,7 +128,8 @@
             this.messages = res.msg
           }
           if(this.importtype == 'custom'){//客户管理
-            let str = '成功导入客户条数'+res.successCount+',客户去重条数'+res.data?res.data.length:0
+            let num = res.data?res.data.length:0
+            let str = '成功导入客户条数'+res.successCount+',客户去重条数'+ num
             this.messages = str
           }
           this.addsuccess = true

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

@@ -15,9 +15,9 @@
               <el-input v-model="addParam.content" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
             </div>
             <div class="wr_bot">
-              <div class="sels" v-model="addParam.visitMode">
+              <div class="sels">
                 <img src="@/assets/images/project/ico_1.png">
-                <el-select class="w128" placeholder="拜访方式">
+                <el-select class="w128" placeholder="拜访方式" v-model="addParam.visitMode">
                   <el-option v-for="(item,index) in bffslist" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
                 </el-select>
               </div>

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

@@ -242,6 +242,38 @@
           }
         }
         if(j == 9){
+          // let param = {}
+          // switch (i) {
+          //   case 1:
+          //     param = {'investmentAmount':this.investmentAmount}
+          //     break;
+          //   case 2 :
+          //     param = {'amountSource':this.amountSource}
+          //     break;
+          //   case 3 :
+          //     param = {'buildProperty':this.buildProperty}
+          //     break;
+          //   case 4 :
+          //     param = {'evaluationBidWay':this.evaluationBidWay}
+          //     break;
+          //   case 5 :
+          //     param = {'earnestMoneyPay':this.earnestMoneyPay}
+          //     break;
+          //   case 6 :
+          //     param = {'earnestMoney':this.earnestMoney}
+          //     break;
+          //   case 7 :
+          //     param = {'bidOpenPlace':this.bidOpenPlace}
+          //     break;
+          //   case 8 :
+          //     param = {'evaluationBidCouncil':this.evaluationBidCouncil}
+          //     break;
+          //   case 9 :
+          //     param = {'projectDetails':this.projectDetails}
+          //     break;
+          // }
+          // this.changes(param)
+
           this.nowedit = -1
         }
       })
@@ -282,7 +314,6 @@
       },
       //输入数字
       number(value){
-        console.log(value)
         this.investmentAmount = this.investmentAmount == ""||this.investmentAmount == null? value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1'):null//输入6位小数
       },
     }

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

@@ -3,8 +3,8 @@
   <div>
     <el-card class="box-card noborder">
       <div class="cardtitles">相关企业</div>
-      <div class="searchbtns" v-if="tableData.total>0">
-        <el-select class="select"  placeholder="企业类型" v-model="searchParam.companyType" @change="handleCurrentChange(1)">
+      <div class="searchbtns">
+        <el-select class="select"  placeholder="企业类型" clearable="true" 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">
@@ -21,9 +21,9 @@
           <template slot="empty">
             <div class="empty">
               <img src="@/assets/images/project/empty.png">
-              <div class="p1">暂无数据展示</div>
-              <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
-              <div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div>
+              <div class="p1">抱歉，没找到相关数据</div>
+              <div class="p2">建议调整关键词或添加相关企业，重新搜索</div>
+              <!--<div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div>-->
             </div>
           </template>
           <el-table-column

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

@@ -22,7 +22,7 @@
             <span>项目阶段 ：</span>
 
             <div class="select-popper " >
-              <span class="color_text" :class="{'txt':xmjd == '待添加'}">
+              <span :class="{'txt':xmjd == '待添加'}">
                 {{xmjd}}
                 <i class="el-icon-caret-bottom"></i>
               </span>
@@ -232,17 +232,22 @@
         });
       },
       editXMSL(param){
-        let params = param
-        params.id = this.id
-        editXMNR(JSON.stringify(params)).then(res=>{
-          if (res.code == 200){
-            this.$message.success('修改成功！')
-          }else{
-            this.$message.error(res.msg)
-            this.getXMSL()
-          }
-        })
-        this.nowedit = -1
+        if(param.projectStage){//修改项目阶段
+          this.$emit('Refreshs',param)
+          this.xmjd = param.projectStage
+        }else{
+          let params = param
+          params.id = this.id
+          editXMNR(JSON.stringify(params)).then(res=>{
+            if (res.code == 200){
+              this.$message.success('修改成功！')
+            }else{
+              this.$message.error(res.msg)
+              this.getXMSL()
+            }
+          })
+          this.nowedit = -1
+        }
       },
       //验证电话号码
       isphone(type,value){

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

@@ -3,7 +3,8 @@
   <div>
     <el-card class="box-card noborder">
       <div class="cardtitles">资料文档</div>
-      <div class="searchbtns" v-if="fileDatas.rows != null && fileDatas.rows.length>0">
+      <div class="searchbtns">
+      <!--<div class="searchbtns" v-if="fileDatas.rows != null && fileDatas.rows.length>0">-->
         <div class="searchInput">
           <el-input type="text" v-model="param.keyword" placeholder="输入关键词查询"></el-input>
           <div class="btn" @click="handleCurrentChange(1)">搜索</div>

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

@@ -14,7 +14,7 @@
           <div class="titles">
             <img src="@/assets/images/project/headimg.png" class="headimg">
             <strong class="text">{{ProjectData.projectName}}</strong>
-            <div class="locks">
+            <div class="locks" v-if="ProjectData.isFounder == 1">
               <div @click="islock=true">
               <img v-if="ProjectData.isPrivate == 0" src="@/assets/images/project/lock.png">
               <img v-else src="@/assets/images/project/lockopen.png">
@@ -33,7 +33,7 @@
             <div class="det-con">
               <span>项目类型：</span>
               <div class="select-popper" >
-                <span class="color_text" :class="{'txt':xmlx == '请选择'}">
+                <span :class="{'txt':xmlx == '请选择'}">
                   {{xmlx}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
@@ -46,7 +46,7 @@
               <span>项目类别：</span>
               <span>
               <div class="select-popper" >
-                <span class="color_text" :class="{'txt':xmlb == '请选择'}">
+                <span :class="{'txt':xmlb == '请选择'}">
                   {{xmlb}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
@@ -106,8 +106,8 @@
           </div>
         </div>
       </el-card>
-      <!--项目概览-->
-      <xmsl v-if="thistag == 'xmsl'" :datas="ProjectData" :detailId="detailId"></xmsl>
+      <!--项目速览-->
+      <xmsl v-if="thistag == 'xmsl'" :key="keys" @Refreshs="getsl" :datas="ProjectData" :detailId="detailId"></xmsl>
       <!--建设内容-->
       <jsnr v-if="thistag == 'jsnr'" :detailId="detailId"></jsnr>
       <!--联系人-->
@@ -175,6 +175,7 @@
         props:{ checkStrictly: true, expandTrigger: 'hover' },
         id:'',
         ProjectData:{},
+        keys:1,
       }
     },
     created(){
@@ -197,6 +198,9 @@
       this.getXMSL()
     },
     methods: {
+      getsl(data){
+        this.choose(data.projectStage)
+      },
       handleALL(event){
         var one = document.getElementById("inputxt");
         if(one){
@@ -237,7 +241,6 @@
           this.address = list.length>0?list:"待添加"
           this.addresstxt = txt == "" ? "待添加":txt
         })
-
       },
       locks(isPrivate){
         isPrivate = isPrivate==0?1:0
@@ -293,6 +296,10 @@
       choose(value){
         this.thisindex = value
         this.editXMSL({projectStage:value})
+        let _this = this
+        setTimeout(function() {
+          _this.keys++;
+        },1000)
       },
       //内容组件切换
       getCom(tag){
@@ -300,7 +307,7 @@
       },
       //输入数字
       number(value){
-        this.queryParam.registerCapital = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
+        this.ProjectData.investmentAmount = value == ""?"": value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
       },
 
       handleChange(value) {

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

@@ -113,7 +113,10 @@
       </div>
       <div class="datalist">
         <div class="datali" v-for="(item,index) in datalist">
-          <div class="det-title" @click="toDetail(item.id,'xmsl')">{{item.projectName}}<span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i>{{item.nickName}}  <font color="#FA8A00">正在跟进</font></span></div>
+          <div class="det-title" @click="toDetail(item.id,'xmsl')">
+            {{item.projectName}}<span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i>
+            <span v-if="item.provinceName != '' && item.provinceName!==null">{{item.provinceName}}-</span>
+            {{item.nickName}}  <font color="#FA8A00">正在跟进</font></span></div>
           <div class="det-tips">
             <span class="tips tip1" v-for="label in item.labels">{{label}}</span>
             <span v-if="item.address" class="tips tip2">{{item.address}}</span></div>
@@ -238,6 +241,8 @@ export default {
     }
   },
   created() {
+  },
+  mounted(){
     this.prvinceTree()
     this.getList(1)
     //项目阶段
@@ -308,6 +313,10 @@ export default {
       })
     },
     reset(){
+      this.$nextTick(() => {
+        this.$refs.myCascader.$refs.panel.clearCheckedNodes()
+        this.$refs.myCascader.$refs.panel.activePath = []
+      })
       this.searchParam ={
           userId:null,
           projectName:'',//项目名称