yusijie
2024-04-17 2b18f7b02062bf8d883c72e46c2d265c9a8cb716
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
7个文件已修改
249 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/组织架构设置/Gy_DutyEdit.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/组织架构设置/Gy_DutyList.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/付款单/YF_PayMentBill.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
    //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:8083/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html
@@ -188,6 +188,31 @@
                                                </button>
                                            </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="HInvoiceBillNo" id="HInvoiceBillNo" value="" autocomplete="off">
                                            </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" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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-block" >
                                                <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
@@ -490,7 +515,11 @@
            form.on('submit(HEMPList)', function () {
                get_checkHemp();
            });
            //#region é€‰æ‹©é¡¹ç›®ä»£ç æŒ‰é’®
            form.on('submit(btnSearchHProNumber)', function () {
                get_checkSearchHProNumber();
            });
            //#endregion
@@ -775,6 +804,10 @@
                                , "HManagerID": data[0]["HManagerID"]
                                , "HMangerName": data[0]["主管"]
                                , "HExplanation": data[0]["HExplanation"]
                                , "HInvoiceBillNo": data[0]["发票编号"]
                                , "HProjectID": data[0]["HProjectID"]
                                , "HProNumber": data[0]["项目编码"]
                                , "HProName": data[0]["项目名称"]
                                , "HRemark": data[0]["表头备注"]
                                , "HMaker": data[0]["制单人"]
@@ -941,6 +974,16 @@
                        }
                        $("#HWHName").val(checkStatus.data[0].仓库名称);
                        $("#HWHID").val(checkStatus.data[0].HItemID);
                        if (option.data.length > 0) {
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HWHID"] == 0) {
                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
                                    option.data[i]["调入仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -964,6 +1007,16 @@
                        }
                        $("#HSCWHName").val(checkStatus.data[0].仓库名称);
                        $("#HSCWHID").val(checkStatus.data[0].HItemID);
                        if (option.data.length > 0) {
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HWHID"] == 0) {
                                    option.data[i]["HSCWHID"] = checkStatus.data[0].HItemID;
                                    option.data[i]["调出仓库"] = checkStatus.data[0].仓库名称;
                                }
                            }
                        }
                        table.render(option);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1066,6 +1119,44 @@
                })
            }
            //#region é¡¹ç›®ä»£ç é€‰æ‹©é¡µé¢
            function get_checkSearchHProNumber() {
                var HOrgID = $("#HOrgID").val();
                //打开工程项目小窗体
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "工程项目列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../项目管理/工程项目/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }
                        //判断项目是否关闭
                        if (checkStatus.data[0].关闭人 == null || checkStatus.data[0].关闭人 == "") {
                            $("#HProjectID").val(checkStatus.data[0].HInterID);
                            $("#HProNumber").val(checkStatus.data[0].项目代码);//工程项目代码
                            $("#HProName").val(checkStatus.data[0].项目名称);//工程项目代码
                        } else {
                            layer.msg("该项目已关闭,不可选择!");
                        }
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion
            //#endregion
            //行内快捷键筛选
@@ -1201,7 +1292,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1238,7 +1329,7 @@
                                    , shift: 2 //弹出动画
                                    , area: ["90%", "90%"] //窗体大小
                                    , maxmin: true //设置最大最小按钮是否显示
                                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                    , btn: ["确定", "取消"]
                                    , btn1: function (index, laero) {
                                        //按钮一  çš„回调
@@ -1584,12 +1675,30 @@
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
            if (option.data.length > 0) {
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HWHID"] == 0 || option.data[i]["调入仓库"] == undefined) {
                        option.data[i]["HWHID"] = obj[0].HItemID;
                        option.data[i]["调入仓库"] = obj[0].仓库名称;
                    }
                }
            }
            layui.table.render(option);
        }
         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
             if (option.data.length > 0) {
                 for (var i = 0; i < option.data.length; i++) {
                     if (option.data[i]["HSCWHID"] == 0 || option.data[i]["调出仓库"] == undefined) {
                         option.data[i]["HSCWHID"] = obj[0].HItemID;
                         option.data[i]["调出仓库"] = obj[0].仓库名称;
                     }
                 }
             }
             layui.table.render(option);
        }
         function GetHEmpValue(obj)  //返回业务员
@@ -1627,6 +1736,25 @@
         function GetGyStockPlace(data) {
             OptionData = data
         } 
        //双击返回调入仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }
        //双击返回调出仓库
        function GetGyWarehouse(data) {
            OptionData = data[0];
        }
        //项目代码
        function GetProjectBillValue(obj) {
            if (obj[0].关闭人 == null || obj[0].关闭人 == "") {
                $("#HProjectID").val(obj[0].HInterID);
                $("#HProNumber").val(obj[0].项目代码);//工程项目代码
                $("#HProName").val(obj[0].项目名称);//工程项目代码
            } else {
                layer.msg("该项目已关闭,不可选择!");
            }
        }
    </script>
</body>
</html>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Warehouse.html
@@ -272,6 +272,9 @@
                    case "Warehouse":
                        parent.GetGyWarehouse(data);
                        break;
                    case "HWHSub": //调入子表
                        parent.GetHWHSubValue(data);
                        break;
                    default:
                        parent.GetHWHValue(data);
                        break;
WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html
@@ -220,10 +220,19 @@
                            </div>
                        </div>
                        <div class="layui-row" style="margin-bottom:5px">
                            <div class="layui-inline" style="width: 56%;">
                            <div class="layui-inline" style="width: 53%;">
                                <label class="layui-form-label">备注</label>
                                <div class="layui-input-inline" style="width: 56%;">
                                <div class="layui-input-inline" style="width: 53%;">
                                    <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label">材料类别:</label>
                                <div class="layui-input-inline">
                                    <select name="HMaterClass" lay-filter="HMaterClass" id="HMaterClass">
                                        <option value="主材" selected="selected">主材</option>
                                        <option value="辅材">辅材</option>
                                    </select>
                                </div>
                            </div>
                        </div>
@@ -622,7 +631,10 @@
                        $("#HRemark").val(d.data[0].备注);
                        $("#HUpDater").val(sessionStorage["HUserName"]);//修改人
                        $("input[name='HStopflag']").prop("checked", d.data[0].禁用标志);//true:选中 false:不选中
                        $('#HMaterClass').find("option[value='" + data[0].供货材料类别 + "']").attr("selected", true);
                        form.render('select');
                        layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话
                        //table.reload(layTableId, {
                        //    data: ajaxReturnData
                        //});
WebTM/views/ϵͳ¹ÜÀí/×éÖ¯¼Ü¹¹ÉèÖÃ/Gy_DutyEdit.html
@@ -92,7 +92,16 @@
                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="是否禁用">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">用户编码</label>
                                                    <div class="layui-input-block" style="margin-left: 67px;">
                                                        <input type="text" class="layui-input" name="HUserCodeName" lay-verify="HUserCodeName" id="HUserCodeName" style="background-color:#efefef4d;width: 55%;margin-left:7px;display: inline-block;" readonly>
                                                        <input type="hidden" class="layui-input" name="HUserCode" lay-verify="HUserCode" id="HUserCode" value="">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUserCode" id="btnHUserCode" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                        </button>
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
@@ -147,6 +156,10 @@
        form.on('submit(btnHUserGroup)', function () {
            get_btnHUserGroup();
        });
        //用户编码
        form.on('submit(btnHUserCode)', function () {
            get_btnHUserCode();
        });
        //保存按钮
        form.on('submit(Saver)', function (data) {
@@ -190,6 +203,35 @@
                    $("#HUserGroupID").val(checkStatus.data[0].HGroupID);
                    $("#HUserGroupName").val(checkStatus.data[0].角色);
                    $("#HName").val(checkStatus.data[0].角色);
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //用户编码
        function get_btnHUserCode() {
            //打开部门小窗体
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "用户列表"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["90%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: ["../用户管理/Xt_UserList.html", "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //按钮一  çš„回调
                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                    if (checkStatus.data.length != 1) {
                        return layer.msg("请选择一条数据");
                    }
                    //更新表格缓存的数据
                    $("#HUserCode").val(checkStatus.data[0].用户编码);
                    $("#HUserCodeName").val(checkStatus.data[0].用户名称);
                    layer.close(index);//关闭弹窗
                }
            })
@@ -249,6 +291,8 @@
                            , "HUserGroupID": data.HUserGroupID
                            , "HRemark": data.备注
                            , "HStopFlag": data.禁用标记
                            , "HUserCode": data.用户编码
                            , "HUserCodeName": data.用户名称
                        });
                    } else {
                        layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
WebTM/views/ϵͳ¹ÜÀí/×éÖ¯¼Ü¹¹ÉèÖÃ/Gy_DutyList.html
@@ -103,6 +103,8 @@
            { field: "hitemid", title: "hitemid", width: 100, hide: true },
            { field: "组织架构代码", title: "组织架构代码", width: 110 },
            { field: "职务", title: "职务", width: 110 },
            { field: "用户编码", title: "用户编码", width: 110 },
            { field: "用户名称", title: "用户名称", width: 110 },
            { field: "助记码", title: "助记码", width: 110 },
            { field: "短代码", title: "短代码", width: 110 },
            { field: "末级标志", title: "末级标志", width: 110 },
WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html
@@ -179,6 +179,27 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">发票编号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" value="" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">大写金额</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HBigMoney" id="HBigMoney" value="" autocomplete="off" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">付款事由</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HReason" value="" id="HReason" autocomplete="off" >
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1160px;">
@@ -447,6 +468,25 @@
                    $("#HRelSumMoney").val(HRelSumMoney);
                });
                //#endregion
            });
            $(document).ready(function () {
                $("#HBigMoney").blur(function () {
                    var num = $(this).val();
                    var strOutput = "";
                    var strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分';
                    num += "00";
                    var intPos = num.indexOf('.');
                    if (intPos >= 0) {
                        num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
                    }
                    strUnit = strUnit.substr(strUnit.length - num.length);
                    for (var i = 0; i < num.length; i++) {
                        strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
                    }
                    // å°†è½¬æ¢åŽçš„大写金额替换文本框中的内容
                    $(this).val(strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元"));
                });
            });
            //#endregion
@@ -893,7 +933,9 @@
                                , "HRelSumMoney": data.折扣后金额
                                , "HAccDate": formatDate(data.财务日期)
                                , "HCreditRating_Now": data.HCreditRating_Now
                                , "HRemark": data.表头备注
                                , "HInvoiceBillNo": data.发票编号
                                , "HBigMoney": data.大写金额
                                , "HReason": data.付款事由
                                , "HMaker": data.制单人
                                , "HMakeDate": data.制单日期 == null ? "" : Format(new Date(data.制单日期), "yyyy-MM-dd")