Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-03-20 2f55e014a562ca2625e6ba3e3cc999c7d08c59c1

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -226,10 +226,13 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOInStockBills" id="btn-PushPOInStockBills"><i class="layui-icon layui-icon-delete"></i>多行下推(收料通知单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>行关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseRow" id="set_CancelCloseRow"><i class="layui-icon layui-icon-form"></i>行反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -266,6 +269,7 @@
            var option = [];
            var Name = "MouldProdInHouseCellWidth";
            var HModName = "Cg_POOrderBillList";
        var HBillType = "1102";

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "1102";
@@ -275,7 +279,7 @@

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
                "HFeedback", "HPriority", "HUserID"];
                "HFeedback", "HPriority", "HUserID","币别代码","采购方式代码","结算方式代码","部门代码","主管代码","业务员代码","计量单位代码"];
            //#endregion 

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -290,6 +294,8 @@
            window.HInterID_Choose = 0;

            //#endregion



            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            set_ClearBill();
@@ -319,13 +325,15 @@
                    //刷新
                    case 'get_Refresh': set_Refresh();
                        break;
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill(1);
                   //多行下推(收料通知单)
                    case 'btn-PushPOInStockBills':
                        set_PushPOInStockBills();
                        break;
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_CheckBill(2);
                    //审核
                    case 'set_CheckBill': set_CheckBill(0);
                        break;
                    //反审核
                    case 'set_AbandonCheck': set_CheckBill(1);
                        break;
                    //关闭按钮        ï¼ˆ1:关闭、2:反关闭）
                    case 'btn-Close':
@@ -334,6 +342,12 @@
                    //反关闭按钮
                    case 'btn-DeClose':
                        set_CloseBill(2);
                        break;
                    //行关闭
                    case 'set_CloseRow': set_CloseRow(0);
                        break;
                    //行反关闭
                    case 'set_CancelCloseRow': set_CloseRow(1);
                        break;
                    //作废按钮        ï¼ˆ1:作废、2:反作废）
                    case 'btn-Drop':
@@ -486,6 +500,7 @@
                        , { field: '单据号', title: '单据号', width: 150}
                        , { field: '状态', title: '状态', width: 100, sort: true }
                        , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
                        , { field: '行状态', title: '行状态', width: 125, sort: true }
                        , { field: '供应商', title: '供应商', width: 150 }
                        , { field: '业务员', title: '业务员', width: 100 }
                        //, { field: 'HBillType', title: 'HBillType', hide: true }
@@ -517,7 +532,7 @@
                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
                        , { field: '规格型号', title: '规格型号', width: 100 }
                        //, { field: 'HUnitID', title: 'HUnitID', hide: true }  é‡å¤
                        , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 120 , hide: true }
                        , { field: '计量单位', title: '计量单位', width: 100 }
                        , { field: '批号', title: '批号', width: 100 }
                        , { field: '数量', title: '数量', width: 100, totalRow: true }
