*

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

@@ -146,6 +146,7 @@
       //添加客户
       submitForm(formName) {
         this.queryParam.userId = this.$store.state.user.userId
+        this.queryParam.investmentAmount = parseFloat(this.queryParam.investmentAmount)
         this.$refs[formName].validate((valid) => {
           if (valid) {
             addProject(this.queryParam).then(result=>{

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

@@ -15,15 +15,17 @@
             </div>
             <div class="wr_bot">
               <div class="times"><img src="@/assets/images/project/ico_4.png">
-                <el-date-picker
+                <el-date-picker value-format="yyyy-MM-dd"
                                 v-model="queryParam.finishTime"
                                 type="date"
                                 placeholder="完成时间">
                 </el-date-picker>
               </div>
+              <div class="sels">
+                <img src="@/assets/images/project/ico_2.png">
                 <el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_2.png"></i>
                 </el-input>
+              </div>
               <div class="btn btn_primary h32 wc" @click="add" :disabled="queryParam.task == ''" :class="{'btn_disabled':queryParam.task == ''}">完成</div>
             </div>
           </div>
@@ -34,7 +36,7 @@
           <div class="task_con"><span>发起时间：{{item.createTime}}</span><span v-if="item.target">关联客户：<font class="wordprimary">{{item.target}}</font></span><span v-if="item.finishTime">完成时间：{{item.finishTime}}</span></div>
           <div class="select" :class="{'on':item.state == 2}">
             <div class="select-popper">
-                <span class="color_text">
+                <span>
                   {{item.state == 2?"已完成":"未完成"}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
@@ -109,6 +111,9 @@
           if(result.code == 200){
             this.$message.success("添加成功！")
             this.getList()
+            this.queryParam.target = ''
+            this.queryParam.task = ''
+            this.queryParam.finishTime = ''
           }else{
             this.$message.error(result.msg)
           }
@@ -162,4 +167,7 @@
     width: 100px;
     margin-right: 12px;
   }
+  .times .el-input__icon >img{
+    width: 16px;
+  }
 </style>

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

@@ -8,7 +8,7 @@
           <div class="con">
             <span>总投资额（万元） ：</span>
             <div class="inputxt"  id="inputxt1">
-              <div class="flex" v-if="nowedit == 1">
+              <div class="flex" v-if="nowedit == 1 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="investmentAmount" @input="number"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" style="width: 56px" @click="changes({'investmentAmount':investmentAmount})">确定</div>
@@ -21,7 +21,7 @@
           <div class="con i">
             <span>资金来源 ：</span>
             <div class="inputxt" id="inputxt2">
-              <div class="flex" v-if="nowedit == 2">
+              <div class="flex" v-if="nowedit == 2 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="amountSource"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="changes({'amountSource':amountSource})" style="width: 56px">确定</div>
@@ -36,7 +36,7 @@
           <div class="con">
             <span>建设性质 ：</span>
             <div class="inputxt" id="inputxt3">
-              <div class="flex" v-if="nowedit == 3">
+              <div class="flex" v-if="nowedit == 3 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="buildProperty"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="changes({'buildProperty':buildProperty})" style="width: 56px">确定</div>
@@ -50,7 +50,7 @@
             <span>计划招标 ：</span>
             <div class="inputime">
               <div class="flex" style="">
-                <el-date-picker class="timeinput"
+                <el-date-picker class="timeinput" v-if="isDisabled == false"
                                 v-model="planBidTime"
                                 type="date"
                                 value-format="yyyy-MM-dd"
@@ -66,7 +66,7 @@
             <span>计划开工 ：</span>
             <div class="inputime">
               <div class="flex" style="opacity: 0;height: 0">
-                <el-date-picker class="timeinput"
+                <el-date-picker class="timeinput" v-if="isDisabled == false"
                                 v-model="planStartTime"
                                 type="date"
                                 value-format="yyyy-MM-dd"
@@ -80,7 +80,7 @@
             <span>计划竣工 ：</span>
             <div class="inputime">
               <div class="flex" style="opacity: 0;height: 0">
-                <el-date-picker class="timeinput"
+                <el-date-picker class="timeinput" v-if="isDisabled == false"
                   v-model="planCompleteTime"
                   type="date"
                   value-format="yyyy-MM-dd"
@@ -96,7 +96,7 @@
     <el-card class="box-card noborder">
       <div class="cardtitles">项目概况与建设规模</div>
       <div class="baseinfo" >
-        <el-input id="inputxt9"  v-model="projectDetails" @focus="nowedit = 9" class="textarea" type="textarea" placeholder="请输入项目概况与建设规模详细信息"  maxlength="500" :show-word-limit="true" ></el-input>
+        <el-input id="inputxt9" :disabled="isDisabled" v-model="projectDetails" @focus="nowedit = 9" class="textarea" type="textarea" placeholder="请输入项目概况与建设规模详细信息"  maxlength="500" :show-word-limit="true" ></el-input>
         <div class="flex btns" v-if="nowedit == 9">
           <div class="flex">
             <div class="btnsmall btn_primary h28" @click="changes({'projectDetails':projectDetails})" style="width: 56px">确定</div>
@@ -112,7 +112,7 @@
           <div class="con">
             <span>评标办法 ：</span>
             <div class="inputxt" id="inputxt4">
-              <div class="flex" v-if="nowedit == 4">
+              <div class="flex" v-if="nowedit == 4 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="evaluationBidWay"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="changes({'evaluationBidWay':evaluationBidWay})" style="width: 56px">确定</div>
@@ -126,7 +126,7 @@
             <span>开标时间 ：</span>
             <div class="inputime">
               <div class="flex" style="opacity: 0;height: 0">
-                <el-date-picker class="timeinput"
+                <el-date-picker class="timeinput" v-if="isDisabled == false"
                                 v-model="bidOpenTime"
                                 type="date"
                                 value-format="yyyy-MM-dd"
@@ -141,7 +141,7 @@
           <div class="con">
             <span>保证金缴纳 ：</span>
             <div class="inputxt" id="inputxt5">
-              <div class="flex" v-if="nowedit == 5">
+              <div class="flex" v-if="nowedit == 5 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="earnestMoneyPay"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="changes({'earnestMoneyPay':earnestMoneyPay})" style="width: 56px">确定</div>
@@ -154,7 +154,7 @@
           <div class="con i">
             <span>保证金金额（万元） ：</span>
             <div class="inputxt" id="inputxt6">
-              <div class="flex" v-if="nowedit == 6">
+              <div class="flex" v-if="nowedit == 6 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="earnestMoney"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="changes({'earnestMoney':earnestMoney})" style="width: 56px">确定</div>
@@ -169,7 +169,7 @@
         <div class="con">
           <span>开标地点 ：</span>
           <div class="inputxt" id="inputxt7">
-            <div class="flex" v-if="nowedit == 7">
+            <div class="flex" v-if="nowedit == 7 && isDisabled == false">
               <el-input placeholder="待添加" v-model="bidOpenPlace"></el-input>
               <div class="flex">
                 <div class="btnsmall btn_primary h28" @click="changes({'bidOpenPlace':bidOpenPlace})" style="width: 56px">确定</div>
@@ -182,7 +182,7 @@
         <div class="con i">
           <span>评标委员会 ：</span>
           <div class="inputxt" id="inputxt8">
-            <div class="flex" v-if="nowedit == 8">
+            <div class="flex" v-if="nowedit == 8 && isDisabled == false">
               <el-input placeholder="待添加" v-model="evaluationBidCouncil"></el-input>
               <div class="flex">
                 <div class="btnsmall btn_primary h28" @click="changes({'evaluationBidCouncil':evaluationBidCouncil})" style="width: 56px">确定</div>
@@ -207,7 +207,8 @@
       detailId: { //从企业详情跳转过来ID
         type: Number,
         default: 0
-      }
+      },
+      isDisabled:false,
     },
     data(){
       return{
@@ -226,12 +227,15 @@
         earnestMoney: '',//保证金金额
         earnestMoneyPay: '',//保证金缴纳
         evaluationBidCouncil: '',//评标委员会
+        isDisabled:this.isDisabled,
       }
     },
     watch:{
     },
     mounted(){
       document.addEventListener('mouseup',(e) => {
+        if(this.isDisabled == true)
+          return false
         let j = 0
         for(var i=1;i<=9;i++){
           let isSelf = document.getElementById('inputxt'+i).contains(event.target)  // 这个是自己的区域
@@ -242,38 +246,39 @@
           }
         }
         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)
-
+          if(this.nowedit !=-1){
+            let param = {}
+            switch (this.nowedit) {
+              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
         }
       })
@@ -303,6 +308,8 @@
         this.nowedit = -1
         let param = str
         param.id = this.id
+        if(this.isDisabled == true)
+          return false
         editXMNR(param).then(result=>{
           if(result.code == 200)
             this.$message.success('修改成功!')
@@ -314,7 +321,7 @@
       },
       //输入数字
       number(value){
-        this.investmentAmount = this.investmentAmount == ""||this.investmentAmount == null? value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1'):null//输入6位小数
+        this.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
       },
     }
   }

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

@@ -14,13 +14,16 @@
               <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="btn btn_primary h36 w102" @click="opennew" v-if="isDisabled==false">新增联系人</div>
             </div>
           </template>
           <el-table-column
             prop="name"
             label="姓名"
             width="113">
+            <template slot-scope="scope">
+              {{scope.row.name || '--'}}
+            </template>
           </el-table-column>
           <el-table-column
             prop="name"
@@ -38,20 +41,32 @@
             label="角色"
             sortable
             width="146">
+            <template slot-scope="scope">
+              {{scope.row.role || '--'}}
+            </template>
           </el-table-column>
           <el-table-column
             prop="office"
-            label="公司/机关">
+            label="关联企业">
+            <template slot-scope="scope">
+              {{scope.row.office || '--'}}
+            </template>
           </el-table-column>
           <el-table-column
             prop="position"
             label="职位"
             width="125">
+            <template slot-scope="scope">
+              {{scope.row.position || '--'}}
+            </template>
           </el-table-column>
           <el-table-column
             prop="phone"
             label="联系方式"
             width="175">
+            <template slot-scope="scope">
+              {{scope.row.phone || '--'}}
+            </template>
           </el-table-column>
           <el-table-column
             prop="accendant"
@@ -86,18 +101,24 @@
           <el-form-item label="联系人姓名：" class="row">
             <el-input type="text" v-model="queryParam.name" placeholder="请输入"></el-input>
           </el-form-item>
+          <el-form-item label="联系人性别：" class="row">
+            <el-radio-group v-model="queryParam.sex">
+              <el-radio label=1>男</el-radio>
+              <el-radio label=0>女</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="联系人角色：" class="row">
             <el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="联系人职位：" class="row">
-            <el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
-          </el-form-item>
-          <el-form-item label="联系人公司/机关：" class="row">
+          <el-form-item label="关联企业：" class="row">
             <el-input type="text" v-model="queryParam.office" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="内部维护人：" class="row">
-            <el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>
+          <el-form-item label="联系人职位：" class="row">
+            <el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
           </el-form-item>
+          <!--<el-form-item label="内部维护人：" class="row">-->
+            <!--<el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>-->
+          <!--</el-form-item>-->
           <el-form-item label="联系方式：" class="row">
             <el-input type="text" v-model="queryParam.phone" placeholder="请输入"></el-input>
           </el-form-item>
@@ -120,7 +141,8 @@
       detailId: { //从企业详情跳转过来ID
         type: Number,
         default: 0
-      }
+      },
+      isDisabled:false,
     },
     data(){
       return{
@@ -140,6 +162,7 @@
         total:0,
         projectname:this.$route.query.projectname,
         queryParam:[],
+        isDisabled:this.isDisabled,
       }
     },
     created(){
@@ -148,6 +171,7 @@
     methods:{
       getDetail(item){
         this.dialogVisible = true
+        item.sex = item.sex.toString()
         this.queryParam = item
         this.isnew = false
       },
@@ -158,8 +182,10 @@
         })
       },
       save(){
+        let param = JSON.parse(JSON.stringify(this.queryParam))
+        param.sex = parseInt(param.sex)
         if(this.isnew == false){
-          editLXR(this.queryParam).then(result=>{
+          editLXR(param).then(result=>{
             if(result.code == 200){
               this.$message.success('保存成功！')
               this.getList()
@@ -168,7 +194,7 @@
           })
         }
         if(this.isnew == true){
-          addLXR(this.queryParam).then(result=>{
+          addLXR(param).then(result=>{
             if(result.code == 200){
               this.$message.success('新增成功！')
               this.getList()
@@ -192,11 +218,12 @@
         this.queryParam = {
           businessId:this.id,
           name:"",
+          sex:"1",
           role:"",
           office:"",
           position:"",
           phone:"",
-          accendant:"",
+          // accendant:"",
         }
       },
     }

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

@@ -4,11 +4,11 @@
     <el-card class="box-card noborder">
       <div class="cardtitles">相关企业</div>
       <div class="searchbtns">
-        <el-select class="select"  placeholder="企业类型" clearable="true" v-model="searchParam.companyType" @change="handleCurrentChange(1)">
+        <el-select class="select"  placeholder="企业类型" clearable 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>
+          <el-input type="text" placeholder="输入关键词查询" clearable  v-model="searchParam.companyName"></el-input>
           <div class="btn" @click="handleCurrentChange(1)">搜索</div>
         </div>
         <div class="btn btn_primary h32 b3" @click="opennew"><div class="img img1"></div>添加相关企业</div>
@@ -23,7 +23,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">新增相关企业</div>-->
+              <div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div>
             </div>
           </template>
           <el-table-column
@@ -266,6 +266,9 @@
 </script>
 
 <style lang="scss" scoped>
+  .searchInput .el-input{
+    width: 68%;
+  }
   .w102{
     width: 102px;
   }

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

@@ -8,7 +8,7 @@
           <div class="con">
             <span>项目级别 ：</span>
             <div class="inputxt" id="inputxt1">
-              <div class="flex" v-if="nowedit == 1">
+              <div class="flex" v-if="nowedit == 1 && isDisabled == false" >
                 <el-input placeholder="待添加" v-model="xmsldata.projectLevel"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" style="width: 56px" @click="editXMSL({projectLevel:xmsldata.projectLevel})">确定</div>
@@ -26,7 +26,7 @@
                 {{xmjd}}
                 <i class="el-icon-caret-bottom"></i>
               </span>
-              <el-select v-model="xmjd" class="select-multiple" placeholder="请选择" @change="editXMSL({projectStage:xmjd})">
+              <el-select v-if="isDisabled==false" v-model="xmjd" class="select-multiple" placeholder="请选择" @change="editXMSL({projectStage:xmjd})">
                 <el-option v-for="(item,index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
             </div>
@@ -38,9 +38,9 @@
             <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 style="position: relative">
-              <el-input placeholder="待添加" v-model="tipsvalue" @input="getValue" :style="spanWidth"></el-input><span class="spanText">{{ tipsvalue }}</span>
+              <el-input placeholder="待添加" :disabled="isDisabled" v-model="tipsvalue" @input="getValue" :style="spanWidth"></el-input><span class="spanText">{{ tipsvalue }}</span>
               </div>
-              <div class="addbtn" @click="addtips"></div>
+              <div class="addbtn" v-if="isDisabled == false" @click="addtips"></div>
             </div>
           </div>
         </div>
@@ -53,7 +53,7 @@
           <div class="con">
             <span>主管单位 ：</span>
             <div class="inputxt" id="inputxt2">
-              <div class="flex" v-if="nowedit == 2">
+              <div class="flex" v-if="nowedit == 2 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.supervisorUnit"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" style="width: 56px" @click="editXMSL({supervisorUnit:xmsldata.supervisorUnit})">确定</div>
@@ -66,7 +66,7 @@
           <div class="con i">
             <span>建设单位 ：</span>
             <div class="inputxt" id="inputxt3" :style="{width:rig1}">
-              <div class="flex" v-if="nowedit == 3">
+              <div class="flex" v-if="nowedit == 3 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.constructionUnit"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" style="width: 56px" @click="editXMSL({constructionUnit:xmsldata.constructionUnit})">确定</div>
@@ -82,7 +82,7 @@
           <div class="con">
             <span>主管单位负责人 ：</span>
             <div class="inputxt" id="inputxt4">
-              <div class="flex" v-if="nowedit == 4">
+              <div class="flex" v-if="nowedit == 4 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.supervisorPrincipal"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" style="width: 56px" @click="editXMSL({supervisorPrincipal:xmsldata.supervisorPrincipal})">确定</div>
@@ -95,7 +95,7 @@
           <div class="con i">
             <span>建设单位负责人 ：</span>
             <div class="inputxt" id="inputxt5">
-              <div class="flex" v-if="nowedit == 5">
+              <div class="flex" v-if="nowedit == 5 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.constructionPrincipal"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" style="width: 56px" @click="editXMSL({constructionPrincipal:xmsldata.constructionPrincipal})">确定</div>
@@ -110,7 +110,7 @@
           <div class="con">
             <span>主管单位联系电话 ：</span>
             <div class="inputxt" id="inputxt6">
-              <div class="flex" v-if="nowedit == 6">
+              <div class="flex" v-if="nowedit == 6 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.supervisorPhone"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="isphone(1,xmsldata.supervisorPhone)" style="width: 56px">确定</div>
@@ -123,7 +123,7 @@
           <div class="con i">
             <span>建设单位联系电话 ：</span>
             <div class="inputxt" id="inputxt7">
-              <div class="flex" v-if="nowedit == 7">
+              <div class="flex" v-if="nowedit == 7 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.constructionPhone"></el-input>
                 <div class="flex">
                   <div class="btnsmall btn_primary h28" @click="isphone(2,xmsldata.constructionPhone)" style="width: 56px">确定</div>
@@ -177,7 +177,6 @@
   export default {
     name: 'xmsl',
     props:{
-      datas:'',
       detailId: { //从企业详情跳转过来ID
         type: Number,
         default: 0
@@ -191,9 +190,10 @@
         xmjd:'待添加',
         projectStage:[],//项目阶段
         id: this.detailId ? this.detailId : this.$route.query.id,
-        xmsldata:this.datas,
+        xmsldata:[],
         spanWidth:'width: 70px',
         rig1:'184px',
+        isDisabled:false,
       }
     },
     created(){
@@ -205,6 +205,8 @@
     },
     mounted(){
       document.addEventListener('mouseup',(e) => {
+        if(this.isDisabled == true)
+          return false
         let j = 0
         for(var i=1;i<=7;i++){
           let isSelf = document.getElementById('inputxt'+i).contains(event.target)  // 这个是自己的区域
@@ -215,6 +217,33 @@
           }
         }
         if(j == 7){
+          if(this.nowedit != -1){
+            let param = {}
+            switch (this.nowedit) {
+              case 1:
+                param = {'projectLevel':this.xmsldata.projectLevel}
+                break;
+              case 2 :
+                param = {'supervisorUnit':this.xmsldata.supervisorUnit}
+                break;
+              case 3 :
+                param = {'constructionUnit':this.xmsldata.constructionUnit}
+                break;
+              case 4 :
+                param = {'supervisorPrincipal':this.xmsldata.supervisorPrincipal}
+                break;
+              case 5 :
+                param = {'constructionPrincipal':this.xmsldata.constructionPrincipal}
+                break;
+              case 6 :
+                param = {'supervisorPhone':this.xmsldata.supervisorPhone}
+                break;
+              case 7 :
+                param = {'constructionPhone':this.xmsldata.constructionPhone}
+                break;
+            }
+            this.editXMSL(param)
+          }
           this.nowedit = -1
         }
       })
@@ -232,6 +261,9 @@
         });
       },
       editXMSL(param){
+        this.nowedit = -1
+        if(this.isDisabled == true)
+          return false
         if(param.projectStage){//修改项目阶段
           this.$emit('Refreshs',param)
           this.xmjd = param.projectStage
@@ -240,13 +272,14 @@
           params.id = this.id
           editXMNR(JSON.stringify(params)).then(res=>{
             if (res.code == 200){
+              if(!param.projectStage){
                 this.$message.success('修改成功！')
+              }
             }else{
               this.$message.error(res.msg)
               this.getXMSL()
             }
           })
-          this.nowedit = -1
         }
       },
       //验证电话号码
@@ -307,8 +340,7 @@
           this.xmjd = result.data.projectStage
           this.tipslit = result.data.labelList
           this.xmsldata = result.data
-
-
+          this.isDisabled = result.data.isFounder == 1 ? false:true
           const spanStyle = document.querySelector(".rig1");
           this.$nextTick(() => {    // 如果不用$nextTick的话页面并不会更新，它是在下次dom更新后再渲染到页面上
             this.rig1 =

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

@@ -6,7 +6,7 @@
       <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>
+          <el-input type="text" v-model="param.keyword" clearable placeholder="输入关键词查询"></el-input>
           <div class="btn" @click="handleCurrentChange(1)">搜索</div>
         </div>
         <div class="btn btn_primary h32 b2" @click="getUP"><div class="img img2"></div>上传</div>
@@ -51,8 +51,8 @@
           <template slot="empty">
             <div class="empty">
               <img src="@/assets/images/project/empty.png">
-              <div class="p1">暂无数据展示</div>
-              <div class="p2">抱歉，你还未添加相关数据，快去上传吧</div>
+              <div class="p1">抱歉，没找到相关数据</div>
+              <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
               <div class="btn btn_primary h36 w102" @click="getUP">上传文档</div>
             </div>
           </template>
@@ -345,4 +345,7 @@
       }
     }
   }
+  .searchInput .el-input{
+    width: 68%;
+  }
 </style>

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

@@ -29,7 +29,7 @@
               </div>
             </div>
           </div>
-          <div class="contets row">
+          <div class="contets row" readonly>
             <div class="det-con">
               <span>项目类型：</span>
               <div class="select-popper" >
@@ -37,7 +37,7 @@
                   {{xmlx}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
-                <el-select v-model="xmlx" class="select-multiple" placeholder="请选择" @change="editXMSL({projectType:xmlx})">
+                <el-select v-if="isDisabled == false" v-model="xmlx" class="select-multiple" placeholder="请选择" @change="editXMSL({projectType:xmlx})">
                   <el-option v-for="(item,index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
                 </el-select>
               </div>
@@ -50,7 +50,7 @@
                   {{xmlb}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
-                <el-select v-model="xmlb" class="select-multiple" placeholder="请选择" @change="editXMSL({projectCategory:xmlb})">
+                <el-select v-if="isDisabled==false" v-model="xmlb" class="select-multiple" placeholder="请选择" @change="editXMSL({projectCategory:xmlb})">
                   <el-option v-for="(item,index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
                 </el-select>
               </div>
@@ -59,7 +59,7 @@
             <div class="det-con con"  id="inputxt">
               <span>投资估算（万元）：</span>
               <div class="inputxt i" :class="{'nomar':nowedit != 3}">
-                <div class="flex" v-if="nowedit == 3">
+                <div class="flex" v-if="nowedit == 3 && isDisabled == false">
                   <el-input v-model="ProjectData.investmentAmount" placeholder="待添加" @input="number"></el-input>
                   <div class="flex">
                     <div class="btnsmall btn_primary h28" style="width: 56px" @click="editXMSL({investmentAmount:ProjectData.investmentAmount})">确定</div>
@@ -77,7 +77,7 @@
                   {{addresstxt}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
-                <el-cascader class="cascader-region select-location" v-model="ProjectData.address"
+                <el-cascader  :disabled="isDisabled" class="cascader-region select-location" v-model="ProjectData.address"
                              ref="myCascader" :props="props"
                              :options="addressList"
                              @change="handleChange"></el-cascader>
@@ -107,19 +107,19 @@
         </div>
       </el-card>
       <!--项目速览-->
-      <xmsl v-if="thistag == 'xmsl'" :key="keys" @Refreshs="getsl" :datas="ProjectData" :detailId="detailId"></xmsl>
+      <xmsl v-if="thistag == 'xmsl'" :key="keys" @Refreshs="getsl" :detailId="detailId"></xmsl>
       <!--建设内容-->
-      <jsnr v-if="thistag == 'jsnr'" :detailId="detailId"></jsnr>
+      <jsnr v-if="thistag == 'jsnr'" :isDisabled='isDisabled' :detailId="detailId"></jsnr>
       <!--联系人-->
-      <lxr v-if="thistag == 'lxr'" :detailId="detailId"></lxr>
+      <lxr v-if="thistag == 'lxr'" :isDisabled='isDisabled' :detailId="detailId"></lxr>
       <!--跟进记录-->
-      <gjjl v-if="thistag == 'gjjl'" types="gjjl" :detailId="detailId"></gjjl>
+      <gjjl v-if="thistag == 'gjjl'" :isDisabled='isDisabled' types="gjjl" :detailId="detailId"></gjjl>
       <!--工作待办-->
-      <gzdb v-if="thistag == 'gzdb'" :detailId="detailId"></gzdb>
+      <gzdb v-if="thistag == 'gzdb'" :isDisabled='isDisabled' :detailId="detailId"></gzdb>
       <!--资料文档-->
-      <zlwd v-if="thistag == 'zlwd'" :detailId="detailId"></zlwd>
+      <zlwd v-if="thistag == 'zlwd'" :isDisabled='isDisabled' :detailId="detailId"></zlwd>
       <!--相关企业-->
-      <xgqy v-if="thistag == 'xgqy'" :detailId="detailId"></xgqy>
+      <xgqy v-if="thistag == 'xgqy'" :isDisabled='isDisabled' :detailId="detailId"></xgqy>
     </div>
   </div>
 </template>
@@ -175,6 +175,7 @@
         props:{ checkStrictly: true, expandTrigger: 'hover' },
         id:'',
         ProjectData:{},
+        isDisabled:false,
         keys:1,
       }
     },
@@ -202,9 +203,14 @@
         this.choose(data.projectStage)
       },
       handleALL(event){
+        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})
+            }
             this.nowedit = -1
           }else{
             this.nowedit = 3
@@ -215,6 +221,7 @@
         getXMSL(this.id).then(result=>{
           this.ProjectData = result.code==200?result.data:{}
           this.$route.query.projectname = result.data.projectName
+          this.isDisabled = result.data.isFounder == 1 ? false:true
           this.xmlx = result.data.projectType==""||result.data.projectType==null?"请选择":result.data.projectType
           this.xmlb = result.data.projectCategory==""||result.data.projectCategory==null?"请选择":result.data.projectCategory
           this.thisindex = result.data.projectStage
@@ -249,6 +256,8 @@
         this.ProjectData.isPrivate = isPrivate
       },
       editXMSL(param){
+        if(this.isDisabled == true)
+          return false
         let params = param
         params.id = this.id
         editXMNR(JSON.stringify(params)).then(res=>{
@@ -294,6 +303,8 @@
         this.lastindex = value
       },
       choose(value){
+        if(this.isDisabled == true)
+          return false
         this.thisindex = value
         this.editXMSL({projectStage:value})
         let _this = this

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

@@ -99,7 +99,9 @@
       <div class="titles">项目明细
       <div class="dc">
         <div class="total">共{{total}}条</div>
+        <el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">
           <div class="btn-export"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
+        </el-tooltip>
       </div>
       </div>
       <div class="tables" v-if="total == 0">
@@ -452,6 +454,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+  .btn_primary{
+    margin-top: 16px;
+  }
   .jabph_popper_box{
     left: 110px;
   }