智云SRM-LAYUI(夏宝服务器版本)
YL
2021-12-17 928efc9371c839b16d6de724eeb21dd29e4077e6
Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI
6个文件已修改
163 ■■■■■ 已修改文件
WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/条码.grf 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/送货单.grf 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
@@ -234,38 +234,31 @@
                }
                //打开打印模板
            
                ////根据模块获取WEBAPI链接
                //var url = "";
                //switch (Type)
                //{
                //    case "HBarCodePrint":
                //根据模块获取WEBAPI链接
                var url = "";
                switch (Type) {
                    //case "SRM_POOrderBillList": //条码打印
                //        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);
                //    }
                //});
                    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);
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>
@@ -138,6 +140,7 @@
                        <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-details"><i class="layui-icon layui-icon-form"></i>详情</button>
@@ -248,6 +251,7 @@
                , { 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 }
@@ -271,7 +275,6 @@
                , { 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 }
@@ -303,7 +306,45 @@
                        //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();
@@ -355,6 +396,16 @@
                    case 'btn-print':
                        var checkStatus = table.checkStatus('mainTable')
                        , 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
                            , area: ['50%', '50%']
@@ -376,8 +427,7 @@
                        if (data[0].未生成条码数量 <= 0) {
                            layer.msg("选中行已生成条码!", { icon: 5 });
                        }
                        else
                        {
                        else {
                        layer.open({
                            type: 2
                             , area: ['100%', '100%']
@@ -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() != "") {
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>