1

沈泽

2021-10-11 4c95f9cd5b0f2d01b1687c37582d42793e9e509f

1

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,10 +2,10 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBill.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" 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;">
@@ -139,9 +139,19 @@
                                            <div class="layui-col-xs4 layui-inline">
                                                <label class="layui-form-label">工资类型</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
                                                    <input type="text" name="HPayTypeName" id="HPayTypeName" 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;">
                                                    <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>
                                                </div>
                                            </div>
                                            <!--<div class="layui-col-xs4 layui-inline">
                                                <label class="layui-form-label">工资类型</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
                                                </div>
                                            </div>-->
                                            <div class="layui-col-xs4 layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
@@ -301,8 +311,8 @@
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", 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: 100 }
                    , { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 190 }
                    //, { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 100 }
                    , { 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 }
@@ -325,6 +335,14 @@
            };
            //判断是否新增
            if (OperationType == 1) {
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HChecker").val(sessionStorage["HUserName"]);
                $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HCloseMan").val(sessionStorage["HUserName"]);
                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
@@ -426,13 +444,13 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../PublicPage/MouldInformation.html', 'yes'],
                                content: ['../../../views/Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
@@ -442,7 +460,6 @@
                                        HMaterID: checkStatus.data[0].HItemID,
                                        HMaterCode: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName,
                                        HMaterSpec: checkStatus.data[0].HModel,

                                        HDesignLife: 0,  //设计寿命
                                        HLeaveLife: 0,   //剩余寿命
@@ -660,9 +677,11 @@
                                , "HGroupID": data.HGroupID                    //班组ID
                                , "HGroupName": data.班组                 //班组名称
                                , "HEmpID": data.HEmpID    //主管ID
                                , "HEmpName": data.主管         //主管名称
                                , "HEmpName": data.职员         //主管名称
                                , "HDeptID": data.HDeptID                 //部门ID
                                , "HDeptName": data.部门                //部门名称
                                , "HPayID": data.HPayID                 
                                , "HPayTypeName": data.工资类型               
                                , "HSourceBillType": ""                   //源单类型
                                , "Box2": ""                               //选单号
                                , "HExplanation": data.摘要              //摘要
@@ -794,13 +813,13 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
                    content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
@@ -820,7 +839,43 @@
                    }
                });
            });
            //表头信息工资类型弹窗
            form.on('submit(PayType)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工资类型列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/工资管理/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', '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('请选择数据');
                        }
                        $("#HPayTypeName").val(checkStatus.data[0].工资类型);
                        $("#HPayID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });
            //退出
            form.on('submit(Exit)', function (data) {
                if (OperationType == 1) {
@@ -857,7 +912,7 @@
                return [year, month, day].join('-');
            }
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
@@ -867,20 +922,12 @@
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Pay_SingleBalBill/AddBill",
                    //url:"http://localhost:12761/Gy_RoutingBill/AddBill",
                    async: true,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();关闭页签
                            //        //window.close();//关闭页面，浏览器有效，PDA无效
                            //        parent.location.href = "../../../views/index.html"
                            //    }//关闭
                            //}, function () { window.location.reload(); });//新增
                           
                            layer.close(index);
                            layer.msg("提交成功");
                        }

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

@@ -157,6 +157,9 @@
                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
                        , { field: '职员代码', title: '职员代码', width: 180 }
                        , { field: '职员', title: '职员', width: 125 }
                        , { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
                        , { field: '工资代码', title: '工资代码', width: 180 }
                        , { field: '工资类型', title: '工资类型', width: 125 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        , { field: '内部单据号', title: '内部单据号', width: 115 }

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(ÆäËû)/Pay_OtherBalBill.html

@@ -421,13 +421,13 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../PublicPage/MouldInformation.html', 'yes'],
                                content: ['../../../views/Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
@@ -435,14 +435,13 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID,
                                        HMaterCode: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName,
                                        HMaterSpec: checkStatus.data[0].HModel,
                                        HMaterCode: checkStatus.data[0].物料代码,
                                        HMaterName: checkStatus.data[0].物料,

                                        HDesignLife: 0,  //设计寿命
                                        HLeaveLife: 0,   //剩余寿命
                                        HQty: 1,         //实收数量
                                        HMoney: 0,       //金额
                                        //HDesignLife: 0,  //设计寿命
                                        //HLeaveLife: 0,   //剩余寿命
                                        //HQty: 1,         //实收数量
                                        //HMoney: 0,       //金额
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -789,17 +788,17 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
                    content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptName").val(checkStatus.data[0].HName);
                        $("#HDeptName").val(checkStatus.data[0].部门);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -815,7 +814,6 @@
                    }
                });
            });

            //退出
            form.on('submit(Exit)', function (data) {
                if (OperationType == 1) {
@@ -841,7 +839,7 @@
                return [year, month, day].join('-');
            }
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);