Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI

YL

2021-12-31 fa4a80926b8fb40b70a1b78fd84c049cb3965acc

Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI

 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;

 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); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭

 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() + "^^";
                }

 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' //主入口模块
            }).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' //主入口模块
        }).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>