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

zzr99

2022-06-29 7ea538657bce243cabec2a5278ff14fbfe23ae1a

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

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_ClassTimePrjGroupEdit.html

@@ -77,14 +77,11 @@
            var OperationType = 1;//操作类型
            var closeType = 2;  //关闭类型
        } else {
            debugger;
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
            var closeType = params[params[3]];  //关闭类型
        }


        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -212,36 +209,20 @@
            //编辑获取表头
            function set_EditForm(linterid) {
                $.ajax({
                    url: GetWEBURL() + "Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
                    url: GetWEBURL() + "Web/GetClassTimePrjGroupBillEdit_Json",
                    type: "GET",
                    data: {
                        "HID": linterid
                        "sWhere": linterid
                    },
                    success: function (result) {

                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_MouldProdInHouseBillList[0];
                            var data = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HInnerBillNo": data.内部单据号
                                , "HWHID": data.HWHID                    //仓库ID
                                , "HWHName": data.仓库                   //仓库名称
                                , "HSecManagerID": data.hsecmanagerid    //验收员ID
                                , "HSecManagerName": data.验收员         //验收员名称
                                , "HKeeperID": data.hkeeperid            //保管员ID
                                , "HKeeperName": data.保管员             //保管员名称
                                , "HDeptID": data.HDeptID                 //部门ID
                                , "HDeptName": data.部门                  //部门名称
                                , "HSourceBillType": data.源单类型        //源单类型
                                , "XDH": ""                               //选单号
                                , "HExplanation": data.摘要              //摘要
                                , "HRemark": data.表头备注                    //备注
                                , "HSupTypeID": data.往来类型                             //选单号
                                , "HSupName": data.往来单位              //摘要
                                , "HSupID": data.HSupID                    //备注
                                "HNumber": data.HNumber
                                , "HName": data.HName
                                , "HDeptID": data.HDeptID
                                , "HDeptName": data.仓库名称
                            });

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -212,7 +212,6 @@
                            table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
@@ -221,9 +220,7 @@
                    }
                }); 
            }

            //#endregion

            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({

 WebTM/views/¹¤×ʹÜÀí/¹¤×ÊÔËËã/Pay_SingleBalBillOperation.html

@@ -125,14 +125,17 @@
            });
            //#endregion

            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            function set_Generate() {
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val();
                var HDeptID = $("#HDeptID").val();
                if (HBeginDate ==""|| HEndDate=="" || HDeptID=="") {
                    layer.msg("请将信息填写完整", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    layer.msg("请选择日期和部门信息", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                $.ajax({
@@ -146,7 +149,6 @@
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
                        }
                        else {

                            f_alert(data.Message);
                            console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                        }

 WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjGroupBillList.html

@@ -40,7 +40,7 @@
                                <div style="padding: 10px;">

                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>修改</button>-->
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>修改</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                </div>

@@ -259,7 +259,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../Baseset/基础资料/Gy_ClassTimePrjGroupEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1']
                        , content: ['../../Baseset/基础资料/Gy_ClassTimePrjGroupEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1']

                        , resize: false,
                        end: function () {

 WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjSubBillEdit.html

@@ -194,39 +194,34 @@
                var HEntryID = $("#HEntryID").val();
                var HYear = $("#HYear").val();
                var HPeriod = $("#HPeriod").val();
                if (HEntryID == 0) {
                    layer.alert("请选择所属核算方式组！", { icon: 5 });
                    return;
                }
                if (0 <= HPeriod <= 12) {
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "Gy_ClassTimePrjSub/Calc", //方法所在页面和方法名
                        async: true,
                        data: { "HEntryID": HEntryID, "HYear": HYear, "HPeriod": HPeriod },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            //layer.msg(data.Message, { icon: 1 });
                            //$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HSumMoney": data.HsumAcount
                                , "HSumWorkTimes": data.HSumCoefficient
                                , "HOldRate": data.HAvgAcount
                            });
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        //layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            //console.log("Reason" + sMainStr);
                        }
                    });
                }
                else {
                    layer.alert("请输入正确年月！", { icon: 5 });
                    return;
                }

            }

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

 WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjSubBillList.html

@@ -232,6 +232,10 @@
                    , title: '核算记录-新增'
                    , shift: 0//弹出动画
                    , content: '../核算方式/Gy_ClassTimePrjSubBillEdit.html?OperationType=1&linterid=&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
                    }
                })
            }
            //#endregion
@@ -251,6 +255,10 @@
                        , title: '核算记录-编辑'
                        , shift: 0//弹出动画
                        , content: '../核算方式/Gy_ClassTimePrjSubBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');