*

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

@@ -16,7 +16,7 @@
           </div>
           <div class="table_search">
             <div class="searchInput">
-              <el-input type="text" clearable v-model="searchParam.companyName" placeholder="输入企业名称查询"></el-input>
+              <el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
               <div class="btn" @click="handleCurrentChange(1)">搜索</div>
             </div>
             <div class="dc">
@@ -338,6 +338,11 @@ export default {
       let path = type
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
     },
+    clearname(value){
+      if(value == ""){
+        this.handleCurrentChange(1)
+      }
+    },
     //翻页
     handleCurrentChange(val) {
       this.pldr=false
@@ -382,6 +387,7 @@ export default {
       }
     },
     selCompany(item){
+      console.log(item)
       this.queryParam.companyId = item.jskEid
       this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
       this.queryParam.legalPerson = item.legalPerson
@@ -404,8 +410,15 @@ export default {
         list.push(item.cityId)
       if(item.districtId != null && item.districtId != "")
         list.push(item.districtId)
-      this.queryParam.address = list
-      this.queryParam.registerAddress = item.registerAddress
+      this.$nextTick(()=>{
+        this.queryParam.address = list
+        let _this = this
+        setTimeout(function() {
+          if(_this.$refs.address){
+            _this.queryParam.registerAddress = _this.$refs.address.getCheckedNodes()[0].pathLabels.join("-")
+          }
+        },1000)
+      })
       this.showlist = false
     },
     //添加客户
@@ -415,6 +428,8 @@ export default {
       //
       //   return;
       // }
+      console.log(this.queryParam)
+      return false
       this.$refs[formName].validate((valid) => {
         if (valid) {
           addCustomer(this.queryParam).then(result=>{
@@ -546,7 +561,7 @@ export default {
       width: 270px;
     }
     .ps3{
-      width: 150px;
+      width: 155px;
       display: flex;
       justify-content: right;
       >div{
@@ -572,4 +587,9 @@ export default {
   .app-container{
     height: auto;
   }
+  .searchInput{
+    .el-input{
+      width: 260px;
+    }
+  }
 </style>

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

@@ -408,7 +408,7 @@ export default {
       let labels = []
       switch (type) {
         case 1:
-          time = time.getDay()
+          time = time.getDay()== 0?7:time.getDay()
           // week.length = time
           weekdata.length = time
           for(var i=0;i<7;i++){

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

@@ -122,6 +122,7 @@
       },
       //获取建设库客户
       getCompany(value){
+        this.queryParam.companyId = ''
         if (value.length>=2){
           let param = {
             keyword:value,

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

@@ -254,14 +254,14 @@
         }
       },
       resetForm(){
-
+        this.projectId = null
         this.addParam={
           customerId:'', //客户id
-            visitMode:'',//拜访方式
-            nextVisitTime:'',//下次拜访时间
-            name:'',//拜访对象姓名
-            position:'',//拜访对象职务
-            content:'',//拜访内容
+          visitMode:'',//拜访方式
+          nextVisitTime:'',//下次拜访时间
+          name:'',//拜访对象姓名
+          position:'',//拜访对象职务
+          content:'',//拜访内容
         }
       },
       //删除跟进动态

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

@@ -155,7 +155,7 @@
             <span>保证金金额（万元） ：</span>
             <div class="inputxt" id="inputxt6">
               <div class="flex" v-if="nowedit == 6 && isDisabled == false">
-                <el-input placeholder="待添加" v-model="earnestMoney"></el-input>
+                <el-input placeholder="待添加" @input="number1" v-model="earnestMoney"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="changes({'earnestMoney':earnestMoney})" style="width: 56px">确定</div>
                   <div class="cancels h28" @click="nowedit = -1" style="">取消</div>
@@ -329,6 +329,9 @@
       number(value){
         this.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
       },
+      number1(value){
+        this.earnestMoney = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
+      },
     }
   }
 </script>

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

@@ -14,7 +14,7 @@
               <img src="@/assets/images/project/empty.png">
               <div class="p1">暂无数据展示</div>
               <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
-              <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisabled==false">新增联系人</div>
+              <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisabled == false">新增联系人</div>
             </div>
           </template>
           <el-table-column
@@ -78,7 +78,7 @@
           </el-table-column>
         </el-table>
         <div class="bottems">
-          <div class="btn btn_primary h28" @click="opennew" v-if="total>0"><div class="img img1"></div>新增联系人</div>
+          <div class="btn btn_primary h28" @click="opennew" v-if="total>0 && isDisabled == false" ><div class="img img1" ></div>新增联系人</div>
           <el-pagination v-if="total>searchParam.pageSize"
             background
             :page-size="searchParam.pageSize"
@@ -170,6 +170,10 @@
     },
     methods:{
       getDetail(item){
+        if(this.isDisabled == true){
+          return this.$message.warning("您无权限进行操作")
+        }
+
         this.dialogVisible = true
         item.sex = item.sex.toString()
         this.queryParam = item

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

@@ -86,19 +86,21 @@
         class="popups"
         :visible.sync="dialogVisible"
         width="464px">
-        <div class="poptitle">
-          <img src="@/assets/images/economies/icon.png">
-          <span>新建相关企业</span>
-        </div>
-        <div class="types">
-          <div v-for="(item,index) in companytype" :class="{'on':types==item.dictValue}" @click="totype(item.dictValue)"><i></i>{{item.dictLabel}}</div>
-        </div>
-        <div class="popform">
+        <div @click = 'handleALL'>
+          <div class="poptitle">
+            <img src="@/assets/images/economies/icon.png">
+            <span>新建相关企业</span>
+          </div>
+          <div class="types">
+            <div v-for="(item,index) in companytype" :class="{'on':types==item.dictValue}" @click="totype(item.dictValue)"><i></i>{{item.dictLabel}}</div>
+          </div>
+          <div class="popform">
           <div class="popbot" style="padding-right: 0">
             <div class="btn btn_cancel h32" @click="cancel(0)">返回</div>
             <div class="btn btn_primary h32" @click="gettype">下一步</div>
           </div>
         </div>
+        </div>
       </el-dialog>
       <el-dialog
         class="popups"
@@ -110,7 +112,10 @@
         </div>
         <el-form class="popform i":model="queryParam" label-width="85px" :rules="rules" ref="ruleForm" >
           <el-form-item label="企业名称：" prop="companyName" class="row">
-            <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
+            <el-input type="text" v-model="queryParam.companyName" @input="getCompany" placeholder="请输入"></el-input>
+            <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>
           <el-form-item :label="typename" class="row">
             <el-input type="text" v-model="queryParam.depth" placeholder="请输入"></el-input>
@@ -136,7 +141,7 @@
 <script>
   import "@/assets/styles/project.scss"
   import {getXGQY,addXGQY,delXGQY} from '@/api/project/project'
-  import {getDictType} from '@/api/main'
+  import {getDictType,getEnterprise} from '@/api/main'
   export default {
     name: 'xgqy',
     props: {
@@ -181,6 +186,8 @@
         },
         ondel:-1,
         isDisabled:this.isDisabled,
+        showlist:false,
+        companData:[],
       }
     },
     created(){
@@ -195,7 +202,41 @@
       })
       this.getlist()
     },
+    mounted(){
+    },
     methods:{
+      //获取建设库客户
+      getCompany(value){
+        this.queryParam.companyId = ''
+        if (value.length>=2){
+          let param = {
+            keyword:value,
+            page:{
+              limit:20,
+              page:1
+            }
+          }
+          getEnterprise(JSON.stringify(param)).then(result=>{
+            if(result.code != 200)
+              return
+            this.showlist = true
+            this.companData = result.data.list
+          })
+        }
+      },
+      selCompany(item){
+        this.queryParam.companyId = item.jskEid
+        this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')
+        this.showlist = false
+      },
+      handleALL(event){
+        var one = document.getElementById("box");
+        if(one){
+          if(!one.contains(event.target)){
+            this.showlist = false
+          }
+        }
+      },
       delQY(){
         let id = this.ondel
         delXGQY(id).then(res=>{

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

@@ -36,7 +36,7 @@
           <div class="con i" style="width: 100%;">
             <span style="float: left;margin-top: 2px">项目标签 ：</span>
             <div class="flex tipinput">
-              <div class="tips" v-for="(item,index) in tipslit">{{item}}<img @click="deltip(item)" src="@/assets/images/project/del.png"></div>
+              <div class="tips" v-for="(item,index) in tipslit">{{item}}<img v-if="disabled == false" @click="deltip(item)" src="@/assets/images/project/del.png"></div>
               <div style="position: relative">
               <el-input placeholder="待添加" :disabled="isDisabled" v-model="tipsvalue" @input="getValue" :style="spanWidth"></el-input><span class="spanText">{{ tipsvalue }}</span>
               </div>

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

 <template>
-  <div @click="handleALL">
+  <div id="jsnr">
     <div class="miantitle">
       <template v-if="!detailId">
         <span>项目管理</span>
@@ -56,9 +56,9 @@
               </div>
                 </span>
             </div>
-            <div class="det-con con"  id="inputxt">
+            <div class="det-con con" >
               <span>投资估算（万元）：</span>
-              <div class="inputxt i" :class="{'nomar':nowedit != 3}" :key="keys2">
+              <div class="inputxt i" :class="{'nomar':nowedit != 3}" :key="keys2" id="inputxt">
                 <div class="flex" v-if="nowedit == 3 && isDisabled == false">
                   <el-input v-model="ProjectData.investmentAmount" placeholder="待添加" @input="number"></el-input>
                   <div class="flex">
@@ -73,11 +73,11 @@
               <span>建设地点：</span>
 
               <div class="select-popper">
-                <span :class="{ color_text:addresstxt != '待添加'}">
+                <span >
                   {{addresstxt}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
-                <el-cascader  :disabled="isDisabled" class="cascader-region select-location" v-model="ProjectData.address"
+                <el-cascader separator="-" :disabled="isDisabled" class="cascader-region select-location" v-model="ProjectData.address"
                              ref="myCascader" :props="props"
                              :options="addressList"
                              @change="handleChange"></el-cascader>
@@ -200,24 +200,31 @@
       //获取基本信息
       this.getXMSL()
     },
-    methods: {
-      getsl(data){
-        this.choose(data.projectStage)
-      },
-      handleALL(event){
-        if(this.isDisabled == true)
+    mounted(){
+      document.getElementById('jsnr').addEventListener('mouseup',(e) => {
+        if (this.isDisabled == true)
           return false
         var one = document.getElementById("inputxt");
-        if(one){
-          if(!one.contains(event.target)){
-            if(this.nowedit != -1){
-              this.editXMSL({investmentAmount:this.ProjectData.investmentAmount})
+        if (one) {
+          if (!one.contains(event.target)) {
+            if (this.nowedit != -1) {
+              this.editXMSL({ investmentAmount: this.ProjectData.investmentAmount })
             }
             this.nowedit = -1
-          }else{
+          } else {
             this.nowedit = 3
           }
         }
+      })
+    },
+    methods: {
+      getsl(data){
+        this.choose(data.projectStage)
+      },
+      handleALL(event){
+        if(this.isDisabled == true)
+          return false
+
       },
       getXMSL(){
         getXMSL(this.id).then(result=>{
@@ -242,10 +249,10 @@
             txt += result.data.provinceName
           }
           if(result.data.cityName){
-            txt += '/'+result.data.cityName
+            txt += '-'+result.data.cityName
           }
           if(result.data.districtName){
-            txt += '/'+result.data.districtName
+            txt += '-'+result.data.districtName
           }
           this.address = list.length>0?list:"待添加"
           this.addresstxt = txt == "" ? "待添加":txt
@@ -344,7 +351,7 @@
         labelString.forEach((item,index)=>{
           let str = ''
           if(index >0){
-            str = '/'
+            str = '-'
           }
           txt += str + item
           if(index == 0){

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

@@ -465,7 +465,7 @@ export default {
   }
   .btns{
     position: absolute;
-    top: 11px;
+    top: -6px;
     right: 12px;
     z-index: 2;
     .img.img1{

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

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