From ba1068ace2141a07c3b8af169a93012b29d2ea4a Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 09:45:46 +0800
Subject: [PATCH] 1

---
 WebTM/views/PublicPage/CustomerInformation.html |  119 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/WebTM/views/PublicPage/CustomerInformation.html b/WebTM/views/PublicPage/CustomerInformation.html
index 5f7ef60..3f15f91 100644
--- a/WebTM/views/PublicPage/CustomerInformation.html
+++ b/WebTM/views/PublicPage/CustomerInformation.html
@@ -30,10 +30,10 @@
                             <div class="layui-colla-item">
                                 <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
                                     <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
                                             <div id="treeCustomer" lay-filter="treeCustomer" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                         </div>
-                                        <div class="layui-col-xs9 layui-inline">
+                                        <div class="layui-col-xs12 layui-inline">
                                             <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">浠g爜</label>
@@ -87,53 +87,54 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = "";
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
-            tree.render({
-                elem: '#treeCustomer',
-                data: getData(sWhere),
-                showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-                id: 'demoId',
-                isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
-                showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
-                onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
-                click: function (obj) {
-                    //鐐瑰嚮楂樺厜
-                    if (obj.data.id !== treeCkData.id) {
-                        $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
-                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-                        treeCkData = obj.data;
-                        TagId = obj.data.id;
-                        TagParentId = obj.data.ParentID;
-                    }
-                    else {
-                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-                        treeCkData = { id: 0 };
-                        TagId = "";
-                        TagParentId = "";
-                    }
+            //tree.render({
+            //    elem: '#treeCustomer',
+            //    data: getData(sWhere),
+            //    showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+            //    id: 'demoId',
+            //    isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+            //    showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+            //    onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+            //    click: function (obj) {
+            //        //鐐瑰嚮楂樺厜
+            //        if (obj.data.id !== treeCkData.id) {
+            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = obj.data;
+            //            TagId = obj.data.id;
+            //            TagParentId = obj.data.ParentID;
+            //        }
+            //        else {
+            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+            //            treeCkData = { id: 0 };
+            //            TagId = "";
+            //            TagParentId = "";
+            //        }
 
 
-                    $.ajax({
-                        url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerCX',
-                        type: "GET",
-                        data: { "HInterID": obj.data.id },
-                        success: function (data1) {
-                            if (data1.count == 1) {
-                                option.data = data1.data;
-                                table.render(option);
-                                layer.close(index);
-                            } else {
-                                layer.close(index);
-                                layer.alert(data1.code + data1.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.close(index);
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-            });
+            //        $.ajax({
+            //            url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerCX',
+            //            type: "GET",
+            //            data: { "HInterID": obj.data.id },
+            //            success: function (data1) {
+            //                if (data1.count == 1) {
+            //                    option.data = data1.data;
+            //                    table.render(option);
+            //                    layer.close(index);
+            //                } else {
+            //                    layer.close(index);
+            //                    layer.alert(data1.code + data1.Message, { icon: 5 });
+            //                }
+            //            }, error: function () {
+            //                layer.close(index);
+            //                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //            }
+            //        });
+            //    }
+            //});
 
 
             var option = {
@@ -153,10 +154,11 @@
 
             var index = layer.load(0, { shade: false });
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+
             $.ajax({
                 url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -175,18 +177,10 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -199,7 +193,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
             //浠ヤ笂鏄痩ayui妯″潡
@@ -243,6 +237,17 @@
             return treeData;
         }
 
+        function SeachFilter(sWhere1) {
+            var HNumber = $("#HNumber").val();
+            var HName = $("#HName").val();
+            if (HNumber) {
+                sWhere1 += " and HNumber like '%" + HNumber + "%'";
+            }
+            if (HName) {
+                sWhere1 += " and HName like '%" + HName + "%'";
+            }
+            return sWhere1;
+        }
 
     </script>
 

--
Gitblit v1.9.1