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

YL

2021-12-17 928efc9371c839b16d6de724eeb21dd29e4077e6

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

 WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html

@@ -49,21 +49,21 @@
    <script>
        layui.use(['table', 'form', 'layer', 'element'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer
            , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块
                , form = layui.form
                , layer = layui.layer
                , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: 'ID', hide: true }
                , { field: 'HNumber', width: 150, title: '模块代码' }
                , { field: 'HName', width: 150, title: '模块名称', hide: true }
                , { field: '模板名称', width: 150, title: '模板名称' }
              ]]
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HItemID', width: 150, title: 'ID', hide: true }
                    , { field: 'HNumber', width: 150, title: '模块代码' }
                    , { field: 'HName', width: 150, title: '模块名称', hide: true }
                    , { field: '模板名称', width: 150, title: '模板名称' }
                ]]
            });


@@ -124,33 +124,33 @@
                element.tabDelete('tabDemo', '2'); //删除
                element.tabAdd('tabDemo', {
                    title: '新增模板'
                  , content: '<div class="layui-form-item">' +
                      '<div class="layui-row">' +
                      '<div class="layui-col">' +
                      '<label class="layui-form-label"> æ¨¡å—名：</label>' +
                      '<div class="layui-input-inline">' +
                      '<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" readonly="readonly" autocomplete="off">' +
                      '</div>' +
                      '</div>' +
                      '<div class="layui-row">' +
                      '<div class="layui-col">' +
                      '<label class="layui-form-label"> æ¨¡æ¿åç§°ï¼š</label>' +
                      '<div class="layui-input-inline">' +
                      '<input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">' +
                      '</div>' +
                      '</div>' +
                      '</div>' +
                      '<div class="layui-form-item">' +
                      '<div class="layui-row">' +
                      '<div class="layui-col">' +
                      '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Save">保存</button>' +
                      '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Cancel">取消</button>' +
                      '</div>' +
                      '</div>' +
                      '</div>' +
                      '</div>' +
                      '</div>' //支持传入(html代码）不持支直接传入html页面
                  , id: '2' //选项卡标题的lay-id属性值
                    , content: '<div class="layui-form-item">' +
                        '<div class="layui-row">' +
                        '<div class="layui-col">' +
                        '<label class="layui-form-label"> æ¨¡å—名：</label>' +
                        '<div class="layui-input-inline">' +
                        '<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" readonly="readonly" autocomplete="off">' +
                        '</div>' +
                        '</div>' +
                        '<div class="layui-row">' +
                        '<div class="layui-col">' +
                        '<label class="layui-form-label"> æ¨¡æ¿åç§°ï¼š</label>' +
                        '<div class="layui-input-inline">' +
                        '<input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">' +
                        '</div>' +
                        '</div>' +
                        '</div>' +
                        '<div class="layui-form-item">' +
                        '<div class="layui-row">' +
                        '<div class="layui-col">' +
                        '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Save">保存</button>' +
                        '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Cancel">取消</button>' +
                        '</div>' +
                        '</div>' +
                        '</div>' +
                        '</div>' +
                        '</div>' //支持传入(html代码）不持支直接传入html页面
                    , id: '2' //选项卡标题的lay-id属性值
                });
                $("#HNumber").val(Type);
                element.tabChange('tabDemo', '2');
