Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

仲国强

2021-10-08 0b47069a012c699e01de098d569525eb884de4ce

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,7 +2,7 @@
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/";    //杨露本地配置

 WebTM/views/index.html

@@ -466,7 +466,7 @@
                                <dd>
                                    <a>仓储管理</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="模治具管理/模治具仓库管理/Sc_MouldProdInBill.html">器具采购入库单</a></dd>
                                        <dd><a lay-href="模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html">器具采购入库单</a></dd>
                                        <dd><a lay-href="模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html">器具采购入库单据维护</a></dd>
                                        <dd><a lay-href="模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html">器具领用出库单</a></dd>
                                        <dd><a lay-href="模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html ">器具领用出库单维护</a></dd>

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

@@ -871,48 +871,86 @@

                return [year, month, day].join('-');
            }

            form.on('submit(Saver)', function (data) {//保存
                //debugger;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                //var tableData = data.field;
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;


                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            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 {

                                f_alert(data.Message);
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {

                            f_alert("错误:" + err);
                            console.log("Reason" + sMainStr);
                var index = layer.load();
                $.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("提交成功");
                        }
                    });
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            });
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });
            //form.on('submit(Saver)', function (data) {//保存
            //    //debugger;
            //    data.field.HMaker = sessionStorage["HUserName"];//制单人
            //    var sMainStr = JSON.stringify(data.field);
            //    var sSubStr = JSON.stringify(table.cache['mainTable']);
            //    var sMainSub = sMainStr + ';' + sSubStr;

            }

            //    $.ajax(
            //        {
            //            type: "POST",
            //            url: GetWEBURL() + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList", //方法所在页面和方法名
            //            async: true,
            //            data: { "msg": sMainSub },
            //            dataType: "json",
            //            success: function (data) {
            //                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 {

            //                    f_alert(data.Message);
            //                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
            //                }
            //                layer.closeAll("loading");
            //            },
            //            error: function (err) {

            //                f_alert("错误:" + err);
            //                console.log("Reason" + sMainStr);
            //            }
            //        });
            //});
            //function f_alert(sMsg) {
            //    layer.alert(sMsg, { icon: 5 });

            //}

            //监听提交
            form.verify({

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

@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>模治具生产领用单列表</title>
    <title>工资结算(个人)列表</title>
    <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">
@@ -210,7 +210,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
                    url: GetWEBURL() + '/Pay_SingleBalBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
@@ -237,12 +237,12 @@
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '新增模具领用单',
                            title: '新增工资结算(个人)',
                            closeBtn: 1,
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../模治具仓库管理/Sc_Add_MouldProdOutBillList.html',
                            content: '../工资结算单(个人)/Pay_SingleBalBill.html',
                            end: function () {
                                //刷新页面,
                                location.reload();
@@ -261,12 +261,12 @@
                            layer.open({
                                type: 2
                                , area: ['100%', '100%']
                                , title: '编辑模具领用单'
                                , title: '编辑工资结算(个人)'
                                , closeBtn: 1
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: '../模治具仓库管理/Sc_Add_MouldProdOutBillList.html?hID=' + hID
                                , content: '../工资结算单(个人)/Pay_SingleBalBill.html?hID=' + hID
                                , resize: false,
                                end: function () {
                                    //刷新页面,