*

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

@@ -4,7 +4,7 @@
     <el-card class="box-card noborder">
       <div class="cardtitles">相关企业</div>
       <div class="searchbtns">
-        <el-select class="select"  placeholder="企业类型" clearable v-model="searchParam.companyType" @change="handleCurrentChange(1)">
+        <el-select class="select"  placeholder="企业类型" clearable v-model="searchParam.companyRole" @change="handleCurrentChange(1)">
           <el-option v-for="(item,index) in companytype" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
         <div class="searchInput small">
@@ -73,9 +73,9 @@
             label="备注"
             width="">
             <template slot-scope="scope">
-              <el-tooltip v-if="scope.row.remark" class="item" effect="dark" :content="scope.row.remark" placement="top">
-                <div class="showremark">{{scope.row.remark}}</div>
-              </el-tooltip>
+              <div class="showremark" v-if="scope.row.remark">
+                <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top"><span>{{scope.row.remark}}</span></el-tooltip>
+              </div>
               <div v-else>--</div>
             </template>
           </el-table-column>
@@ -141,8 +141,8 @@
           <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-form-item  label="企业角色：" prop="companyRole" class="row">
+            <el-select  placeholder="请选择" v-model="queryParam.companyRole">
               <el-option v-for="(item,index) in companytype" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
             </el-select>
           </el-form-item>
@@ -183,10 +183,11 @@
 </template>
 
 <script>
-  import "@/assets/styles/project.scss"
-  import {getXGQY,addXGQY,delXGQY,saveXGQY} from '@/api/project/project'
-  import {getDictType,getEnterprise} from '@/api/main'
+  import '@/assets/styles/project.scss'
+  import { addXGQY, delXGQY, getXGQY, saveXGQY } from '@/api/project/project'
+  import { getDictType, getEnterprise } from '@/api/main'
   import skeleton from './skeleton'
+
   export default {
     components:{skeleton},
     name: 'xgqy',
@@ -207,7 +208,7 @@
         tableData: [],
         typename:"对接深度/竞争力度",
         rules:{
-          companyType:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
+          companyRole:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
           companyName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
           phonenumber: [
             {
@@ -222,7 +223,7 @@
           businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyId:'',
           companyName:'',
-          companyType:'',
+          companyRole:'',
           responsiblePerson:'',
           depth:'',
           remark:'',
@@ -231,7 +232,7 @@
           pageSize:20,
           pageNum:1,
           businessId:this.detailId ? this.detailId : this.$route.query.id,
-          companyType:"",
+          companyRole:"",
           companyName:'',
         },
         ondel:-1,
@@ -344,7 +345,7 @@
           businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyId:'',
           companyName:'',
-          companyType:'',
+          companyRole:'',
           responsiblePerson:'',
           depth:'',
           remark:'',