SRM-LAYUI.git - Gitblit

parent: 0db418ad | 补丁 | 提交 | show whitespace

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

2021-12-31 fa4a80926b8fb40b70a1b78fd84c049cb3965acc

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

4个文件已修改

	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/user/login.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html

@@ -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>
@@ -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,6 +20,7 @@
        .layadmin-user-login-body .layui-form-item .layui-input {
            color: blue;
        }

        .layui-btn-danger {
         width:100%;
        }
@@ -80,11 +81,11 @@
                    <div class="layui-col-xs4">&nbsp;</div>

                </div>
            <div class="layui-trans layadmin-user-login-footer">
        <!--<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>-->
        </div>
        <!--Javascript-->
        <script src="../../js/jquery.min.js" type="text/javascript"></script>
@@ -185,7 +186,7 @@
                        success: function (result) {
                            if (result.count == 1) { // 说明验证成功了，
                                layer.msg(result.Message, {icon: 1,});
                                sessionStorage["HUserName"] = user.username;
                            sessionStorage["HUserName"] = result.data[0].Czymc;
                                sessionStorage["OrganizationID"] = $("#edu").val();
                                sessionStorage["Organization"] = $("#edu option:selected").text();
                                window.location.href = '../../views/index.html'

			@@ -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;

			@@ -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>
			@@ -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); //再执行关闭

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

			@@ -20,6 +20,7 @@
			.layadmin-user-login-body .layui-form-item .layui-input {
			color: blue;
			}

			.layui-btn-danger {
			width:100%;
			}
			@@ -80,11 +81,11 @@
			<div class="layui-col-xs4"> </div>

			</div>
			<div class="layui-trans layadmin-user-login-footer">
			<!--<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>-->
			</div>
			<!--Javascript-->
			<script src="../../js/jquery.min.js" type="text/javascript"></script>
			@@ -185,7 +186,7 @@
			success: function (result) {
			if (result.count == 1) { // 说明验证成功了，
			layer.msg(result.Message, {icon: 1,});
			sessionStorage["HUserName"] = user.username;
			sessionStorage["HUserName"] = result.data[0].Czymc;
			sessionStorage["OrganizationID"] = $("#edu").val();
			sessionStorage["Organization"] = $("#edu option:selected").text();
			window.location.href = '../../views/index.html'