*

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

@@ -158,6 +158,15 @@ export function addXGQY(param) {
   })
 }
 
+//编辑相关企业
+export function saveXGQY(param) {
+  return request({
+    url: '/business/company/edit',
+    method: 'POST',
+    data:param
+  })
+}
+
 //删除相关企业
 export function delXGQY(param) {
   return request({

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

@@ -500,6 +500,12 @@
         width: 80px;
       }
     }
+    .row.i{
+      .el-form-item__label{
+        line-height: 18px;
+        text-align: left;
+      }
+    }
   }
   .popform.i{
     .el-input{
@@ -907,6 +913,9 @@
       .xz{
         opacity: 0.8;
       }
+      .xg{
+        //color: #FF3C3C;
+      }
       .sc{
         color: #FF3C3C;
       }

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

@@ -104,7 +104,7 @@
               label="注册资本金（万元）"
               width="140">
               <template slot-scope="scope">
-                {{scope.row.registerCapital || '--'}}
+                <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
               </template>
             </el-table-column>
             <el-table-column

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

@@ -93,7 +93,7 @@
               label="注册资本金（万元）"
               width="140">
               <template slot-scope="scope">
-                {{scope.row.registerCapital || '--'}}
+                <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
               </template>
             </el-table-column>
             <el-table-column

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

@@ -107,7 +107,7 @@ export default {
         {title: '商务信息', pathName: 'business'},
         {title: '招标偏好', pathName: 'preference'},
         {title: '合作情况', pathName: 'cooperate'},
-        {title: '决策链条', pathName: 'decisionMaking'},
+        {title: '联系人', pathName: 'decisionMaking'},
         {title: '跟进记录', pathName: 'gjjl'}
       ],
       defaultRoute: [],

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

@@ -266,6 +266,17 @@ export default {
             this.ifEmpty = true
           }
           this.tableData = res.rows
+          this.tableData.forEach(item=>{
+            let investmentAmount = item.investmentAmount
+            if(investmentAmount){
+              investmentAmount = parseFloat(investmentAmount)
+              if(investmentAmount<=0){
+                item.investmentAmount = null
+              }
+            }else{
+              item.investmentAmount = null
+            }
+          })
           this.tableDataTotal = res.total
           this.tableLoading = false
         }

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

@@ -33,7 +33,7 @@
 
     <!-- 弹窗添加联系人 -->
     <el-dialog
-      class="popups1"
+      class="popups"
       :visible.sync="dialogVisible"
       :before-close="cancel"
       width="464px">
@@ -41,25 +41,28 @@
         <img src="@/assets/images/economies/icon.png">
         <span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
       </div>
-      <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
-        <el-form-item label="姓名：" prop="name">
+      <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="137px">
+        <el-form-item label="联系人姓名：" prop="name" class="row">
           <el-input v-model="addRorm.name" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="角色：" prop="role">
+        <el-form-item label="联系人性别：" class="row">
+          <el-radio-group v-model="addRorm.sex">
+            <el-radio label=1>男</el-radio>
+            <el-radio label=0>女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="联系人角色：" prop="role" class="row">
           <el-input v-model="addRorm.role" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="职位：" prop="workUnit">
-          <el-input v-model="addRorm.workUnit" placeholder="请输入"></el-input>
+        <el-form-item label="关联企业：" class="row">
+          <el-input type="text" v-model="addRorm.office" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="公司/机关：" prop="position">
+        <el-form-item label="联系人职位：" prop="workUnit" class="row">
           <el-input v-model="addRorm.position" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="联系方式：" prop="contactInformation">
+        <el-form-item label="联系方式：" prop="contactInformation" class="row">
           <el-input v-model="addRorm.contactInformation" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="备注：" prop="remark">
-          <el-input v-model="addRorm.remark" placeholder="请输入"></el-input>
-        </el-form-item>
         <div class="popbot">
           <div class="btn btn_cancel h32" @click="cancel">返回</div>
           <div class="btn btn_primary h32" @click="add">保存</div>
@@ -93,20 +96,21 @@ export default {
       forData: [
         {label: '姓名', prop: 'name', width: '124'},
         {label: '角色', prop: 'role', width: '110'},
-        {label: '公司/机关', prop: 'position', width: '268'},
-        {label: '职位', prop: 'workUnit', width: '110'},
+        // {label: '公司/机关', prop: 'position', width: '268'},
+        {label: '职位', prop: 'position', width: '110'},
         {label: '联系方式', prop: 'contactInformation', width: '105'},
         {label: '内部维护人', prop: 'updateBy', width: '100'},
-        {label: '备注', prop: 'remark'},
+        {label: '来源', prop: 'remark'},
       ],
       addRorm: {
         customerId:this.customerIds,
         name:'',
         role:'',
-        workUnit:'',
+        sex:"1",
         position:'',
+        // position:'',
         contactInformation:'',
-        remark:'',
+        // remark:'',
       },
       addRules:{
         name: [
@@ -151,7 +155,9 @@ export default {
     add(){
       this.$refs.addRorm.validate((valid) => {
         if (valid) {
-          addChain(this.addRorm).then((res) => {
+          let param = JSON.parse(JSON.stringify(this.addRorm))
+          param.sex = parseInt(param.sex)
+          addChain(param).then((res) => {
             if(res.data){
               this.$message({
                 message: '新增成功',
@@ -263,59 +269,59 @@ export default {
     margin-top: 10px;
   }
   // 弹窗
-  .popups1{
-    .poptitle {
-      line-height: 48px;
-      border-bottom: 1px solid #E1E1E1;
-      height: 48px;
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      img {
-        width: 17px;
-        margin: 16px;
-        float: left;
-      }
-      span {
-        font-weight: bold;
-        font-size: 16px;
-        color: #232323;
-        font-family: Microsoft YaHei-Bold, Microsoft YaHei;
-        width: 385px;
-        display: block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-    }
-    ::v-deep .el-dialog__body{
-      padding: 24px 24px 18px;
-    }
-    .popform {
-      padding-top: 14px;
-      ::v-deep .el-form-item__label{
-        padding:0;
-      }
-      .row {
-        padding-bottom: 16px;
-        .left {
-          width: 137px;
-          display: inline-block;
-          text-align: right;
-          opacity: 0.8;
-        }
-        ::v-deep .el-input {
-          display: inline-block;
-          width: 240px;
-        }
-      }
-      .popbot {
-        text-align: right;
-        padding-top: 8px;
-      }
-    }
-  }
+  /*.popups1{*/
+    /*.poptitle {*/
+      /*line-height: 48px;*/
+      /*border-bottom: 1px solid #E1E1E1;*/
+      /*height: 48px;*/
+      /*position: absolute;*/
+      /*top: 0;*/
+      /*left: 0;*/
+      /*width: 100%;*/
+      /*img {*/
+        /*width: 17px;*/
+        /*margin: 16px;*/
+        /*float: left;*/
+      /*}*/
+      /*span {*/
+        /*font-weight: bold;*/
+        /*font-size: 16px;*/
+        /*color: #232323;*/
+        /*font-family: Microsoft YaHei-Bold, Microsoft YaHei;*/
+        /*width: 385px;*/
+        /*display: block;*/
+        /*overflow: hidden;*/
+        /*white-space: nowrap;*/
+        /*text-overflow: ellipsis;*/
+      /*}*/
+    /*}*/
+    /*::v-deep .el-dialog__body{*/
+      /*padding: 24px 24px 18px;*/
+    /*}*/
+    /*.popform {*/
+      /*padding-top: 14px;*/
+      /*::v-deep .el-form-item__label{*/
+        /*padding:0;*/
+      /*}*/
+      /*.row {*/
+        /*padding-bottom: 16px;*/
+        /*.left {*/
+          /*width: 137px;*/
+          /*display: inline-block;*/
+          /*text-align: right;*/
+          /*opacity: 0.8;*/
+        /*}*/
+        /*::v-deep .el-input {*/
+          /*display: inline-block;*/
+          /*width: 240px;*/
+        /*}*/
+      /*}*/
+      /*.popbot {*/
+        /*text-align: right;*/
+        /*padding-top: 8px;*/
+      /*}*/
+    /*}*/
+  /*}*/
 }
 ::v-deep .el-table__fixed::before, ::v-deep .el-table__fixed-right::before{
   background-color:unset;

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

@@ -12,7 +12,10 @@
     </div>
     <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
       <el-form-item label="项目名称：" class="row"  prop="projectName">
-        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName"></el-input>
+        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject"></el-input>
+        <div class="resultlist" v-if="proList.length>0" id="box1">
+          <div v-for="(item,index) in proList" @click="selProject(item)"><span  v-html="item"></span></div>
+        </div>
       </el-form-item>
       <el-form-item label="业主单位：" class="row"  prop="ownerCompany">
         <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany"></el-input>
@@ -56,6 +59,7 @@
 <script>
   import {getEnterprise,getDictType,} from '@/api/main'
   import {addProject} from '@/api/project/project'
+  import {queryProject} from '@/api/detail/party-a/cooperate'
   export default {
     name: 'addProject',
     data(){
@@ -90,6 +94,7 @@
         projectStage:[],//项目阶段
         projectType:[],//项目类型
         projectCategory:[],//项目类别
+        proList:[],//项目列表
       }
     },
     mounted(){
@@ -119,6 +124,12 @@
             this.showlist = false
           }
         }
+        var two = document.getElementById("box1");
+        if(two){
+          if(!two.contains(event.target)){
+            this.proList = []
+          }
+        }
       },
       //获取建设库客户
       getCompany(value){
@@ -139,11 +150,31 @@
           })
         }
       },
+      //获取项目名称
+      getProject(value){
+        if (value.length>=2){
+          let param = {
+            projectName:value,
+          }
+          queryProject(JSON.stringify(param)).then(result=>{
+            if(result.code != 200){
+              this.proList = []
+              return false
+            }
+            this.proList = result.data
+          })
+        }
+      },
       selCompany(item){
         this.queryParam.companyId = item.jskEid
         this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')
         this.showlist = false
       },
+      selProject(item){
+        // this.queryParam.companyId = item.jskEid
+        // this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')
+        this.proList = []
+      },
       //添加客户
       submitForm(formName) {
         this.queryParam.userId = this.$store.state.user.userId

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

@@ -51,6 +51,16 @@
             label="负责人"
             width="">
           </el-table-column>
+          <el-table-column
+            prop="responsiblePerson"
+            label="负责人联系方式"
+            width="">
+          </el-table-column>
+          <el-table-column
+            prop="responsiblePerson"
+            label="备注"
+            width="">
+          </el-table-column>
           <el-table-column v-if="isDisableds == false"
             prop="name"
             label=""
@@ -58,6 +68,7 @@
             width="">
             <template slot-scope="scope">
               <div class="hoverbtn">
+                <div class="xg" @click="getDetail(scope.row)">修改</div>
                 <div class="sc" @click="ondel = scope.row.id">删除</div>
               </div>
             </template>
@@ -83,55 +94,62 @@
         </div>
         </div>
       </div>
-      <el-dialog
-        class="popups"
-        :visible.sync="dialogVisible"
-        width="464px">
-        <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"-->
+        <!--:visible.sync="dialogVisible"-->
+        <!--width="464px">-->
+        <!--<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"
         :visible.sync="hzhbVisible"
         width="464px">
         <div class="poptitle">
           <img src="@/assets/images/economies/icon.png">
-          <span>新建相关企业-{{types}}</span>
+          <span>新建相关企业</span>
         </div>
         <el-form class="popform i":model="queryParam" label-width="85px" :rules="rules" ref="ruleForm" >
+          <el-form-item  label="企业角色：" prop="companyType" class="row">
+            <el-select  placeholder="请选择" v-model="queryParam.companyType">
+              <el-option v-for="(item,index) in companytype" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="企业名称：" prop="companyName" class="row">
             <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-form-item :label="typename" class="row i">
             <el-input type="text" v-model="queryParam.depth" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item  label="企业角色：" class="row">
-            <el-select  placeholder="请选择" v-model="queryParam.companyRole">
-              <el-option v-for="(item,index) in companyrole" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="负责人：" class="row">
             <el-input type="text" v-model="queryParam.responsiblePerson" placeholder="请输入"></el-input>
           </el-form-item>
+          <el-form-item label="联系方式：" class="row">
+            <el-input type="text" v-model="queryParam.phonenumber" placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label="备注说明：" class="row">
+            <el-input type="text" v-model="queryParam.responsiblePerson" placeholder="请输入"></el-input>
+          </el-form-item>
           <div class="popbot">
-            <div class="btn btn_cancel h32" @click="cancel(1)">返回</div>
-            <div class="btn btn_primary h32" @click="addqy">添加</div>
+            <div class="btn btn_cancel h32" @click="cancel()">返回</div>
+            <div class="btn btn_primary h32" v-if="isedit" @click="saveqy">保存</div>
+            <div class="btn btn_primary h32" v-else @click="addqy">添加</div>
           </div>
         </el-form>
       </el-dialog>
@@ -141,7 +159,7 @@
 
 <script>
   import "@/assets/styles/project.scss"
-  import {getXGQY,addXGQY,delXGQY} from '@/api/project/project'
+  import {getXGQY,addXGQY,delXGQY,saveXGQY} from '@/api/project/project'
   import {getDictType,getEnterprise} from '@/api/main'
   import skeleton from './skeleton'
   export default {
@@ -156,26 +174,29 @@
     },
     data(){
       return{
-        types:1,
-        dialogVisible:false,
         hzhbVisible:false,
         textarea:"",
         nowedit:-1,//当前正在编辑的文本
         tipslit:[],//项目标签
         tipsvalue:"",//标签填写内容
         tableData: [],
-        typelist:['对接深度：','合作阶段：','竞争力度：'],
-        typename:"",
+        typename:"对接深度/竞争力度",
         rules:{
+          companyType:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
           companyName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
+          phonenumber: [
+            {
+              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+              message: "请输入正确的手机号码",
+              trigger: "blur"
+            }
+          ]
         },
         companytype:[],
-        companyrole:[],
         queryParam:{
           businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyId:'',
           companyName:'',
-          companyRole:'',
           companyType:'',
           responsiblePerson:'',
           depth:'',
@@ -188,6 +209,7 @@
           companyName:'',
         },
         ondel:-1,
+        isedit:false,
         isDisableds:this.isDisabled,
         showlist:false,
         companData:[],
@@ -198,17 +220,17 @@
       //企业类型
       getDictType('company_type').then(result=>{
         this.companytype = result.code == 200 ? result.data:[]
-        this.types =  this.companytype[0].dictValue
-      })
-      //企业角色
-      getDictType('company_role').then(result=>{
-        this.companyrole = result.code == 200 ? result.data:[]
       })
       this.getlist()
     },
     mounted(){
     },
     methods:{
+      getDetail(row){
+        this.isedit = true
+        this.hzhbVisible = true
+        this.queryParam = JSON.parse(JSON.stringify(row))
+      },
       //获取建设库客户
       getCompany(value){
         this.queryParam.companyId = ''
@@ -254,7 +276,6 @@
       addqy(){
         addXGQY(this.queryParam).then(res=>{
           this.hzhbVisible=false
-          this.dialogVisible=false
           if(res.code == 200){
             this.$message.success('添加成功！')
             this.getlist()
@@ -263,6 +284,17 @@
           }
         })
       },
+      saveqy(){
+        saveXGQY(this.queryParam).then(res=>{
+          this.hzhbVisible=false
+          if(res.code == 200){
+            this.$message.success('修改成功！')
+            this.getlist()
+          }else {
+            this.$message.error(res.msg)
+          }
+        })
+      },
       getlist(){
         this.isSkeleton = true
         getXGQY(this.searchParam).then(result=>{
@@ -275,35 +307,17 @@
         this.searchParam.pageNum = val
         this.getlist()
       },
-      cancel(type){
-        if(type == 0)
-          this.dialogVisible = false
-        else{
-          this.dialogVisible = true
-          this.hzhbVisible =  false
-        }
-      },
-      totype(value){
-        this.types = value
-      },
-      gettype(){
-        this.queryParam.companyType = this.types
-        this.companytype.forEach((item,index)=>{
-          if(item.dictValue == this.types){
-            this.typename = this.typelist[index]
-          }
-        })
-        this.hzhbVisible = true
-        this.dialogVisible = false
+      cancel(){
+        this.hzhbVisible =  false
       },
       //打开新建窗口
       opennew(){
-        this.dialogVisible = true
+        this.isedit = false
+        this.hzhbVisible = true
         this.queryParam={
           businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyId:'',
           companyName:'',
-          companyRole:'',
           companyType:'',
           responsiblePerson:'',
           depth:'',

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

@@ -64,7 +64,7 @@
             </div>
           </div>
           <div class="con i">
-            <span>建设单位 ：</span>
+            <span>业主单位 ：</span>
             <div class="inputxt" id="inputxt3" :style="{width:rig1}">
               <div class="flex" v-if="nowedit == 3 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.constructionUnit"></el-input>
@@ -93,7 +93,7 @@
             </div>
           </div>
           <div class="con i">
-            <span>建设单位负责人 ：</span>
+            <span>业主单位负责人 ：</span>
             <div class="inputxt" id="inputxt5">
               <div class="flex" v-if="nowedit == 5 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.constructionPrincipal"></el-input>
@@ -121,7 +121,7 @@
             </div>
           </div>
           <div class="con i">
-            <span>建设单位联系电话 ：</span>
+            <span>业主单位联系电话 ：</span>
             <div class="inputxt" id="inputxt7">
               <div class="flex" v-if="nowedit == 7 && isDisabled == false">
                 <el-input placeholder="待添加" v-model="xmsldata.constructionPhone"></el-input>

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

@@ -129,7 +129,7 @@
               <span>项目类型：</span>
               <span>{{item.projectType}}</span>
             </div>
-            <div class="det-con" v-if="item.investmentAmount">
+            <div class="det-con" v-if="item.investmentAmount&&item.investmentAmount>0">
               <span>投资估算（万元）：</span>
               <span>{{item.investmentAmount}}</span>
             </div>