*

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" v-model="searchParam.companyName" placeholder="输入企业名称查询"></el-input>
+              <el-input type="text" clearable v-model="searchParam.companyName" placeholder="输入企业名称查询"></el-input>
               <div class="btn" @click="handleCurrentChange(1)">搜索</div>
             </div>
             <div class="dc">
@@ -120,7 +120,10 @@
               prop="isMajor"
               label="局级大客户" width="88">
               <template slot-scope="scope">
+                <span v-if="scope.row.isMajor">
                 {{scope.row.isMajor == 1?"是":"否"}}
+                </span>
+                <span v-else>--</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -219,7 +222,7 @@
               <el-input type="text" placeholder="请输入" v-model="queryParam.creditCode"></el-input>
             </el-form-item>
             <div class="popbot">
-              <div class="wordprimary">前往城投平台寻找客户线索></div>
+              <div class="wordprimary" @click="toct">前往城投平台寻找客户线索></div>
               <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
               <div class="btn btn_primary h32" @click="submitForm('ruleForm')">添加</div>
             </div>
@@ -297,6 +300,9 @@ export default {
     this.prvinceTree()
   },
   methods:{
+    toct(){
+      this.$router.push({path:'/macro/urban'})
+    },
     getDictType(){
       //获取客户等级
       getDictType('customer_level_type').then(result=>{
@@ -543,4 +549,7 @@ export default {
       padding-right: 26px;
     }
   }
+  .app-container{
+    height: auto;
+  }
 </style>

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

@@ -44,7 +44,7 @@
         </el-select>
       </el-form-item>
       <div class="popbot">
-        <div class="wordprimary">前往商机雷达寻找项目线索></div>
+        <div class="wordprimary" @click="toradar">前往商机雷达寻找项目线索></div>
         <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
         <div class="btn btn_primary h32" @click="submitForm('ruleForm')">新建商机</div>
       </div>
@@ -109,6 +109,9 @@
       })
     },
     methods:{
+      toradar(){
+        this.$router.push({path:'/radar'})
+      },
       handleALL(event){
         var one = document.getElementById("box");
         if(one){

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

@@ -42,7 +42,8 @@
         <div class="p3">
           <img src="@/assets/images/project/success.png">查询成功
         </div>
-        <div class="p2">导入成功，已为您去掉重复{{titletext}}{{successCount}}条</div>
+        <!--<div class="p2">导入成功，已为您去掉重复{{titletext}}{{successCount}}条</div>-->
+        <div class="p2">{{messages}}</div>
         <div class="btns">
           <div class="btn btn_primary h32" @click="getmsg">查看</div>
         </div>
@@ -74,6 +75,7 @@
         downloadhref:'',//样例地址
         titletext:'',
         successCount:0,//成功条数
+        messages:'',
       }
     },
     created(){
@@ -120,6 +122,7 @@
       onSuccess(res, file, fileList) {
         if (res.code == 200) {
           this.successCount = res.successCount
+          this.messages = res.msg
           this.addsuccess = true
         }else {
           this.importCancel()

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

@@ -57,6 +57,9 @@
             prop="accendant"
             label="内部维护人"
             width="146">
+            <template slot-scope="scope">
+              {{scope.row.accendant || '--'}}
+            </template>
           </el-table-column>
         </el-table>
         <div class="bottems">

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

@@ -368,7 +368,7 @@ export default {
       this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:tag} });
     },
     handleClick(){
-
+      this.getList(1)
     },
     handleChange(value) {
       // console.log(value);