wtt
2024-11-18 c6b9a072f354b02b426be80d88f8ef4c3ebd4bf0
钉钉导入异常工时单
4个文件已修改
46 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
WebTM/views/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBill.html
@@ -727,7 +727,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    //, page: true
                    //, limit: 500
                    , limit: 50
                    //, limits: [50, 500, 5000, 50000]
                    , totalRow: true
                    , cellMinWidth: 120
WebTM/views/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBillList.html
@@ -60,6 +60,7 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGetOAData" id="btnGetOAData" style="padding:0 5px">钉钉同步</button>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -472,10 +473,10 @@
                                    }
                                }
                            }
                            table.render(option);
                            ins=table.render(option);
                            
                        } else {
                            table.render(option);
                            ins=table.render(option);
                            
                        }
                        //刷新按钮显示
@@ -836,6 +837,41 @@
            //#endregion
            //#region åŒæ­¥é’‰é’‰æ•°æ®
            form.on('submit(btnGetOAData)', function (data) {
                //清空过滤条件
                get_OAData();
            });
            //重置过滤条件
            function get_OAData() {
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/DD_DataSynchronization/DataSynchronization_DingDing_OA",
                    async: true,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "startTime": $("#HBeginDate").val(), "endTime": $("#HEndDate").val(), "user": HMaker },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.close(ajaxLoad);
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            });
                        } else {
                            layer.close(ajaxLoad);
                            layer.msg(result.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }
            //#endregion
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                //清空过滤条件
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -793,6 +793,7 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                        $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                        $("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
                    }
                });
            }
@@ -1981,6 +1982,7 @@
                $("#hmakers").val(sessionStorage["HUserName"]);
                $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
                //设置hinterid
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",