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

杨乐

2021-12-28 ed7d972e7d147bff1881a8b83c6ef9b2216e1e11

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

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillEdit.html

@@ -102,7 +102,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">职员</label>
                                            <label class="layui-form-label">主管</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -1059,7 +1059,7 @@
                return Result = false;
            }
            if ($("#HEmpID").val() == '') {
                layer.msg("职员没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                layer.msg("主管没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HPayType").val() == '') {

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

@@ -34,6 +34,7 @@
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" id="set_Calc" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Calc">计算</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                        </div>
                    </div>
@@ -41,7 +42,7 @@
                        <div class="layui-row">

                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">所属组</label>
                                <label class="layui-form-label">所属核算方式组</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HEntryName" id="HEntryName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="HEntryID" id="HEntryID" class="layui-input" value="" style="float:left;width:150px;">
@@ -94,10 +95,10 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">修正平均工资</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HRate" lay-verify="HRate" value="0" id="HRate" >
                                    <input class="layui-input" name="HRate" lay-verify="HRate" value="0" id="HRate">
                                </div>
                            </div>
                           

                        </div>

                    </div>
@@ -174,7 +175,7 @@
                Pub_Close(1);
            })

          

            //选择所属组按钮
            form.on('submit(hparent-BT)', function () {
                get_checkparent();
@@ -183,9 +184,50 @@
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });
            //保存按钮
            form.on('submit(set_Calc)', function (data) {
                set_Calc();
            });

            //#endregion

            function set_Calc() {
                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); //再执行关闭
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            //console.log("Reason" + sMainStr);
                        }
                    });
                }
                else {
                    layer.alert("请输入正确年月！", { icon: 5 });
                    return;
                }
            }

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

@@ -245,7 +287,7 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                //var sMainStr = JSON.stringify(data.field);
              

                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
@@ -258,7 +300,7 @@
                            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); //再执行关闭   
                            parent.layer.close(index); //再执行关闭
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
@@ -274,7 +316,7 @@
            //#endregion


          

            //#region é€‰æ‹©æ‰€å±žç»„方法
            function get_checkparent() {
                layer.open({

 WebTM/views/²É¹º¹ÜÀí/ίÍⶩµ¥/WW_EntrustOrderBillList.html

@@ -264,6 +264,7 @@
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }/*物料代码，物料名称，规格型号，批号，数量，单位，源单单号*/
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '物料编码', title: '物料编码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }

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

@@ -257,6 +257,7 @@
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }/*物料代码，物料名称，规格型号，批号，数量，单位，源单单号*/
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '物料编码', title: '物料编码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html

@@ -204,6 +204,7 @@
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                            }
                       else {
                            layer.msg(data.Message, { icon: 2 });
@@ -286,7 +287,6 @@
        })

        //已上传列表
        var
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'