王 垚
2022-11-21 7ba5a10a2d9533007b3b7fc181f8533d6d22ca27
工作日设置
2个文件已修改
205 ■■■■■ 已修改文件
WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_WorkDay.html 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Add_Edit_Gy_WorkDay.html
@@ -43,54 +43,54 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">日期</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                    <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">上班时间</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">下班时间:</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                </div>
                            </div>
                        </div>
                        <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="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                    </button>
                                    <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
                                </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="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
                                    <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">午休开始</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
                                </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 class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                    <input class="layui-input" name="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">晚休开始</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">晚休结束:</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
                                </div>
                            </div>
                        </div>
                    </div>
                    <input id="HItemID" name="HItemID" type="hidden" value="0" />
                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
                </form>
            </div>
        </div>
@@ -111,7 +111,8 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , laydate = layui.laydate;
            var sWhere = "";
            var date = new Date();
            var day = date.getDate();
@@ -120,10 +121,37 @@
            var shijian = year + "-" + month + "-" + day;
            //#endregion
            laydate.render({
                elem: '#HDate'
                //, type:'year'
            });
            laydate.render({
                elem: '#HWorkBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HWorkEnd'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNoonbreakBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNoonbreakEnd'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNightbreakBegin'
                , type: 'time'
            });
            laydate.render({
                elem: '#HNightbreakEnd'
                , type: 'time'
            });
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
            $('#HDate').val(Format(new Date(), "yyyy-MM-dd"))
            //判断是否登录 æœªç™»å½•则跳到登录页
            get_LoginIs();
@@ -201,7 +229,7 @@
                //查询检验方案单是否存在
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Gy_PackType/cx",
                    url: GetWEBURL() + "Gy_WorkDay/cx",
                    type: "GET",
                    data: {
                        "HInterID": linterid
@@ -221,21 +249,13 @@
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HItemID": data.HItemID
                                ,"HNumber": data.包装方式代码
                                , "HName": data.包装方式名称
                                , "HParentID": data.HParentID
                                , "HShortNumber": data.短代码
                                , "HHelpCode": data.助记码
                                //, "HMakeEmp": data.创建人
                                , "HPackMaterial": data.包装材质
                                , "HLevel": data.等级
                                , "HLenhth": data.长
                                , "HWidth": data.宽
                                , "HHeight": data.高
                                //, "HStopflag": data.禁用标记
                                , "HRemark": data.备注
                                , "HUseFlag": data.使用标记
                                , "HMakeTime": Format(data.创建时间, "yyyy-MM-dd")
                                , "HDate": data.HDate
                                , "HWorkBegin": data.HWorkBegin
                                , "HWorkEnd": data.HWorkEnd
                                , "HNoonbreakBegin": data.HNoonbreakBegin
                                , "HNoonbreakEnd": data.HNoonbreakEnd
                                , "HNightbreakBegin": data.HNightbreakBegin
                                , "HNightbreakEnd": data.HNightbreakEnd
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -253,33 +273,9 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                var sMainStr = JSON.stringify(data.field);
                if (!$("#HNumber").val()) {
                    layer.msg("请输入包装方式代码!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HName").val()) {
                    layer.msg("请输入包装方式名称!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HMakeEmpID").val() == 0) {
                    layer.msg("请选择创建人!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HLenhth").val()) {
                    layer.msg("请输入长!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HWidth").val()) {
                    layer.msg("请输入宽!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HHeight").val()) {
                    layer.msg("请输入高!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_PackType/ModifyByID", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    dataType: "json",
@@ -302,33 +298,6 @@
                });
            }
            //#endregion
            //#region é€‰æ‹©èŒå‘˜æ–¹æ³•
            function get_checkEmp() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMakeEmp").val(checkStatus.data[0].HName);
                        $("#HMakeEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
                location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_WorkDay.html
@@ -25,15 +25,9 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">包装代码</label>
                                    <label class="layui-form-label">日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">包装名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                        <input type="text" class="layui-input" name="HDate" id="HDate">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -110,11 +104,14 @@
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_PackType";
            var HModName = "Gy_WorkDay";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID","HParentID",];
            //#endregion
            laydate.render({
                elem: '#HDate'
                //, type:'year'
            });
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
@@ -218,7 +215,7 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_PackType/list',
                    url: GetWEBURL() + '/Gy_WorkDay/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -286,12 +283,10 @@
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var HDate = $("#HDate").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
@@ -313,11 +308,8 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and åŒ…装方式代码 like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and åŒ…装方式名称 like '%" + HName + "%'";
                if (HDate) {
                    sWhere += " and DATEDIFF(D,日期,'" + HDate +"')=0";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -341,7 +333,7 @@
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '包装方式列表-新增'
                    , title: '工作日-新增'
                    , shift: 0//弹出动画
                    , content: '../工资基础资料/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
                })
@@ -358,7 +350,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '包装方式列表-编辑'
                        , title: '工作日-编辑'
                        , shift: 0//弹出动画
                        , content: '../工资基础资料/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
@@ -378,7 +370,7 @@
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_PackType',
                            url: GetWEBURL() + 'DeltetGy_WorkDay',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {