zymesSrmLayUi.git

parent: 44a18f30 | 补丁 | 提交 | ignore whitespace

王垚

2022-12-01 abe0836db24952b36585aba4021050debc45f804

代码上传

6个文件已修改

	WebSRM/Default.aspx.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/Web.config	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/WebSRM.csproj.user	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebSRM/Default.aspx.cs

@@ -11,7 +11,7 @@
    {
        protected void Page_Load(object sender, EventArgs e)
        {

            
        }
    }
}

 WebSRM/Web.config

@@ -70,7 +70,13 @@
    </staticContent>
        <defaultDocument>
            <files>
                <add value="/login.html" />
                <remove value="Default.asp" />
                <remove value="index.htm" />
                <remove value="index.html" />
                <remove value="iisstart.htm" />
                <remove value="default.aspx" />
                <remove value="Default.htm" />
                <add value="login.html" />
            </files>
        </defaultDocument>
  </system.webServer>

 WebSRM/WebSRM.csproj.user

@@ -16,9 +16,8 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <StartPageUrl>login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>

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

@@ -11,7 +11,7 @@
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
  

</head>
<body>
    <div id="layout1" class="layui-fluid">
@@ -220,8 +220,6 @@
            type: "GET",
            data: { "sMsg": linterid },
            success: function (d) {
                console.log(d.data);
                //$("#HDate").val(d.)
                $("#HInterID").val(d.data[0].HInterID);
                $("#HBillNo").val(d.data[0].HBillNo);
                $("#HRemark").val(d.data[0].HRemark);
@@ -257,8 +255,6 @@
                //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                console.log(sMainStr)
                console.log(sSubStr)
                var sMainSub = sMainStr + ';' + sSubStr;
                layer.load(3)
                $.ajax(
@@ -327,8 +323,6 @@
                //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                console.log(sMainStr)
                console.log(sSubStr)
                var sMainSub = sMainStr + ';' + sSubStr;
                layer.load(3)
                $.ajax(
@@ -411,7 +405,7 @@
                                layer.msg(data.Message, { icon: 1 });
                                element.tabDelete('tabDemo', '2'); //删除
                                element.tabDelete('tabDemo', '3'); //删除
                                

                                element.tabAdd('tabDemo', {
                                    title: '外箱条码'
                                    , content: '<table class="layui-hide" id="subTable" lay-filter="subTable"></table>' //支持传入(html代码）不持支直接传入html页面
@@ -442,13 +436,11 @@
                                        , { field: 'HKFDQDate', title: '到期日期', width: 100 }

                                    ]]
                                    // , data: [linterid]
                                    //  , page: true
                                    , done: function () {
                                        layer.closeAll("loading");
                                    }
                                });
                                

                                element.tabAdd('tabDemo', {
                                    title: '内箱条码'
                                    , content: '<table class="layui-hide" id="subTable2" lay-filter="subTable2"></table>' //支持传入(html代码）不持支直接传入html页面
@@ -499,7 +491,6 @@
                    });
                return false;
            });

            form.on('submit(Print)', function (data) {//打印
                var data1 = layui.table.cache["subTable"]
                    , data2 = layui.table.cache["subTable2"];
@@ -543,7 +534,6 @@
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
            });

            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {
@@ -555,7 +545,6 @@
                }
            });
            layer.load(3)

            table.render({
                elem: '#mainTable'
                , url: GetWEBURL() + subUrl
@@ -565,13 +554,16 @@
                , cols: [[
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: '物料编码', width: 120 }
                    , { field: 'HMaterShortNumber', title: '物料代码', width: 120 }
                    , { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号', width: 120 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HDDQty', title: '订单数量', width: 100 }
                    , { field: 'HBarcodeCount', title: '已生成条码数量', width: 135 }
                    , { field: 'HNotBarcodeCount', title: '未生成条码数量', width: 135 }
                    , { field: 'HQty', title: '本次生成条码数量', width: 135, edit: 'text' }
                    , { field: 'HMinQty', title: '内箱包装数', width: 100, edit: 'text' }
                    , { field: 'HBQty', title: '内箱数', width: 100 }
                    , { field: 'HWXQty', title: '外箱包装数', width: 100, edit: 'text' }
@@ -602,7 +594,6 @@

                ]]
                , done: function (res, curr, count) {
                    console.log(res);
                    layer.closeAll("loading");
                }
            });

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

@@ -304,20 +304,6 @@
                    }
                });
            }




            //监听提交
            //form.verify({
            //    numberOrEmpty: function (value, item) {
            //        // if (value != '') {
            //        if (!/^\d+$/.test(value)) {
            //            return '不能为空或数字或者0';
            //        }
            //        //}
            //    }
            //});
            layer.load(3)
            table.render({
                elem: '#mainTable'
@@ -491,46 +477,6 @@
                //  }
                //});
            }
            //function form2json() {
            //    var jsonuserinfo = jQuery('#form1').serializeObject();
            //    return JSON.stringify(jsonuserinfo).replace(/(")/g, "\\\"");
            //}
            //jQuery.fn.serializeObject = function () {
            //    var o = {};
            //    var a = this.serializeArray();
            //    jQuery.each(a, function () {
            //        if (o[this.name]) {
            //            if (!o[this.name].push) {
            //                o[this.name] = [o[this.name]];
            //            }
            //            o[this.name].push(this.value || '');
            //        } else {
            //            o[this.name] = this.value || '';
            //        }
            //    });
            //    return o;
            //};
            //form.on('submit(Saver)', function (data) {//保存
            //    debugger;
            //    var ajaxData = data.field;

            //    return JSON.stringify(ajaxData).replace(/(")/g, "\\\"");
            //   // return false;
            //});

            //function f_SaveBefore() {
            //    //保存前处理(字段格式：int类型不能为空，日期类型符合格式，bool类型)
            //    if ($("#HInterID").val() == '') {
            //        $("#HInterID").val('0');
            //    }
            //    //明细网格不能为空

            //    return 'Y'
            //}
            //$('.test-table-reload-btn .layui-btn').on('click', function () {
            //    var type = $(this).data('type');
            //    active[type] ? active[type].call(this) : '';
            //});
        });
    </script>
</body>

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

@@ -150,7 +150,7 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>汇报</button>
                            <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-barcode"><i class="layui-icon layui-icon-file"></i>生成条码</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></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>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>隐藏列设置</button>
@@ -294,16 +294,6 @@

                    }
                };
                ////设置列宽
                //var colWidth = getColumnsWidth();
                //if (colWidth == "" || colWidth == []) {

                //}
                //else {
                //    $.each(columns, function (x, m) {
                //        m["width"] = colWidth[x];
                //    });
                //}
            }
            //隐藏列设置
            function get_HideColumn() {
@@ -680,19 +670,18 @@
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
                                , resize: false
                                //, cancel: function () {
                                //    $(".layui-btn").removeClass("layui-btn-disabled");
                                //}
                                ,end: function () {
                                    get_FastQuery(table, option)
                                }
                            })
                        }
                        break;

                    case 'btn-barcode':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        //if (data[0].未生成条码数量 <= 0) {
                        //    layer.msg("选中行已生成条码！", { icon: 5 });
                        //}
                        if (data.length == 0) {
                            return layer.msg('请选择数据')
                        }
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']

			@@ -11,7 +11,7 @@
			{
			protected void Page_Load(object sender, EventArgs e)
			{


			}
			}
			}

			@@ -70,7 +70,13 @@
			</staticContent>
			<defaultDocument>
			<files>
			<add value="/login.html" />
			<remove value="Default.asp" />
			<remove value="index.htm" />
			<remove value="index.html" />
			<remove value="iisstart.htm" />
			<remove value="default.aspx" />
			<remove value="Default.htm" />
			<add value="login.html" />
			</files>
			</defaultDocument>
			</system.webServer>

			@@ -16,9 +16,8 @@
			<VisualStudio>
			<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
			<WebProjectProperties>
			<StartPageUrl>
			</StartPageUrl>
			<StartAction>CurrentPage</StartAction>
			<StartPageUrl>login.html</StartPageUrl>
			<StartAction>SpecificPage</StartAction>
			<AspNetDebugging>True</AspNetDebugging>
			<SilverlightDebugging>False</SilverlightDebugging>
			<NativeDebugging>False</NativeDebugging>

			@@ -11,7 +11,7 @@
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">


			</head>
			<body>
			<div id="layout1" class="layui-fluid">
			@@ -220,8 +220,6 @@
			type: "GET",
			data: { "sMsg": linterid },
			success: function (d) {
			console.log(d.data);
			//$("#HDate").val(d.)
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HRemark").val(d.data[0].HRemark);
			@@ -257,8 +255,6 @@
			//debugger;
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			console.log(sMainStr)
			console.log(sSubStr)
			var sMainSub = sMainStr + ';' + sSubStr;
			layer.load(3)
			$.ajax(
			@@ -327,8 +323,6 @@
			//debugger;
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			console.log(sMainStr)
			console.log(sSubStr)
			var sMainSub = sMainStr + ';' + sSubStr;
			layer.load(3)
			$.ajax(
			@@ -411,7 +405,7 @@
			layer.msg(data.Message, { icon: 1 });
			element.tabDelete('tabDemo', '2'); //删除
			element.tabDelete('tabDemo', '3'); //删除


			element.tabAdd('tabDemo', {
			title: '外箱条码'
			, content: '<table class="layui-hide" id="subTable" lay-filter="subTable"></table>' //支持传入(html代码）不持支直接传入html页面
			@@ -442,13 +436,11 @@
			, { field: 'HKFDQDate', title: '到期日期', width: 100 }

			]]
			// , data: [linterid]
			// , page: true
			, done: function () {
			layer.closeAll("loading");
			}
			});


			element.tabAdd('tabDemo', {
			title: '内箱条码'
			, content: '<table class="layui-hide" id="subTable2" lay-filter="subTable2"></table>' //支持传入(html代码）不持支直接传入html页面
			@@ -499,7 +491,6 @@
			});
			return false;
			});

			form.on('submit(Print)', function (data) {//打印
			var data1 = layui.table.cache["subTable"]
			, data2 = layui.table.cache["subTable2"];
			@@ -543,7 +534,6 @@
			var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
			parent.layer.close(index); //再执行关闭
			});

			//监听提交
			form.verify({
			numberOrEmpty: function (value, item) {
			@@ -555,7 +545,6 @@
			}
			});
			layer.load(3)

			table.render({
			elem: '#mainTable'
			, url: GetWEBURL() + subUrl
			@@ -565,13 +554,16 @@
			, cols: [[
			, { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
			, { field: 'HMaterNumber', title: '物料编码', width: 120 }
			, { field: 'HMaterShortNumber', title: '物料代码', width: 120 }
			, { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
			, { field: 'HMaterName', title: '物料名称', width: 120 }
			, { field: 'HMaterModel', title: '规格型号', width: 120 }
			, { field: 'HUnitName', title: '计量单位', width: 100 }
			, { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
			, { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
			, { field: 'HQty', title: '数量', width: 100 }
			, { field: 'HDDQty', title: '订单数量', width: 100 }
			, { field: 'HBarcodeCount', title: '已生成条码数量', width: 135 }
			, { field: 'HNotBarcodeCount', title: '未生成条码数量', width: 135 }
			, { field: 'HQty', title: '本次生成条码数量', width: 135, edit: 'text' }
			, { field: 'HMinQty', title: '内箱包装数', width: 100, edit: 'text' }
			, { field: 'HBQty', title: '内箱数', width: 100 }
			, { field: 'HWXQty', title: '外箱包装数', width: 100, edit: 'text' }
			@@ -602,7 +594,6 @@

			]]
			, done: function (res, curr, count) {
			console.log(res);
			layer.closeAll("loading");
			}
			});

			@@ -304,20 +304,6 @@
			}
			});
			}




			//监听提交
			//form.verify({
			// numberOrEmpty: function (value, item) {
			// // if (value != '') {
			// if (!/^\d+$/.test(value)) {
			// return '不能为空或数字或者0';
			// }
			// //}
			// }
			//});
			layer.load(3)
			table.render({
			elem: '#mainTable'
			@@ -491,46 +477,6 @@
			// }
			//});
			}
			//function form2json() {
			// var jsonuserinfo = jQuery('#form1').serializeObject();
			// return JSON.stringify(jsonuserinfo).replace(/(")/g, "\\\"");
			//}
			//jQuery.fn.serializeObject = function () {
			// var o = {};
			// var a = this.serializeArray();
			// jQuery.each(a, function () {
			// if (o[this.name]) {
			// if (!o[this.name].push) {
			// o[this.name] = [o[this.name]];
			// }
			// o[this.name].push(this.value \|\| '');
			// } else {
			// o[this.name] = this.value \|\| '';
			// }
			// });
			// return o;
			//};
			//form.on('submit(Saver)', function (data) {//保存
			// debugger;
			// var ajaxData = data.field;

			// return JSON.stringify(ajaxData).replace(/(")/g, "\\\"");
			// // return false;
			//});

			//function f_SaveBefore() {
			// //保存前处理(字段格式：int类型不能为空，日期类型符合格式，bool类型)
			// if ($("#HInterID").val() == '') {
			// $("#HInterID").val('0');
			// }
			// //明细网格不能为空

			// return 'Y'
			//}
			//$('.test-table-reload-btn .layui-btn').on('click', function () {
			// var type = $(this).data('type');
			// active[type] ? active[type].call(this) : '';
			//});
			});
			</script>
			</body>

			@@ -150,7 +150,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>汇报</button>
			<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-barcode"><i class="layui-icon layui-icon-file"></i>生成条码</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></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>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>隐藏列设置</button>
			@@ -294,16 +294,6 @@

			}
			};
			////设置列宽
			//var colWidth = getColumnsWidth();
			//if (colWidth == "" \|\| colWidth == []) {

			//}
			//else {
			// $.each(columns, function (x, m) {
			// m["width"] = colWidth[x];
			// });
			//}
			}
			//隐藏列设置
			function get_HideColumn() {
			@@ -680,19 +670,18 @@
			, anim: 0 //0-6的动画形式，-1不开启
			, content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
			, resize: false
			//, cancel: function () {
			// $(".layui-btn").removeClass("layui-btn-disabled");
			//}
			,end: function () {
			get_FastQuery(table, option)
			}
			})
			}
			break;

			case 'btn-barcode':
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			//if (data[0].未生成条码数量 <= 0) {
			// layer.msg("选中行已生成条码！", { icon: 5 });
			//}
			if (data.length == 0) {
			return layer.msg('请选择数据')
			}
			layer.open({
			type: 2
			, area: ['100%', '100%']