@@ -528,21 +543,21 @@
                        , { field: '优先级', title: '优先级', width: 100 }
                        , { field: '交货地点', title: '交货地点', width: 100}
                        , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
                        , { field: '采购方式代码', title: '采购方式代码', width: 120}
                        , { field: '采购方式代码', title: '采购方式代码', width: 120, hide: true }
                        , { field: '采购方式', title: '采购方式', width: 100}
                        , { field: 'HSSID', title: 'HSSID', hide: true }
                        , { field: '结算方式代码', title: '结算方式代码', width: 120}
                        , { field: '结算方式', title: '结算方式', width: 100}
                        , { field: '结算日期', title: '结算日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.结算日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'HCurID', title: 'HCurID', hide: true }
                        , { field: '币别代码', title: '币别代码', width: 100}
                        , { field: '币别代码', title: '币别代码', width: 100, hide: true }
                        , { field: '币别', title: '币别', width: 100}
                        , { field: '汇率', title: '汇率', width: 100}
                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
                        , { field: '部门代码', title: '部门代码', width: 100}
                        , { field: '部门代码', title: '部门代码', width: 100, hide: true }
                        , { field: '部门', title: '部门', width: 100}
                        , { field: 'HManagerID', title: 'HManagerID', hide: true }
                        , { field: '主管代码', title: '主管代码', width: 100}
                        , { field: '主管代码', title: '主管代码', width: 100, hide: true }
                        , { field: '主管', title: '主管', width: 100}
                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
                        , { field: '摘要', title: '摘要', width: 100}
@@ -553,20 +568,23 @@
                        , { field: '金额', title: '金额', width: 100, totalRow: true }
                        , { field: '税率', title: '税率', width: 100}
                        , { field: '税额', title: '税额', width: 100}
                        , { field: '折扣率', title: '折扣率', width: 100}
                        , { field: '价税合计', title: '价税合计', width: 100}
                        , { field: '交货日期', title: '交货日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.交货日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '交货日期', title: '交货日期', width: 120, templet: "<div>{{d.交货日期 ==null ?'':layui.util.toDateString(d.交货日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '计划跟踪号', title: '计划跟踪号', width: 100}
                        , { field: '表体备注', title: '表体备注', width: 100}
                        , { field: '制单人', title: '制单人', width: 100}
                        , { field: '制单日期', title: '制单日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: '审核人', title: '审核人', width: 100}
                        , { field: '审核日期', title: '审核日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核日期', title: '审核日期', width: 120, templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '修改人', title: '修改人', width: 100}
                        , { field: '修改日期', title: '修改日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '修改日期', title: '修改日期', width: 120, templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '关闭人', title: '关闭人', width: 100}
                        , { field: '关闭日期', title: '关闭日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '关闭日期', title: '关闭日期', width: 120, templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '行关闭人', title: '行关闭人', width: 125, sort: true }
                       , { field: '行关闭日期', title: '行关闭日期', width: 200, templet: "<div>{{d.行关闭人 == ''?'':layui.util.toDateString(d.行关闭日期, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: '作废人', title: '作废人', width: 100}
                        , { field: '作废日期', title: '作废日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '作废日期', title: '作废日期', width: 120, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

                ]]
               
@@ -614,7 +632,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -797,7 +815,69 @@
                }
            }

            //#region åå®¡æ ¸/审核数据
           //#region å¤šè¡Œä¸‹æŽ¨ï¼ˆæ”¶æ–™é€šçŸ¥å•ï¼‰
            function set_PushPOInStockBills() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length > 0) {
                    var dataArray = [];
                    var HCusName = data[0].客户;
                    var HEmpName = data[0].业务员;
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
                            , "hsubid": data[i].hsubid
                            , "HBillStatus": data[i].状态
                            , "HSourceBillType": "1102"
                        }
                        dataArray.push(temp);
                        if (data[i].状态 != "已审核") {
                            var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].状态 + "”,不允许下推！";
                            layer.alert(err, { icon: 5 });
                            return;
                        }

                        if (data[i].行状态 == "已关闭") {
                            layer.msg("下推失败!单据号【" + data[i].单据号 + "】下选中的记录中存在已关闭状态的记录!");
                            return;
                        }

                        if (data[i].客户 != HCusName) {
                            layer.msg("下推失败!已经选中的记录中存在不同客户!");
                            return;
                        }
                        if (data[i].业务员 != HEmpName) {
                            layer.msg("下推失败!已经选中的记录中存在不同业务员!");
                            return;
                        }
                    }

                    var datajson = {
                        "data": dataArray
                    };

                    var url = encodeURI('../../采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=0&HSouceBillType=1102&res=' + JSON.stringify(datajson))
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '采购订单-多行下推收料通知单'
                        , shift: 0//弹出动画
                        , content: url
                        , btn: [],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }
            //#endregion


         //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -807,7 +887,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cg_POOrderBill/AuditCg_POOrderBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -832,6 +912,7 @@
                }
            }
            //#endregion
           

            //#region åå…³é—­/关闭数据
            function set_CloseBill(num) {
@@ -865,6 +946,43 @@
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }
            //#endregion

           //#region è¡Œåå…³é—­/行关闭数据
            function set_CloseRow(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var hsubid = data[0].hsubid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cg_POOrderBill/CloseRowCg_POOrderBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "HEntryID": hsubid, "IsAudit": num, "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('请选择一行数据关闭！');
                }
            }
            //#endregion
@@ -1355,6 +1473,8 @@
                    sWhere += " and å®ŒæˆçŠ¶æ€ like '%" + HFinishStatus + "%'";

                }

                sWhere += addSWhereByOpenType();
                //添加查询条件，根据当前登录用户关联职员返回数据
                //sWhere += " and HUserID =" + sessionStorage["Czybm"]
                var index = layer.load(0);
@@ -1795,6 +1915,35 @@

            //#endregion


        //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion
            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];

                var addSWhere = "";

                if (openType == 2) {
                    addSWhere = " and çŠ¶æ€ = '已审核' and è¡ŒçŠ¶æ€ = '' and HOrgID = " + HOrgID;
                }
                return addSWhere;
            }
            //#endregion

            //以上是layui模块
        });