王 垚
2021-12-06 4e2146127a6dbac4edf851090183032fe1dcdd78
工资结算单(个人)
1 文件已重命名
6个文件已修改
110 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/Gy_WorkPayTypeBillList.html 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/Gy_WorkTypeBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -641,7 +641,7 @@
    <Content Include="views\工资管理\Gy_WorkPayTypeBillList.html" />
    <Content Include="views\工资管理\Gy_WorkTypeBillEdit.html" />
    <Content Include="views\工资管理\Gy_WorkTypeBillList.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
WebTM/views/index.html
@@ -604,7 +604,7 @@
                                <dd>
                                    <a>工资结算单(个人)</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="工资管理/工资结算单(个人)/Pay_SingleBalBill.html">工资结算单(个人)</a></dd>
                                        <dd><a lay-href="工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html">工资结算单(个人)</a></dd>
                                        <dd><a lay-href="工资管理/工资结算单(个人)/Pay_SingleBalBillList.html">工资结算单(个人)维护</a></dd>
                                    </dl>
                                </dd>
WebTM/views/¹¤×ʹÜÀí/Gy_DuSubsidyItemBillList.html
@@ -6,8 +6,8 @@
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/treeTable.js"></script>
    <script src="../../layuiadmin/Scripts/json2.js"></script>
WebTM/views/¹¤×ʹÜÀí/Gy_WorkPayTypeBillList.html
@@ -6,28 +6,14 @@
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/treeTable.js"></script>
    <script src="../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
    <style media="screen">
        .custom-tree-item-clicked {
            color: #FC9003
        }
        .layui-form-label {
            width: 40px;
            padding: 9px 5px;
        }
        .layui-input-block {
            margin-left: 50px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
WebTM/views/¹¤×ʹÜÀí/Gy_WorkTypeBillList.html
@@ -6,8 +6,8 @@
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/treeTable.js"></script>
    <script src="../../layuiadmin/Scripts/json2.js"></script>
WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillEdit.html
File was renamed from WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBill.html
@@ -112,7 +112,7 @@
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                    <!--<div class="layui-row">
                                            <div class="layui-col-xs4 layui-inline">
                                                <label class="layui-form-label">源单类型</label>
                                                <div class="layui-input-inline">
@@ -133,14 +133,13 @@
                                                    <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                                </div>
                                            </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 type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HPayType" id="HPayType" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -149,16 +148,13 @@
                                            <div class="layui-col-xs4 layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
                                                <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs7 layui-inline">
                                        <div class=" layui-col-xs4  layui-inline">
                                                <label class="layui-form-label">备注</label>
                                                <div class="layui-input-block">
                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                </div>
                                            <div class="layui-input-inline">
                                                <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                            </div>
                                        </div>
                                    </div>
@@ -290,15 +286,14 @@
                , cols: [[ //表头
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: '物料代码', edit: 'text', event: 'HMaterCheck', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 190 }
                    //, { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 150 }
                    , { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true }
                    , { field: 'HProcNumber', title: '工序代码', edit: 'text', event: "HProcCheck", width: 100 }
                    , { field: 'HProcName', title: '工序名称', edit: 'text', width: 100 }
                    , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
                    , { field: 'HEmpNumber', title: '职员代码', edit: 'text', event: 'HEmpCheck', width: 150 }
                    , { field: 'HEmpNumber', title: '职员代码', edit: 'text', event: 'HEmpCheck', width: 100 }
                    , { field: 'HEmpName', title: '职员名称', edit: 'text', width: 100 }
                    , { field: 'HTimes', title: '工时', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '数量', edit: 'text', width: 100 }
@@ -400,7 +395,6 @@
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗?', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else {
@@ -704,7 +698,6 @@
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Pay_SingleBalBillList[0];
                            console.info(data);
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
@@ -712,10 +705,10 @@
                                , "HGroupID": data.HGroupID                    //班组ID
                                , "HGroupName": data.班组                 //班组名称
                                , "HEmpID": data.HEmpID    //主管ID
                                , "HEmpName": data.职员         //主管名称
                                , "HEmpName": data.HEmpName         //主管名称
                                , "HDeptID": data.HDeptID                 //部门ID
                                , "HDeptName": data.部门                //部门名称
                                , "HPayID": data.HPayID
                                , "HPayType": data.HPayType
                                , "HPayTypeName": data.工资类型               
                                , "HSourceBillType": ""                   //源单类型
                                , "Box2": ""                               //选单号
@@ -893,7 +886,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/工资管理/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', 'yes'],
                    content: ['../../../views/工资管理/Gy_WorkPayTypeBillList.html?Type=HPayType', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
@@ -904,7 +897,7 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HPayTypeName").val(checkStatus.data[0].工资类型名称);
                        $("#HPayID").val(checkStatus.data[0].HItemID);
                        $("#HPayType").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -932,17 +925,6 @@
                }
            });
            //form.on('submit(Cancel)', function () {
            //    //sessionStorage["SourceFlag"] = false;
            //    parent.location.href = "../../../views/index.html"
            //    //window.close();//关闭当前页
            //})
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
@@ -956,35 +938,41 @@
            }
            //保存提交
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;
                var refSav = "";
                if (linterid == "" || linterid == null) {
                    refSav = "Add";
                }
                if (linterid != "" && linterid != null) {
                    refSav = "Update";
                }
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + sessionStorage["HUserName"];
                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Pay_SingleBalBill/AddBill",
                    url: GetWEBURL() + "/Pay_SingleBalBill/SaveGetSingleBalBillList",
                    async: true,
                    data: { "sMainSub": sMainSub },
                    data: { "msg": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭
                            });
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            f_alert(data.Message);
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        f_alert("错误:" + err);
                    }
                });
            });
WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html
@@ -230,7 +230,7 @@
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../工资结算单(个人)/Pay_SingleBalBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            content: '../工资结算单(个人)/Pay_SingleBalBillEdit.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            end: function () {
                                //刷新页面,
                                location.reload();
@@ -254,7 +254,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: '../工资结算单(个人)/Pay_SingleBalBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                , content: '../工资结算单(个人)/Pay_SingleBalBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                , resize: false,
                                end: function () {
                                    //刷新页面,