工资管理相关新增、列表模块修改，乔一销售出库扫码模块优化

yxj

2023-12-14 5d0914b9dba4ad9917f26b15915ec6b9a93bb314

工资管理相关新增、列表模块修改，乔一销售出库扫码模块优化

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,9 +3,9 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)

 WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_QiaoYi_PDA.html

@@ -240,7 +240,7 @@
                            <button type="button" lay-submit="" lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">新增</button>
                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">提交</button>
                            <!--<button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">编辑</button>-->
                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">删除</button>
                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">清空</button>
                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                    </div>
@@ -913,7 +913,7 @@
                                                parent.location.href = "../../WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                                parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
                                            }
                                        }//关闭
                                    }
@@ -968,13 +968,13 @@

            //#endregion

            //#region åˆ é™¤
            //#region æ¸…空

            form.on('submit(cmdDelete)', function () {
                var checkStatus = table.checkStatus('wl-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length == 1) {
                    layer.confirm("确认要删除选中行所有扫码记录？删除后将不可恢复！", { title: "删除确认" }, function (index) {
                    layer.confirm("确认要清空选中行所有扫码记录？清空后将不可恢复！", { title: "清空确认" }, function (index) {
                        var sMaterID = data[0].HMaterID
                        var sAuxPropID = data[0].HAuxPropID
                        var sMTONo = data[0].HMTONo
@@ -1009,7 +1009,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行记录，进行删除！');
                    layer.msg('请选择一行记录，进行清空！');
                }
            });


 WebTM/views/¹¤×ʹÜÀí/¶¨¶îÉêÇë/Pay_ProcPriceRequestBillList.html

@@ -472,6 +472,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -482,7 +483,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʵ¥/Pay_PayMentBillList.html

@@ -471,6 +471,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -481,7 +482,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

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

@@ -470,6 +470,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -480,7 +481,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo+" åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

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

@@ -172,15 +172,15 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核人</label>
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <label class="layui-form-label" style="width: 85px;">审核人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -192,29 +192,63 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckerDate" id="HCheckerDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">退回人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBacker" id="HBacker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">退回日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBackerDate" id="HBackerDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">退回原因</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBackRemark" id="HBackRemark" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -314,12 +348,6 @@
            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"]);
                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HUpDater").val(sessionStorage["HUserName"]);
                $("#HCloseDate").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 = [{
                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
@@ -649,13 +677,15 @@
                                , "HExplanation": data.摘要              //摘要
                                , "HRemark": data.表头备注                    //备注
                                , "HMaker": data.制单人
                                , "HUpdater": data.修改人
                                , "HChecker": data.审核人
                                , "HCloseMan": data.关闭人
                                , "HMakeDate": data.制单日期
                                , "HCheckDate": data.审核日期
                                , "HCloseDate": data.关闭日期
                                , "HUpDateDate": data.修改日期
                                , "HDeleteDate": data.作废日期
                                , "HDeleteMan": data.作废人
                                , "HMakeDate": data.制单日期 == null ? "" : Format(data.制单日期, "yyyy-MM-dd hh:mm:ss")
                                , "HUpdaterDate": data.修改日期 == null ? "" : Format(data.修改日期, "yyyy-MM-dd hh:mm:ss")
                                , "HCheckerDate": data.审核日期 == null ? "" : Format(data.审核日期, "yyyy-MM-dd hh:mm:ss")
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(data.关闭日期, "yyyy-MM-dd hh:mm:ss")
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(data.作废日期, "yyyy-MM-dd hh:mm:ss")
                            });

                        } else {

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

@@ -328,6 +328,7 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            var HBillNo = data[0].单据号.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
@@ -336,7 +337,7 @@
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -468,6 +468,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -478,7 +479,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html

@@ -191,26 +191,11 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">

                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -224,7 +209,20 @@
                                            </div>
                                        </div>
                                    </div>

                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
@@ -353,14 +351,6 @@
                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"]);
                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HUpDater").val(sessionStorage["HUserName"]);
                    $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HDeleteMan").val(sessionStorage["HUserName"]);
                    $("#HCloseMan").val(sessionStorage["HUserName"]);
                    //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                    option.data = [{
                        "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
@@ -764,11 +754,13 @@
                                    , "HMaker": data.制单人
                                    , "HChecker": data.审核人
                                    , "HCloseMan": data.关闭人
                                    , "HMakeDate": data.制单日期
                                    , "HCheckDate": data.审核日期
                                    , "HCloseDate": data.关闭日期
                                    , "HUpDateDate": data.修改日期
                                    , "HDeleteDate": data.作废日期
                                    , "HUpDater": data.修改人
                                    , "HDeleteMan": data.作废人
                                    , "HMakeDate": data.制单日期 == null ? "" : Format(data.制单日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HCheckDate": data.审核日期 == null ? "" : Format(data.审核日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HCloseDate": data.关闭日期 == null ? "" : Format(data.关闭日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HUpDateDate": data.修改日期 == null ? "" : Format(data.修改日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HDeleteDate": data.作废日期 == null ? "" : Format(data.作废日期, "yyyy-MM-dd hh:mm:ss")
                                });

                            } else {

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillList.html

@@ -276,6 +276,7 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            var HBillNo = data[0].单据号.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
@@ -284,7 +285,7 @@
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame