From fa4a80926b8fb40b70a1b78fd84c049cb3965acc Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 31 十二月 2021 01:08:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/user/login.html                 |  319 ++++++++++++++++++++-------------------
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html  |   55 +++++-
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html |   62 +++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html    |    4 
 4 files changed, 267 insertions(+), 173 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 2dda217..e33d7f8 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -106,15 +106,15 @@
                                     </div>
                                 </div>
                                 <!--<div class="layui-inline">
-        <label class="layui-form-label">鐘舵��</label>
-        <div class="layui-input-block">
-            <select name="HStatus" id="HStatus" lay-filter="">
-                <option value="">鍏ㄩ儴</option>
-                <option value="鏈墦鍗�" selected="">鏈墦鍗�</option>
-                <option value="宸叉墦鍗�">宸叉墦鍗�</option>
-            </select>
-        </div>
-    </div>-->
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="HStatus" id="HStatus" lay-filter="">
+                                            <option value="">鍏ㄩ儴</option>
+                                            <option value="鏈墦鍗�" selected="">鏈墦鍗�</option>
+                                            <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+                                        </select>
+                                    </div>
+                                </div>-->
 
                                 <div class="layui-inline">
                                     <label class="layui-form-label">閲囪喘缁勭粐</label>
@@ -152,6 +152,7 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>-->
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
@@ -329,7 +330,7 @@
                                 // var WEBURL = "";    //绔犵传鏌旀湰鍦伴厤缃�
                                 //url: "http://localhost:8082/LuBaoAPI//AuditPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                                 url: GetWEBURL() + "/AuditPOInStockBill",
-                                data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+                                data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": "" },
                                 success: function (result) {
                                     if (result.count == 1) {
                                         layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -399,7 +400,41 @@
                             }
                         })
                         break;
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var InterID = data[0].hmainid.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                // 寰楀埌frame绱㈠紩
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                            });
 
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }, error: function () {
+                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                    }
+                                });
+                            })
+                        }
+                        else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                        }
+                        break;
                     case 'btn-print':
                         var checkStatus = table.checkStatus('mainTable')
                             , data = checkStatus.data;
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index bcbfb5d..415dc58 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -31,6 +31,8 @@
                             <div class="layui-btn-group">
 
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
 
                             </div>
@@ -118,7 +120,7 @@
                                                 <div class="layui-col-xs3">
                                                     <label class="layui-form-label"> 鐗╂祦鍗曞彿锛�</label>
                                                     <div class="layui-input-block">
-                                                        <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo"  autocomplete="off">
+                                                        <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
                                                     </div>
                                                 </div>
                                                 <div class="layui-col-xs6">
@@ -305,7 +307,7 @@
                     , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
                     , { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
                     , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
-                    , { field: 'HMoney', title: '閲戦', width: 100, hide: true}
+                    , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
                     //, { field: 'HRemark', title: '澶囨敞', width: 100 }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -608,6 +610,62 @@
                         }
                     });
             });
