caipin 5 éve
szülő
commit
b65a75755d

+ 14 - 0
app/class/hash.js

@@ -25,6 +25,19 @@ var hashStaffDecode=function (id){
     return dec;
 }
 
+var isNumber=function(inputData){
+    if (parseFloat(inputData).toString() == "NaN") {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 废弃
+ * @param inputData
+ * @returns {boolean}
+ */
 var isNotANumber=function(inputData){
     if (isNaN(inputData)) {
         return false;
@@ -59,6 +72,7 @@ exports.hashDecode = hashDecode;
 exports.hashEncode = hashEncode;
 exports.hashStaffDecode = hashStaffDecode;
 exports.isNotANumber = isNotANumber;
+exports.isNumber=isNumber;
 exports.isExistence = isExistence;
 
 

+ 1 - 1
app/controller/cloudBuildEditionAjaxController.js

@@ -37,7 +37,7 @@ var cloudEditionAjaxController={
 		    if(hash.isExistence(detail)) {
 		        res.json({ 'status': 1,'detail':detail });
 		    }else{
-		        res.json({ 'status': 3,'msg':'该号码未注册养护项目' });
+		        res.json({ 'status': 3,'msg':'该号码未注册大司空项目' });
 		    }
 		},
 		

+ 26 - 0
app/models/client.js

@@ -152,6 +152,32 @@ client.getClentListByClientname=async function(clientname,attributes){
     return clientList;
 };
 
+/*
+ * 根据ID合集获得客户信息
+ * */
+client.getClentListByPhone=async function(phone,attributes){
+    if(!hash.isExistence(phone)){
+        return [];
+    }
+//
+    var condition={
+        raw:true,
+        limit:30,
+        where: {
+            telephone: {
+                [Op.like]: '%'+phone+'%'
+            }
+        }};
+        if(hash.isExistence(attributes)){
+            condition.attributes=attributes;
+        };
+        var clientList = await this.findAll(condition);
+        clientList.forEach(function(v,i){
+            clientList[i].cidKey=hash.hashEncode(clientList[i].cid.toString());
+        });
+        return clientList;
+};
+
     return client;
 };
 

+ 8 - 1
app/service/contactsService.js

@@ -11,7 +11,14 @@ var getClentListByClientname = async function (clientname){
         return [];
     }
     clientname=decodeURI(clientname);
-    var list = await models.CLD_client.getClentListByClientname(clientname);
+
+    var list =[];console.log(hash.isNotANumber(clientname));
+    if(hash.isNumber(clientname)){
+        list = await models.CLD_client.getClentListByPhone(clientname);
+    }else{
+        list = await models.CLD_client.getClentListByClientname(clientname);
+    }
+
     return list;
 }
 

+ 3 - 26
views/cloud/build.html

@@ -31,30 +31,7 @@
             <!-- 侧栏主菜单 -->
             <% include cloudMenu.html %>
             <!-- END 侧栏主菜单 -->
-            <!--侧栏底部菜单-->
-            <div class="nav-footer shadow-top">
-                <a href="#" onclick="return false;" data-action="toggle" data-class="nav-function-minify" class="hidden-md-down">
-                    <i class="ni ni-chevron-right"></i>
-                    <i class="ni ni-chevron-right"></i>
-                </a>
-                <ul class="list-table m-auto nav-footer-buttons">
-                    <li>
-                        <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Chat logs">
-                            <i class="fal fa-comments"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Support Chat">
-                            <i class="fal fa-life-ring"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Make a call">
-                            <i class="fal fa-phone"></i>
-                        </a>
-                    </li>
-                </ul>
-            </div>
+
         </aside>
         <!-- END 侧栏主菜单 -->
         <div class="page-content-wrapper">
@@ -373,7 +350,7 @@
                 <div class="sheet-box row m-0">
                     <div class="sheet-left-panel">
                         <div class="sheet-panel-header d-flex justify-content-between mx-4">
-                            <div>
+                            <div style="display: none">
                                 <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="上一条记录" class="mr-2 disabled"><i class="fal fa-angle-up fa-2x"></i></a>
                                 <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="下一条记录"><i class="fal fa-angle-down fa-2x"></i></a>
                             </div>
@@ -484,7 +461,7 @@
                                         <i class="fal fa-search"></i>
                                     </span>
                         </div>
-                        <input type="text" getClentList class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索客户">
+                        <input type="text" getClentList class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索客户,手机号">
                     </div>
                 </div>
             </div>

+ 3 - 26
views/cloud/curing.html

@@ -32,30 +32,7 @@
             <!-- 侧栏主菜单 -->
             <% include cloudMenu.html %>
             <!-- END 侧栏主菜单 -->
-            <!--侧栏底部菜单-->
-            <div class="nav-footer shadow-top">
-                <a href="#" onclick="return false;" data-action="toggle" data-class="nav-function-minify" class="hidden-md-down">
-                    <i class="ni ni-chevron-right"></i>
-                    <i class="ni ni-chevron-right"></i>
-                </a>
-                <ul class="list-table m-auto nav-footer-buttons">
-                    <li>
-                        <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Chat logs">
-                            <i class="fal fa-comments"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Support Chat">
-                            <i class="fal fa-life-ring"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Make a call">
-                            <i class="fal fa-phone"></i>
-                        </a>
-                    </li>
-                </ul>
-            </div>
+
         </aside>
         <!-- END 侧栏主菜单 -->
         <div class="page-content-wrapper">
@@ -374,7 +351,7 @@
                 <div class="sheet-box row m-0">
                     <div class="sheet-left-panel">
                         <div class="sheet-panel-header d-flex justify-content-between mx-4">
-                            <div>
+                            <div style="display: none">
                                 <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="上一条记录" class="mr-2 disabled"><i class="fal fa-angle-up fa-2x"></i></a>
                                 <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="下一条记录"><i class="fal fa-angle-down fa-2x"></i></a>
                             </div>
@@ -485,7 +462,7 @@
                                         <i class="fal fa-search"></i>
                                     </span>
                         </div>
-                        <input type="text" getClentList class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索客户">
+                        <input type="text" getClentList class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索客户,手机号">
                     </div>
                 </div>
             </div>