@@ -158,29 +158,29 @@

            form.on('submit(Del)', function (data) {//删除
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                    , data = checkStatus.data;
                var OpenTmp = data[0].HItemID;
                $.ajax(
                {
                    type: "GET",
                    url: GetWEBURL() + "DelOpenTmp", //方法所在页面和方法名
                    async: true,
                    data: { "HItemID": OpenTmp },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            RoadList(Type);
                    {
                        type: "GET",
                        url: GetWEBURL() + "DelOpenTmp", //方法所在页面和方法名
                        async: true,
                        data: { "HItemID": OpenTmp },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                RoadList(Type);
                            }
                            else {
                                layer.msg(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.msg("错误:" + err, { icon: 5 });
                        }
                        else {
                            layer.msg(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.msg("错误:" + err, { icon: 5 });
                    }
                });
                    });
            });
            form.on('submit(Reload)', function (data) {//刷新
                RoadList(Type);
@@ -195,29 +195,29 @@
                    return false;
                }
                $.ajax(
                {
                    type: "GET",
                    url: GetWEBURL() + "SaveOpenTmp", //方法所在页面和方法名
                    async: true,
                    data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            RoadList(Type);
                            element.tabChange('tabDemo', '1');
                            element.tabDelete('tabDemo', '2'); //删除
                    {
                        type: "GET",
                        url: GetWEBURL() + "SaveOpenTmp", //方法所在页面和方法名
                        async: true,
                        data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                RoadList(Type);
                                element.tabChange('tabDemo', '1');
                                element.tabDelete('tabDemo', '2'); //删除

                            }
                            else {
                                layer.msg(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.msg("错误:" + err, { icon: 5 });
                        }
                        else {
                            layer.msg(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.msg("错误:" + err, { icon: 5 });
                    }
                });
                    });
            });
            form.on('submit(Cancel)', function (data) {//取消
                element.tabChange('tabDemo', '1');
@@ -225,7 +225,7 @@
            });
            form.on('submit(Select)', function (data) {//选择
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                    , data = checkStatus.data;
                var OpenTmp = data[0].模板名称;
                if (OpenTmp == '条码') {
                    window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
@@ -233,40 +233,33 @@
                    window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                }
                //打开打印模板
            
                ////根据模块获取WEBAPI链接
                //var url = "";
                //switch (Type)
                //{
                //    case "HBarCodePrint":
                //        url = "UpdateBarcodePrintQty" 
                //        break;
                //    case "HPOInStockBill":
                //        url = "UpdatePOInStockBillPrintQty"
                //        break;
                //}
                ////更新打印数量
                //$.ajax(
                //{
                //    type: "POST",
                //    url: GetWEBURL() + url, //方法所在页面和方法名
                //    async: true,
                //    data: { "msg": MyMsg },
                //    dataType: "json",
                //    success: function (data) {
                //        //if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                //        //    layer.msg(data.Message, { icon: 1 });
                //        //}
                //        //else {
                //        //    layer.msg(data.Message, { icon: 5 });
                //        //}
                //        layer.closeAll("loading");
                //    },
                //    error: function (err) {
                //        parent.f_alert("错误:" + err);
                //    }
                //});
                

                //根据模块获取WEBAPI链接
                var url = "";
                switch (Type) {
                    //case "SRM_POOrderBillList": //条码打印
                    //    url = "UpdateBarcodePrintQty"
                    //    break;
                    case "SRM_POInStockBillList"://送货单打印
                        url = "/UpdatePOInStockBillPrintQty"
                        break;
                }
                //更新打印数量
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { msg: linterid.toString(), CurUserName: sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (result) {
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            parent.f_alert("错误:" + err);
                        }
                    });

                //关闭当前窗口
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
@@ -276,7 +269,7 @@
                parent.layer.close(index); //再执行关闭
            });

            



        });

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

@@ -527,7 +527,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=' + openTmpListType, 'yes']
                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=&Type=' + openTmpListType, 'yes']
                        , resize: false
                        //, cancel: function () {
                        //    $(".layui-btn").removeClass("layui-btn-disabled");

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

@@ -75,10 +75,12 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">关闭状态</label>
                                    <label class="layui-form-label">单据状态</label>
                                    <div class="layui-input-block">
                                        <select id="HClStatus" name="HClStatus" lay-filter="">
                                            <option value="">全部</option>
                                            <option value="审核">审核</option>
                                            <option value="审核">反审核</option>
                                            <option value="未关闭" selected="">未关闭</option>
                                            <option value="已关闭">已关闭</option>
                                        </select>
@@ -128,7 +130,7 @@



</form>
                        </form>
                        <!--</div>-->
                    </div>

@@ -138,8 +140,9 @@
                        <div class="layui-btn-container">
                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><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-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>
@@ -151,8 +154,8 @@

                </div>
            </div>
            </div>
        </div>
    </div>
    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../CreateControl.js"></script>
