Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

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

@@ -7,10 +7,10 @@
     <div class="app-container">
       <el-card class="box-card noborder">
         <div class="tables">
-          <div class="empty" v-if="tableData.total==0 && isNew == true">
+          <div class="empty" v-if="tableData.total==0">
             <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 w88" @click="opennew">添加客户</div>
             <div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div>
           </div>
@@ -25,7 +25,7 @@
               <div class="btn btn_primary h32 p10" @click="opennew"><div class="img img1"></div>添加客户</div>
             </div>
           </div>
-          <el-table v-if="isNew != true || tableData.total > 0"
+          <el-table v-if="tableData.total > 0"
             :data="tableData.rows"
             stripe border
             style="width: 100%"
@@ -287,7 +287,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      isNew:true,
+      // isNew:true,
       showlist:false,
     }
   },
@@ -325,7 +325,7 @@ export default {
     //翻页
     handleCurrentChange(val) {
       this.pldr=false
-      this.isNew = false
+      // this.isNew = false
       this.searchParam.pageNum=val
       this.getCustomerList()
     },

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

@@ -19,7 +19,7 @@
               地区团队
               </span>
             <div class="select-popper">
-				   		<span :class="{ color_text:searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length,}">
+				   		<span :class="{ color_text:searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length}">
 				   			项目地区{{searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length? searchParam.provinceId.length +searchParam.cityId.length +searchParam.districtId.length +"项": ""}}
 				   			<i class="el-icon-caret-bottom"></i>
 				   		</span>
@@ -34,7 +34,7 @@
               项目信息
               </span>
               <div class="select-popper">
-                <span class="color_text">
+                <span :class="{color_text:searchParam.projectType.length}">
                   项目类型{{searchParam.projectType.length? searchParam.projectType.length + "项": ""}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
@@ -78,7 +78,7 @@
                 </el-dropdown>
               </div>
               <div class="select-popper">
-                <span class="color_text">
+                <span :class="{color_text:searchParam.projectStage.length}">
                   项目阶段{{searchParam.projectStage.length? searchParam.projectStage.length + "项": ""}}
                   <i class="el-icon-caret-bottom"></i>
                 </span>
@@ -105,8 +105,8 @@
       <div class="tables" v-if="total == 0">
         <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 w88" @click="addNew(true)">新建商机</div>
           <div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div>
         </div>