+            form.on('submit(Aduit)', function (data) {//瀹℃牳
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/AuditPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HInterID": "", "CurUserName": sessionStorage["HUserName"], "HBillNo": $("#HBillNo").val() },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                            }
+                            else {
+                                f_alert(data.Message);
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            f_alert("閿欒:" + err);
+                        }
+                    });
+            });
+            form.on('submit(Print)', function (data) {//瀹℃牳
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/GetHinterID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HBillNo": $("#HBillNo").val() },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.open({
+                                    type: 2
+                                    , area: ['50%', '50%']
+                                    , title: '鎵撳嵃妯$増閫夋嫨'
+                                    , shade: 0.6 //閬僵閫忔槑搴�
+                                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                    , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + data.data.toString() + '&MyMsg=' + data.data.toString() + '&Type=SRM_POInStockBillList', 'yes']
+                                    , resize: false
+                                    //, cancel: function () {
+                                    //    $(".layui-btn").removeClass("layui-btn-disabled");
+                                    //}
+                                })
+                            }
+                            else {
+                                f_alert(data.Message);
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            f_alert("閿欒:" + err);
+                        }
+                    });
+            });
             form.on('submit(Exit)', function (data) {//淇濆瓨
                 var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 9e4114d..538db4b 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -634,8 +634,8 @@
                     sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
                 if ($("#HClStatus").val() != "")
                     sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
-                if ($("#HPURCHASEORGID").val() != "")
-                    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+                //if ($("#HPURCHASEORGID").val() != "")
+                //    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                 if ($("#HDate1").val() != "") {
                     sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
                 }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/user/login.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/user/login.html
index 3f30733..94feb99 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/user/login.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/user/login.html
@@ -20,125 +20,157 @@
         .layadmin-user-login-body .layui-form-item .layui-input {
             color: blue;
         }
+
         .layui-btn-danger {
-         width:100%;
+            width: 100%;
         }
     </style>
 </head>
 <body>
-        <div class="page-container">
-                <div class="layui-row">
-                    <div class="layui-col-xs4">&nbsp;</div>
-                    <div class="layui-col-xs4">
-                        <div class="layadmin-user-login-main">
-                            <div class="layadmin-user-login-box layadmin-user-login-header">
-                                <img src="../../img/Logo.png" alt="渚涘簲鍟嗗崗鍚屽钩鍙�" align="middle" />
-                            </div>
-                            <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
-                                <div class="layui-form-item">
+    <div class="page-container">
+        <div class="layui-row">
+            <div class="layui-col-xs4">&nbsp;</div>
+            <div class="layui-col-xs4">
+                <div class="layadmin-user-login-main">
+                    <div class="layadmin-user-login-box layadmin-user-login-header">
+                        <img src="../../img/Logo.png" alt="渚涘簲鍟嗗崗鍚屽钩鍙�" align="middle" />
+                    </div>
+                    <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
+                        <div class="layui-form-item">
 
-                                    <select id="edu" name="edu" lay-verify="required" lay-search class="layui-input">
-                                        <!--<option value="0">鏅轰簯</option>
-                                        <option value="1">璐﹀1</option>
-                                        <option value="2">璐﹀2</option>
-                                        <option value="3">璐﹀3</option>
-                                        <option value="4">璐﹀4</option>
-                                        <option value="5">璐﹀5</option>
-                                        <option value="6">璐﹀6</option>
-                                        <option value="7">璐﹀7</option>
-                                        <option value="8">璐﹀8</option>
-                                        <option value="9">璐﹀9</option>-->
-                                    </select>
-                                </div>
-                               
-                                <div class="layui-form-item">
-                                    <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
-                                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
-                                </div>
-                                <div class="layui-form-item">
-                                    <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
-                                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
-                                    <!--<input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input">-->
-                                </div>
-                                <!--<div class="layui-form-item">
-                                            <label class="layadmin-user-login-icon layui-icon layui-icon-vercode" for="LAY-user-login-vercode"></label>
-                                            <input type="text" name="vercode" id="LAY-user-login-vercode" lay-verify="required" placeholder="鍥惧舰楠岃瘉鐮�" class="vercode">
-                                            <img src="https://www.oschina.net/action/user/captcha" class="layadmin-user-login-codeimg" id="LAY-user-get-vercode">
-                                    </div>-->
-                                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
-                                            <input type="checkbox" name="remember" lay-skin="primary" title="璁颁綇瀵嗙爜">
-                                            <a href="forget.html" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">蹇樿瀵嗙爜锛�</a>
-                                        </div>-->
-                                        <div class="layui-form-item">
-                                            <!--<button class="layui-btn layui-btn-fluid" type="button" lay-submit="" lay-filter="LAY-user-login-submit">鐧�  褰�</button>-->
-                                            <button type="button" lay-submit="" class="layui-btn layui-btn-danger" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
-                                        </div>
-                                    </div>
-                                </div>
+                            <select id="edu" name="edu" lay-verify="required" lay-search class="layui-input">
+                                <!--<option value="0">鏅轰簯</option>
+                                <option value="1">璐﹀1</option>
+                                <option value="2">璐﹀2</option>
+                                <option value="3">璐﹀3</option>
+                                <option value="4">璐﹀4</option>
+                                <option value="5">璐﹀5</option>
+                                <option value="6">璐﹀6</option>
+                                <option value="7">璐﹀7</option>
+                                <option value="8">璐﹀8</option>
+                                <option value="9">璐﹀9</option>-->
+                            </select>
+                        </div>
 
-                            </div>
-                    <div class="layui-col-xs4">&nbsp;</div>
-
+                        <div class="layui-form-item">
+                            <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
+                            <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
+                            <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
+                            <!--<input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input">-->
+                        </div>
+                        <!--<div class="layui-form-item">
+                                    <label class="layadmin-user-login-icon layui-icon layui-icon-vercode" for="LAY-user-login-vercode"></label>
+                                    <input type="text" name="vercode" id="LAY-user-login-vercode" lay-verify="required" placeholder="鍥惧舰楠岃瘉鐮�" class="vercode">
+                                    <img src="https://www.oschina.net/action/user/captcha" class="layadmin-user-login-codeimg" id="LAY-user-get-vercode">
+                            </div>-->
+                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
+                            <input type="checkbox" name="remember" lay-skin="primary" title="璁颁綇瀵嗙爜">
+                            <a href="forget.html" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">蹇樿瀵嗙爜锛�</a>
+                        </div>-->
+                        <div class="layui-form-item">
+                            <!--<button class="layui-btn layui-btn-fluid" type="button" lay-submit="" lay-filter="LAY-user-login-submit">鐧�  褰�</button>-->
+                            <button type="button" lay-submit="" class="layui-btn layui-btn-danger" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
+                        </div>
+                    </div>
                 </div>
-            <div class="layui-trans layadmin-user-login-footer">
-                <p>Ocean makes management become simple.</p>
-                <p>鏅轰簯锛岃绠$悊鍙樺緱绠�鍗曘��</p>
-                <p>漏 2020 <a href="" target="_blank"></a></p>
-            </div>
-        </div>
-        <!--Javascript-->
-        <script src="../../js/jquery.min.js" type="text/javascript"></script>
-        <script src="../../js/supersized.3.2.7.min.js" type="text/javascript"></script>
-        <script src="../../js/supersized-init.js" type="text/javascript"></script>
-        <script src="../../js/jquery-1.9.1.min.js" type="text/javascript"></script>
-        <script src="../../js/jquery.selectlist.js" type="text/javascript"></script>
-        <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
-        <script src="../../../../Scripts/webConfig.js"></script>
 
-        <script type="text/javascript">
-            layui.config({
-                base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-            }).extend({
-                index: 'lib/index' //涓诲叆鍙fā鍧�
-            }).use(['index', 'user'], function () {
-                var $ = layui.$
+            </div>
+            <div class="layui-col-xs4">&nbsp;</div>
+
+        </div>
+        <!--<div class="layui-trans layadmin-user-login-footer">
+            <p>Ocean makes management become simple.</p>
+            <p>鏅轰簯锛岃绠$悊鍙樺緱绠�鍗曘��</p>
+            <p>漏 2020 <a href="" target="_blank"></a></p>
+        </div>-->
+    </div>
+    <!--Javascript-->
+    <script src="../../js/jquery.min.js" type="text/javascript"></script>
+    <script src="../../js/supersized.3.2.7.min.js" type="text/javascript"></script>
+    <script src="../../js/supersized-init.js" type="text/javascript"></script>
+    <script src="../../js/jquery-1.9.1.min.js" type="text/javascript"></script>
+    <script src="../../js/jquery.selectlist.js" type="text/javascript"></script>
+    <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+
+    <script type="text/javascript">
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'user'], function () {
+            var $ = layui.$
                 , setter = layui.setter
                 , admin = layui.admin
                 , form = layui.form
                 , router = layui.router()
                 , search = router.search;
-              
-   
-                //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var Organization = '<option value="0" style="color:red;">缁勭粐</option>';
-                $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "GetOrganizations",
-                    async: false,
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data;
-                            for (var i = 0; i < data.length; i++) {
-                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
-                            }
-                            $("#edu").append(Organization);
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
-                    }
-                })
 
-                //$(".btn").click(function () {
-                //    is_hide();
-                //})
-                //var u = $("input[name=username]");
-                //var p = $("input[name=password]");
-                //$("#submit").live('click', function () {
-                //    if (u.val() == '' || p.val() == '') {
-                //        $("#ts").html("鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶈兘涓虹┖~");
-                //        is_show();
-                //        return false;
-                //    }
+
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            var Organization = '<option value="0" style="color:red;">缁勭粐</option>';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "GetOrganizations",
+                async: false,
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#edu").append(Organization);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+
+            //$(".btn").click(function () {
+            //    is_hide();
+            //})
+            //var u = $("input[name=username]");
+            //var p = $("input[name=password]");
+            //$("#submit").live('click', function () {
+            //    if (u.val() == '' || p.val() == '') {
+            //        $("#ts").html("鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶈兘涓虹┖~");
+            //        is_show();
+            //        return false;
+            //    }
+            //else{
+            //	var reg = /^[0-9A-Za-z]+$/;
+            //	if(!reg.exec(u.val()))
+            //	{
+            //		$("#ts").html("鐢ㄦ埛鍚嶉敊璇�");
+            //		is_show();
+            //		return false;
+            //	}
+            //}
+            //});
+
+            form.on('submit(LAY-user-login-submit)', function (obj) {//鐧诲綍
+                if ($("#edu").val() == 0) {
+                    layer.msg("璇烽�夋嫨缁勭粐锛�");
+                    return;
+                }
+                var user = obj.field;
+                if (user.username == '') {
+                    layer.msg("鐢ㄦ埛鍚嶄笉鑳戒负绌簙", {
+                        icon: 5,
+                        shade: [0.8, '#2F4F4F'] // 閫忔槑搴�  棰滆壊
+                    });
+                    return false;
+                }
+                if (user.password == '') {
+                    layer.msg("瀵嗙爜涓嶈兘涓虹┖~", {
+                        icon: 5,
+                        shade: [0.8, '#2F4F4F'] // 閫忔槑搴�  棰滆壊
+                    });
+                    return false;
+                }
                 //else{
                 //	var reg = /^[0-9A-Za-z]+$/;
                 //	if(!reg.exec(u.val()))
@@ -147,64 +179,33 @@
                 //		is_show();
                 //		return false;
                 //	}
-                //}
-                //});
-
-                form.on('submit(LAY-user-login-submit)', function (obj) {//鐧诲綍
-                    if ($("#edu").val() == 0) {
-                        layer.msg("璇烽�夋嫨缁勭粐锛�");
-                        return;
-                    }
-                    var user = obj.field;
-                    if (user.username == '') {
-                        layer.msg("鐢ㄦ埛鍚嶄笉鑳戒负绌簙", {
-                            icon: 5,
-                            shade: [0.8, '#2F4F4F'] // 閫忔槑搴�  棰滆壊
-                        });
-                        return false;
-                    }
-                    if (user.password == '') {
-                        layer.msg("瀵嗙爜涓嶈兘涓虹┖~", {
-                            icon: 5,
-                            shade: [0.8, '#2F4F4F'] // 閫忔槑搴�  棰滆壊
-                        });
-                        return false;
-                    }
-                    //else{
-                    //	var reg = /^[0-9A-Za-z]+$/;
-                    //	if(!reg.exec(u.val()))
-                    //	{
-                    //		$("#ts").html("鐢ㄦ埛鍚嶉敊璇�");
-                    //		is_show();
-                    //		return false;
-                    //	}
-                    $.ajax({
-                        type: "get",
-                        url: GetWEBURL() + "GetUser",
-                        data: { "UserName": user.username, "PassWord": user.password, "HOrgName": $("#edu").val()},
-                        success: function (result) {
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(result.Message, {icon: 1,});
-                                sessionStorage["HUserName"] = user.username;
-                                sessionStorage["OrganizationID"] = $("#edu").val();
-                                sessionStorage["Organization"] = $("#edu option:selected").text();
-                                window.location.href = '../../views/index.html'
-                            }
-                            else {
-                                // $("#verifycode").click();
-                                layer.msg(result.Message, {icon: 5, });
-                            }
-                            layer.closeAll("loading");
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "GetUser",
+                    data: { "UserName": user.username, "PassWord": user.password, "HOrgName": $("#edu").val() },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(result.Message, { icon: 1, });
+                            sessionStorage["HUserName"] = result.data[0].Czymc;
+                            sessionStorage["OrganizationID"] = $("#edu").val();
+                            sessionStorage["Organization"] = $("#edu option:selected").text();
+                            window.location.href = '../../views/index.html'
                         }
-                    })
+                        else {
+                            // $("#verifycode").click();
+                            layer.msg(result.Message, { icon: 5, });
+                        }
+                        layer.closeAll("loading");
+                    }
                 })
-            });
+            })
+        });
 
-            //window.onload = function () {
-            //    $(".connect p").eq(0).animate({ "left": "0%" }, 600);
-            //    $(".connect p").eq(1).animate({ "left": "0%" }, 400);
-            //}
-        </script>
+                //window.onload = function () {
+                //    $(".connect p").eq(0).animate({ "left": "0%" }, 600);
+                //    $(".connect p").eq(1).animate({ "left": "0%" }, 400);
+                //}
+    </script>
 </body>
 
 

--
Gitblit v1.9.1