@@ -214,12 +217,12 @@
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , laydate = layui.laydate
            , table = layui.table
            , form = layui.form
            , element = layui.element;
                , admin = layui.admin
                , layer = layui.layer
                , laydate = layui.laydate
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            //常规用法
            laydate.render({
                elem: '#HDate1'
@@ -240,51 +243,51 @@
                , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
                , defaultToolbar: ['filter', 'exports', 'print']
                // , where: { msg: "", NowPage: 1, OnePage: 10 }
              , cellMinWidth: 100
              , cols: [[
                { checkbox: true, fixed: true }
                
                , { field: 'sorderid', title: '序号', width: 80, fixed: true }
                , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                , { field: 'hsubid', title: 'hsubid', sort: true, fixed: true, hide: true }
                , { field: '状态', title: '状态', width: 100, sort: true, fixed: true }
                , { field: '单据号', title: '单据号', width: 180, sort: true, fixed: true }
                , { field: '送货单号', title: '送货单号', width: 180, sort: true, fixed: true }
                , { field: '物流单号', title: '物流单号', width: 180, sort: true, fixed: true }
                , { field: '物料代码', title: '物料代码', width: 180, sort: true  }
                , { field: '物料名称', title: '物料名称', width: 180, sort: true  }
                , { field: '规格型号', title: '规格型号', width: 180, sort: true  }
                , { field: '计量单位', title: '计量单位', width: 80, sort: true  }
                , { field: '数量', title: '订货数量', width: 100, sort: true }
                , { field: '未生成条码数量', title: '未生成条码数量', width: 100, sort: true }
                , { field: '合格数量', title: '合格数量', width: 100, sort: true  }
                , { field: '不合格数量', title: '不合格数量', width: 100, sort: true }
                , { field: '含税单价', title: '含税单价', width: 100, sort: true }
                , { field: '金额', title: '金额', width: 100, sort: true }
                , { field: '日期', title: '日期', width: 150, sort: true }
                , { field: '批次', title: '批次', width: 150, sort: true }
                , { field: '生产日期', title: '生产日期', width: 150, sort: true }
                , { field: '预计到货日期', title: '预计到货日期', width: 150, sort: true }
                , { field: '源单主内码', title: '源单主ID', width: 100, hide: true }
                , { field: '源单子内码', title: '源单子ID', width: 100, hide: true }
                , { field: '源单单号', title: '源单单号', width: 180 }
                , { field: '源单类型', title: '源单类型', width: 80 }
                , { field: '采购订单号', title: '采购订单号', width: 180, sort: true, hide: true }
                , { field: '委外订单号', title: '委外订单号', width: 180, sort: true, hide: true }
                , { field: '关闭状态', title: '关闭状态', sort: true }
                , { field: '变更状态', title: '变更状态', sort: true }
                , { field: '收料组织', title: '收料组织', sort: true }
                , { field: '采购组织', title: '采购组织', sort: true }
                , { field: '需求组织', title: '需求组织', sort: true }
              ]]
            , page: true //是否显示分页
            , limits: [10, 20, 50, 100]
            , limit: 50 //每页默认显示的数量
                , cellMinWidth: 100
                , cols: [[
                    { checkbox: true, fixed: true }

                    , { field: 'sorderid', title: '序号', width: 80, fixed: true }
                    , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                    , { field: 'hsubid', title: 'hsubid', sort: true, fixed: true, hide: true }
                    , { field: '状态', title: '状态', width: 100, sort: true, fixed: true }
                    , { field: '单据状态', title: '单据状态', sort: true, fixed: true }
                    , { field: '单据号', title: '单据号', width: 180, sort: true, fixed: true }
                    , { field: '送货单号', title: '送货单号', width: 180, sort: true, fixed: true }
                    , { field: '物流单号', title: '物流单号', width: 180, sort: true, fixed: true }
                    , { field: '物料代码', title: '物料代码', width: 180, sort: true }
                    , { field: '物料名称', title: '物料名称', width: 180, sort: true }
                    , { field: '规格型号', title: '规格型号', width: 180, sort: true }
                    , { field: '计量单位', title: '计量单位', width: 80, sort: true }
                    , { field: '数量', title: '订货数量', width: 100, sort: true }
                    , { field: '未生成条码数量', title: '未生成条码数量', width: 100, sort: true }
                    , { field: '合格数量', title: '合格数量', width: 100, sort: true }
                    , { field: '不合格数量', title: '不合格数量', width: 100, sort: true }
                    , { field: '含税单价', title: '含税单价', width: 100, sort: true }
                    , { field: '金额', title: '金额', width: 100, sort: true }
                    , { field: '日期', title: '日期', width: 150, sort: true }
                    , { field: '批次', title: '批次', width: 150, sort: true }
                    , { field: '生产日期', title: '生产日期', width: 150, sort: true }
                    , { field: '预计到货日期', title: '预计到货日期', width: 150, sort: true }
                    , { field: '源单主内码', title: '源单主ID', width: 100, hide: true }
                    , { field: '源单子内码', title: '源单子ID', width: 100, hide: true }
                    , { field: '源单单号', title: '源单单号', width: 180 }
                    , { field: '源单类型', title: '源单类型', width: 80 }
                    , { field: '采购订单号', title: '采购订单号', width: 180, sort: true, hide: true }
                    , { field: '委外订单号', title: '委外订单号', width: 180, sort: true, hide: true }
                    , { field: '变更状态', title: '变更状态', sort: true }
                    , { field: '收料组织', title: '收料组织', sort: true }
                    , { field: '采购组织', title: '采购组织', sort: true }
                    , { field: '需求组织', title: '需求组织', sort: true }
                ]]
                , page: true //是否显示分页
                , limits: [10, 20, 50, 100]
                , limit: 50 //每页默认显示的数量
                //, height: 500
            , done: function (res, curr, count) {
                _cur_page = curr;
                layer.closeAll("loading");
            }
                , done: function (res, curr, count) {
                    _cur_page = curr;
                    layer.closeAll("loading");
                }

            });

