wtt
2024-12-05 99103484a04dfecceb2b0f37e1d38675e93b8ce1
工艺路线撤回,出站汇报单修改时间功能能
5个文件已修改
182 ■■■■■ 已修改文件
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html
@@ -536,7 +536,7 @@
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , limit: 500
                    , height: 500
                    , height: 'full-250'
                    , loading: false
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -77,6 +77,7 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">多级审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">多级反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">驳回</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_WithdrawCheck_Flow" id="set_WithdrawCheck_Flow">撤回</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -1013,7 +1014,10 @@
            form.on('submit(set_RejectCheck_Flow)', function (data) {
                set_RejectCheck_Flow();
            });
            //撤回
            form.on('submit(set_WithdrawCheck_Flow)', function (data) {
                set_WithdrawCheck_Flow();
            });
            //复制
            form.on('submit(set_Copy)', function (data) {
                set_Copy();
@@ -1987,6 +1991,39 @@
            }
            //#endregion
            //#region æ’¤å›ž
            function set_WithdrawCheck_Flow() {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/WithdrawCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "user": 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
            //#region å¤åˆ¶
            function set_Copy() {
                //制单人
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html
@@ -612,7 +612,7 @@
                            }
                            else if (type == 3) {
                                HModName = "Gy_RoutingBillCheckQuery";
                                optionChecked.data = data1.data.slice(0, 1000);//获取前1000
                                optionChecked.data = data1.data;//获取前1000
                                //设置列表同一个单据只有第一条数据显示主表信息,其它记录只显示子表信息
                                //获取子表列数据
                                var colList = [];
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -210,6 +210,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>多级审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>多级反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>撤回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
@@ -323,6 +324,9 @@
                        break;
                    //驳回
                    case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
                        break;
                    //撤回
                    case 'set_WithdrawCheck_Flow': set_WithdrawCheck_Flow();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
@@ -773,7 +777,7 @@
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HOrgID = "";
@@ -901,14 +905,17 @@
                if (HOrgID) {
                    sWhere += " and HOrgID = ''" + HOrgID + "''";
                }
                if (number==2) {
                    if (HProject!='0') {
                if (number == 2) {
                    if (HProject != '0') {
                        sWhere += " and é¡¹ç›®å· like ''%" + HProject + "%''";
                    }
                }
                sWhere += " and å·¥åºä»£ç  != ''9999'' and HBillSubType<>''SUB''"
                get_DisplayPage(sWhere);
                //判断权限
                if (PermissionJudge() == true) {
                    get_DisplayPage(sWhere);
                }
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
@@ -1787,6 +1794,72 @@
            }
            //#endregion
            //#region æ’¤å›ž
            function set_WithdrawCheck_Flow() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/WithdrawCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "user": 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
            //#region åˆ¤æ–­æƒé™
            function PermissionJudge() {
                var ModRightNameCheck = "";
                if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
                    //从别的页面打开传入Hmaterid值
                    ModRightNameCheck = "Gy_RoutingBill_BasicSelect"
                } else {
                    //不是从别的页面打开
                    ModRightNameCheck = "Gy_RoutingBill_Query"
                }
                var Permission = false;
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    async:false,
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            Permission = true;
                        } else {
                            layer.alert("当前模块没有查询权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                return Permission;
            }
            //#endregion
            //#endregion
            //隐藏列设置
            function get_HideColumn() {
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -214,6 +214,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-EditTime" id="btn-EditTime"><i class="layui-icon layui-icon-edit"></i>修改时间</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
@@ -746,6 +747,9 @@
                        break;
                    //编辑
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //编辑
                    case 'btn-EditTime': set_EditTime();
                        break;
                    //删除
                    case 'btn-Delete': btn_Delete();
@@ -1789,6 +1793,58 @@
                })
            }
            //#endregion
            //修改时间
            function set_EditTime() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    //打开编辑页面
                    layer.open({
                        type: 1,
                        content: '<div class="layui-inline"><input type="text" class="layui-input" id="time"></div>',
                        btn: ['确定', '取消'],
                        success: function () {
                            // åœ¨å¼¹å‡ºå±‚成功显示后,初始化时间控件
                            laydate.render({
                                elem: '#time', // ç»‘定时间控件的元素
                                format: 'yyyy-MM-dd',
                                value: new Date()
                            });
                        },
                        yes: function (index, layero) {
                            // èŽ·å–æ—¶é—´æŽ§ä»¶çš„å€¼
                            var selectedTime = document.getElementById('time').value;
                            // æ‰§è¡Œå…¶ä»–操作,例如验证时间、提交表单等
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "/Cj_StationOutBill/SetBillTime", //方法所在页面和方法名
                                data: { "HInterID": data[0].hmainid, "dateTime": selectedTime, "user": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { icon: 1 });
                                        get_FastQuery(table, option);
                                    } else {
                                        layer.alert(result.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                            // å¦‚果一切正常,可以关闭弹出层
                            layer.close(index);
                        },
                        btn2: function (index, layero) {
                            // å–消按钮的回调,通常只是关闭弹出层
                            layer.close(index);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //重置过滤条件
            function set_ClearQuery() {