@@ -296,21 +299,59 @@
                        var data = checkStatus.data;
                        layer.alert(JSON.stringify(data));
                        break;
                        //case 'getCheckLength':
                        //    var data = checkStatus.data;
                        //    layer.msg('选中了：' + data.length + ' ä¸ª');
                        //    break;
                        //case 'isAll':
                        //    layer.msg(checkStatus.isAll ? '全选' : '未全选');
                        //    break;
                    //case 'getCheckLength':
                    //    var data = checkStatus.data;
                    //    layer.msg('选中了：' + data.length + ' ä¸ª');
                    //    break;
                    //case 'isAll':
                    //    layer.msg(checkStatus.isAll ? '全选' : '未全选');
                    //    break;
                    //审核
                    case 'btn-Audit':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        var InterID = "";
                        if (checkStatus.data.length > 0) {
                            for (var i = 0; i < checkStatus.data.length; i++) {
                                InterID += data[i].hmainid.toString() + ",";
                            }
                            InterID = InterID.substring(0, InterID.length - 1);
                            //逻辑审核方法
                            $.ajax({
                                type: "GET",
                                // var WEBURL = "";    //章紫柔本地配置
                                //url: "http://localhost:8082/LuBaoAPI//AuditPOInStockBill", //方法所在页面和方法名
                                url: GetWEBURL() + "/AuditPOInStockBill",
                                data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                                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);
                                            //修改为功后刷新界面
                                            $("#btnSearch").trigger('click');
                                        });

                        //自定义头工具栏右侧图标 - æç¤º
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                        }
                        else {
                            layer.msg('请选择数据！');
                        }
                    //自定义头工具栏右侧图标 - æç¤º
                    case 'btn-reload':
                        _cur_page = $(".layui-laypage-em").next().html();
                        RoadHBillNo(sql);
                        //    });
                        break;
                   

                    case 'btn-details':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
@@ -344,19 +385,29 @@
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../../src/views/SRM/SRM_POInStockBill.html?linterid=' + linterid +'&type =changebg'
                            , content: '../../../src/views/SRM/SRM_POInStockBill.html?linterid=' + linterid + '&type =changebg'
                            , resize: false
                            , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");
                            }
                        })
                        break;
                        

                    case 'btn-print':
                        var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                            , data = checkStatus.data;
                        if (data.length == 0) {
                            layer.msg("请选择数据", { icon: 5 });
                            return;
                        }
                        for (var i = 0; i < data.length; i++) {
                            if (data[i].单据状态 != "审核") {
                                layer.msg("选中行未审核", { icon: 5 });
                                return;
                            }
                        }
                        layer.open({
                              type: 2
                            type: 2
                            , area: ['50%', '50%']
                            , title: '打印模版选择'
                            , shade: 0.6 //遮罩透明度
@@ -372,30 +423,29 @@
                        break;
                    case 'btn-generate':
                        var checkStatus = table.checkStatus('mainTable')
                       , data = checkStatus.data;
                            , data = checkStatus.data;
                        if (data[0].未生成条码数量 <= 0) {
                            layer.msg("选中行已生成条码！", { icon: 5 });
                        }
                        else
                        {
                        layer.open({
                            type: 2
                             , area: ['100%', '100%']
                             , title: '条码生成'
                             , shade: 0.6 //遮罩透明度
                             , maxmin: false //允许全屏最小化
                             , anim: 0 //0-6的动画形式，-1不开启
                             , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid, 'yes']
                             , resize: false
                             , cancel: function () {
                                 $(".layui-btn").removeClass("layui-btn-disabled");
                             }
                        })
                        else {
                            layer.open({
                                type: 2
                                , area: ['100%', '100%']
                                , title: '条码生成'
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid, 'yes']
                                , resize: false
                                , cancel: function () {
                                    $(".layui-btn").removeClass("layui-btn-disabled");
                                }
                            })
                        }
                        break;
                    case 'btn-exit':
                        //var index = parent.layer.getFrameIndex(window.name);
                        //element.tabDelete('layadmin-layout-tabs', this); 
                        //element.tabDelete('layadmin-layout-tabs', this);
                        parent.layui.admin.events.closeThisTabs();
                        //parent.layer.close(index);
                        break;
@@ -409,7 +459,7 @@
                where = sqlWhere;
                $.ajax({
                    type: "get",
                    url: GetWEBURL()+"/GetPOInStockBill",
                    url: GetWEBURL() + "/GetPOInStockBill",
                    async: true,
                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
                    success: function (result) {
@@ -435,12 +485,10 @@
            form.on('submit(f_Query)', function (data) {//查询
                var sqlWhere = " and 1=1 ";
                if ($("#HStatus").val() != "")
                    if ($("#HStatus").val() == "未生成条码")
                    {
                    if ($("#HStatus").val() == "未生成条码") {
                        sqlWhere += " and æœªç”Ÿæˆæ¡ç æ•°é‡ > 0";
                    }
                    else
                    {
                    else {
                        sqlWhere += " and çŠ¶æ€ like ^^%" + $("#HStatus").val() + "%^^";
                    }

@@ -455,7 +503,7 @@
                if ($("#HModel").val() != "")
                    sqlWhere += " and è§„格型号 like ^^%" + $("#HModel").val() + "%^^";
                if ($("#HClStatus").val() != "")
                    sqlWhere += " and å…³é—­çŠ¶æ€ like ^^%" + $("#HClStatus").val() + "%^^";
                    sqlWhere += " and å•æ®çŠ¶æ€ like ^^%" + $("#HClStatus").val() + "%^^";
                if ($("#HPURCHASEORGID").val() != "")
                    sqlWhere += " and é‡‡è´­ç»„织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                if ($("#HDate1").val() != "") {
@@ -464,7 +512,7 @@
                if ($("#HDate2").val() != "") {
                    sqlWhere += " and æ—¥æœŸ <= ^^" + $("#HDate2").val() + "^^";
                }
         

                sql = sqlWhere;
                //从第一页开始
                _cur_page = 1;
@@ -501,23 +549,23 @@
                //    // AjaxReportRun(Report, "../../views/WarM/xmlK3_POInStockBill.aspx?linterid=" + data[0].hmainid, Report.PrintPreview(true));
                //},
                f_HBarCode: function () {//生成条码
                   // var checkStatus = table.checkStatus('test-table-reload')
                   //, data = checkStatus.data;
                   // layer.open({
                   //     type: 2
                   //      , area: ['100%', '100%']
                   //      , title: '送货单'
                   //      , shade: 0.6 //遮罩透明度
                   //      , maxmin: false //允许全屏最小化
                   //      , anim: 0 //0-6的动画形式，-1不开启
                   //      , content: ['../../views/WarM/Web_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hmainid, 'yes']
                   //     // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
                   //     // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
                   //      , resize: false
                   //      , cancel: function () {
                   //          $(".layui-btn").removeClass("layui-btn-disabled");
                   //      }
                   // })
                    // var checkStatus = table.checkStatus('test-table-reload')
                    //, data = checkStatus.data;
                    // layer.open({
                    //     type: 2
                    //      , area: ['100%', '100%']
                    //      , title: '送货单'
                    //      , shade: 0.6 //遮罩透明度
                    //      , maxmin: false //允许全屏最小化
                    //      , anim: 0 //0-6的动画形式，-1不开启
                    //      , content: ['../../views/WarM/Web_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hmainid, 'yes']
                    //     // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
                    //     // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
                    //      , resize: false
                    //      , cancel: function () {
                    //          $(".layui-btn").removeClass("layui-btn-disabled");
                    //      }
                    // })
                }
            };
            $('.test-table-reload-btn .layui-btn').on('click', function () {

 WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/ÌõÂë.grf

@@ -71,7 +71,7 @@
            End
        End
        Object ColumnContent
            Height=6.00604
            Height=6.19125
            RowsPerPage=1
            Items ColumnContentCell
                Item
@@ -82,10 +82,10 @@
                        Item
                            Type=ShapeBox
                            Name='ShapeBox1'
                            Left=0.211667
                            Left=0.396875
                            Top=0.211667
                            Width=8.59896
                            Height=5.58271
                            Height=5.97958
                        End
                        Item
                            Type=MemoBox
@@ -202,10 +202,10 @@
                        Item
                            Type=MemoBox
                            Name='MemoBox10'
                            Left=4.57729
                            Top=4.20688
                            Width=2.40771
                            Height=0.582083
                            Left=0.608542
                            Top=5.3975
                            Width=2.59292
                            Height=0.608542
                            Object Font
                                Name='宋体'
                                Weight=400
@@ -288,7 +288,7 @@
                            Name='FieldBox6'
                            Left=1.98438
                            Top=4.78896
                            Width=2.80458
                            Width=6.40292
                            Height=0.608542
                            Object Font
                                Name='宋体'
@@ -339,10 +339,10 @@
                        Item
                            Type=FieldBox
                            Name='FieldBox9'
                            Left=6.00604
                            Top=4.20688
                            Width=2.38125
                            Height=0.582083
                            Left=2.19604
                            Top=5.3975
                            Width=2.40771
                            Height=0.608542
                            Object Font
                                Name='宋体'
                                Weight=400

 WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/ËÍ»õµ¥.grf

@@ -91,6 +91,9 @@
                Item
                    Name='数量'
                End
                Item
                    Name='HShortNumber'
                End
            End
        End
        Items Column
@@ -174,9 +177,8 @@
                        Charset=134
                    End
                    WordWrap=T
                    TextAlign=MiddleCenter
                    ShrinkFontToFit=T
                    DataField='物料代码'
                    DataField='HShortNumber'
                End
                Item
                    Column='物料'

 WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html

@@ -134,19 +134,19 @@
                                <dd>
                                    <a>采购订单列表</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_POOrderBillList"><a lay-href="SRM/SRM_POOrderBillList.html">全部采购订单</a></dd>
                                        <dd data-name="SRM_POOrderBillList_UnConfirm"><a lay-href="SRM/SRM_POOrderBillList.html?type=UnConfirm">未确认采购订单</a> </dd>
                                        <dd data-name="SRM_POOrderBillList_ReConfirm"><a lay-href="SRM/SRM_POOrderBillList.html?type=ReConfirm">已确认采购订单</a></dd>
                                        <dd data-name="SRM_POOrderBillList_ReBack"><a lay-href="SRM/SRM_POOrderBillList.html?type=ReBack">已驳回采购订单</a></dd>
                                        <dd data-name="SRM_POOrderBillList"><a lay-href="SRM/SRM_POOrderBillList.html">全部采购订单</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>委外订单列表</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_EntrustOrderBillList"><a lay-href="SRM/SRM_EntrustOrderBillList.html">全部委外订单</a></dd>
                                        <dd data-name="SRM_EntrustOrderBillList_UnConfirm"><a lay-href="SRM/SRM_EntrustOrderBillList.html?type=UnConfirm">未确认委外订单</a></dd>
                                        <dd data-name="SRM_EntrustOrderBillList_ReConfirm"><a lay-href="SRM/SRM_EntrustOrderBillList.html?type=ReConfirm">已确认委外订单</a></dd>
                                        <dd data-name="SRM_EntrustOrderBillList_ReBack"><a lay-href="SRM/SRM_EntrustOrderBillList.html?type=ReBack">已驳回委外订单</a></dd>
                                        <dd data-name="SRM_EntrustOrderBillList"><a lay-href="SRM/SRM_EntrustOrderBillList.html">全部委外订单</a></dd>
                                    </dl>
                                </dd>
                            </dl>
@@ -160,10 +160,10 @@
                                <dd>
                                    <a>条码档案</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_BarCodeBillList"><a lay-href="SRM/SRM_BarCodeBillList.html">全部档案</a></dd>
                                        <dd data-name="SRM_POInStockBillList_UnBarCode"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnBarCode">未生成条码单据</a> </dd>
                                        <dd data-name="SRM_BarCodeBillList_UnPrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=UnPrint">未打印条码档案</a></dd>
                                        <dd data-name="SRM_BarCodeBillList_RePrint"><a lay-href="SRM/SRM_BarCodeBillList.html?type=RePrint">已打印条码档案</a></dd>
                                        <dd data-name="SRM_BarCodeBillList"><a lay-href="SRM/SRM_BarCodeBillList.html">全部档案</a></dd>
                                    </dl>
                                </dd>
                            </dl>
@@ -177,20 +177,20 @@
                                <dd>
                                    <a>要货通知单</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_PODemandPlanBillList"><a lay-href="SRM/SRM_PODemandPlanBillList.html">全部要货通知单</a></dd>
                                        <dd data-name="SRM_PODemandPlanBillList_UnConfirm"><a lay-href="SRM/SRM_PODemandPlanBillList.html?type=UnConfirm">未确认要货通知单</a></dd>
                                        <dd data-name="SRM_PODemandPlanBillList_ReConfirm"><a lay-href="SRM/SRM_PODemandPlanBillList.html?type=ReConfirm">已确认要货通知单</a></dd>
                                        <dd data-name="SRM_PODemandPlanBillList_ReBack"><a lay-href="SRM/SRM_PODemandPlanBillList.html?type=ReBack">已驳回要货通知单</a></dd>
                                        <dd data-name="SRM_PODemandPlanBillList"><a lay-href="SRM/SRM_PODemandPlanBillList.html">全部要货通知单</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>送货单</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_POInStockBillList"><a lay-href="SRM/SRM_POInStockBillList.html">全部送货单</a></dd>
                                        <dd data-name="SRM_PODemandPlanBillList_UnSend"><a lay-href="SRM/SRM_PODemandPlanBillList.html?type=UnSend">未送货单据</a> </dd>
                                        <dd data-name="SRM_POInStockBillList_UnPrint"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnPrint">未打印送货单</a></dd>
                                        <dd data-name="SRM_POInStockBillList_UnArrival"><a lay-href="SRM/SRM_POInStockBillList.html?type=UnArrival">未到货送货单</a></dd>
                                        <dd data-name="SRM_POInStockBillList_ReArrival"><a lay-href="SRM/SRM_POInStockBillList.html?type=ReArrival">已到货送货单</a> </dd>
                                        <dd data-name="SRM_POInStockBillList"><a lay-href="SRM/SRM_POInStockBillList.html">全部送货单</a></dd>
                                    </dl>
                                </dd>
                            </dl>
@@ -204,10 +204,10 @@
                                <dd>
                                    <a>退货单</a>
                                    <dl class="layui-nav-child">
                                        <dd data-name="SRM_POInStockBackBillList"><a lay-href="SRM/SRM_POInStockBackBillList.html">全部退货单</a></dd>
                                        <dd data-name="SRM_POInStockBackBillList_UnConfirm"><a lay-href="SRM/SRM_POInStockBackBillList.html?type=UnConfirm">未确认退货单</a> </dd>
                                        <dd data-name="SRM_POInStockBackBillList_ReConfirm"><a lay-href="SRM/SRM_POInStockBackBillList.html?type=ReConfirm">已确认退货单</a></dd>
                                        <dd data-name="SRM_POInStockBackBillList_ReBack"><a lay-href="SRM/SRM_POInStockBackBillList.html?type=ReBack">已驳回退货单</a></dd>
                                        <dd data-name="SRM_POInStockBackBillList"><a lay-href="SRM/SRM_POInStockBackBillList.html">全部退货单</a></dd>
                                    </dl>
                                </dd>
                            </dl>