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

zrg

2024-08-02 6a2cf9f4e0180ca707c5e0eb188f92ab74da5763

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,9 +8,9 @@
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   // var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    var WEBURL = "http://localhost:81/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
   /* var WEBURL = "http://47.96.97.237/API/";   //智云服务器*/

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -670,7 +670,8 @@
        //获取 é€’入参数
        var params = getUrlVars();
        var hID = params[params[0]];//编辑查看
        var OperationType = params[params[1]];//1 æ–°å¢ž 2复制 3编辑
        var OperationType = params[params[1]];//1 æ–°å¢ž 2复制 3编辑 4流水号新增
        var HMaterTypeID = params[params[2]];//类型id
        //初始化 åŠ å…¬ç”¨å˜é‡
        var date = new Date();
        var day = date.getDate();
@@ -746,7 +747,12 @@
                PicUpload();
                getFile();
            }

            //流水号新增
            if (OperationType == 4) {
                $("#HNumber").attr("readonly", true);
                setHNumber(HMaterTypeID);
     
            }

            $(this).removeAttr("lay-key");
            //执行一个laydate实例
@@ -1012,6 +1018,28 @@
                });
            }

            //流水号新增获取编码
            function setHNumber(TypeID) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Material/getMaxNum',
                    type: "GET",
                    data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
                    success: function (data1) {
                        if (data1.data != null) {
                            layer.close(ajaxLoad);
                            $("#HNumber").val(data1.data)
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //保存按钮
            form.on('submit(Saver)', function (data) {
                console.log(data.field.HCHECKINCOMING)

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Warehouse.html

@@ -97,6 +97,13 @@
                                                <input type="hidden" value="0" name="HSPFlag" id="HSPFlag">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">负库存控制标记</label>
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="checkboxHStockCtrlFlag" id="checkboxHStockCtrlFlag" lay-skin="primary" lay-filter="checkboxHStockCtrlFlag" value="true" title="是否启用">
                                                <input type="hidden" value="false" name="HStockCtrlFlag" id="HStockCtrlFlag">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs8 layui-inline">
@@ -221,6 +228,11 @@
                Pub_Close(1);
            })

            //负库存控制按钮
            form.on('checkbox(checkboxHStockCtrlFlag)', function (data) {
                $("#HStockCtrlFlag").val(data.elem.checked);
            });

            //是否禁用按钮
            form.on('checkbox(checkboxHStopflag)', function (data) {
                $("#HStopflag").val(data.elem.checked);
@@ -321,10 +333,15 @@
                            var data = result.data[0];
                            var IsHStopflag = data.禁用标记;
                            var HSPFlag = data.启用仓位;
                            var IsHStockCtrlFlag = data.负库存控制标记;
                            var IsHTypeFlow = data.明细标记;
                            //禁用标记
                            if (IsHStopflag) {
                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            }
                            //负库存控制标记
                            if (IsHStockCtrlFlag) {
                                $("input[name='checkboxHStockCtrlFlag'][value='" + IsHStockCtrlFlag + "']").attr("checked", true);
                            }
                            //启用标记
                            if (HSPFlag=="Y") {
@@ -346,6 +363,7 @@
                                , "HAddress": data.仓库地址
                                , "HPhone": data.联系电话
                                , "HStopflag": data.禁用标记
                                , "HStockCtrlFlag": data.负库存控制标记
                                , "HSPFlag": data.启用仓位 == "Y" ? 1 : 0
                                , "HRemark": data.HRemark
                                , "HRemark": data.HRemark

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -131,6 +131,7 @@
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layui-iconlayuiiconfileb"></i>流水号新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>删除</button>
@@ -200,6 +201,7 @@
            var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];

            var ins;                        //用于导出excel
            var HMaterTypeID = 0;              //物料分类节点id
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -240,6 +242,10 @@
                    //新增按钮
                    case 'btn-Add':
                        set_AddNew();
                        break;
                    //新增流水号按钮
                    case 'btn-NumAdd':
                        set_NumAddNew();
                        break;
                    case 'btn-Edit':
                        set_ShowBill();
@@ -805,6 +811,34 @@
            }
            //#endregion

            //#region æµæ°´å·æ–°å¢ž
            function set_NumAddNew() {
                if (HMaterTypeID == 0 || HMaterTypeID == null) {
                    layer.msg('请选择具体物料分类！');
                }
                else {
                    layer.open({
                        type: 2,
                        skin: 'layui-layer-rim', //加上边框
                        title: '新增物料',
                        closeBtn: 1,
                        shift: 2,
                        area: ['100%', '100%'],
                        maxmin: true,
                        content: '../公用基础资料/Add_Edit_Gy_Material.html?hID=0&OperationType=4&HMaterTypeID=' + HMaterTypeID,
                        end: function () {
                            //刷新页面,
                            get_FastQuery(table, option);
                        },
                        success: function (layero, index) {

                        }
                    });
                }
                
            }
            //#endregion

            //#region ç¼–辑单据
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -937,10 +971,13 @@
                        var data = obj.data;  //获取当前点击的节点数据
                        if (data.id == "100") {
                            sql = " and HMaterTypeID=0 ";
                            HMaterTypeID = 0;
                        } else if (data.id == "0") {
                            sql = "";
                            HMaterTypeID = 0;
                        } else {
                            sql = " and HMaterTypeID='" + data.id + "' ";
                            HMaterTypeID = data.id;
                        }
                        get_Display(sql);
                    }

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html

@@ -89,7 +89,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1 " class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html

@@ -47,7 +47,7 @@
                                <label class="layui-form-label">创建组织</label>
                                <div class="layui-input-inline" style="margin-right: 0px;width: 100px;">
                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input" >
                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input">
                                </div>
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -222,7 +222,7 @@
                        <div class="layui-row" style="margin-bottom:5px">
                            <div class="layui-inline" style="width: 585px;">
                                <label class="layui-form-label">备注</label>
                                <div class="layui-input-inline" >
                                <div class="layui-input-inline">
                                    <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
@@ -325,11 +325,32 @@
                    <input type="hidden" name="lngBillKey" id="lngBillKey">
                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
                    <input type="hidden" name="HMaker" id="HMaker"><!--制单人-->
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">付款计划</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--子表-->
                            <div class="layui-tab-item layui-show">
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                    </div>
                                </script>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>

    <!--项目阶段表：删除-->
    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -365,16 +386,20 @@
            var sWhere = "";
            //#endregion


            var option;
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            $("#HCreator").val(sessionStorage["HUserName"]);//创建人
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
                //初始化表
                get_InitGrid();
            }
            else if (OperationType == 3) {//编辑
                $("#HInterID").val(linterid);
                set_EditFromGrid();
                //初始化表
                get_InitGrid();
            }
            else {
                layer.alert("未知操作类型！", { icon: 5 });
@@ -383,6 +408,58 @@


            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                //新增行表格数据

                var NewRow = {
                    "HPayType": ""
                    , "HPayRate": "0"
                    , "HPayTime": "0"
                    , "HPayRemark": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];

                        table.render(option);
                        //刷新复选框
                        //checkRefresh();
                        break;
                    case 'btn-CopyLine':
                        var copydata = JSON.stringify(data);
                        if (data.length <= 0) {
                            layer.msg("请选择需要复制的一行！");
                        }
                        else if (data.length > 1) {
                            layer.msg("只能选择复制一行！");
                        }
                        else {
                            var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                            var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            //刷新复选框
                            //checkRefresh();
                        }
                        break;

                }
            });

            //#region å­è¡¨ï¼šè¡Œå†…事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                /*set_GridCellCheck(obj); //行内快捷键筛选*/

            });
            //#endregion

            //结算方式弹窗
            form.on('submit(btnSearchProc)', function () {
                //页面层-自定义
@@ -524,10 +601,19 @@

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串

                //子表
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        num.push(table.cache["mainTable"][i])
                    }
                }
                //子表序列化
                var sSubStr = JSON.stringify(num);

                var oMain = JSON.stringify(data.field)
                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
                var sBillModeify = oMain + ';' + sSubStr + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
                if (AllowLoadData()) {
                    if (OperationType == "3") {
                        $.ajax({
@@ -561,7 +647,7 @@
                            type: "POST",
                            url: GetWEBURL() + "/Gy_Supplier/AddBill",
                            async: true,
                            data: { "oMain": oMain },
                            data: { "oMain": oMain + ';' + sSubStr },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
@@ -633,6 +719,62 @@
                    }
                });
            }


            //#region è®¡åˆ’表
            function set_GridDelete(obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1)
                            option.data = oldData;//将数据绑定到data上
                            table.render(option);
                            layer.close(index);
                        }
                    });
                }
            }
            //#endregion

            //#region è®¡åˆ’表初始化
            function get_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HPayType', title: '付款阶段', edit: 'text' }     
                        , { field: 'HPayRate', title: '付款比例% ', edit: 'text'}
                        , { field: 'HPayTime', title: '结算周期', edit: 'text' }
                        , { field: 'HPayRemark', title: '备注说明', edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
                }

                var rowdata = [
                    {
                        "HPayType": ""
                        , "HPayRate": "0"
                        , "HPayTime": "0"
                        , "HPayRemark": ""
                    }
                ];
                option.data = rowdata;
                table.render(option);
            }
            //#endregion


            //编辑页面加载
            function set_EditFromGrid() {
                $.ajax({
@@ -682,6 +824,8 @@
                        form.render('select');
                        layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话

                        option.data = d.list[0]["Gy_Supplier_PayPlan"];
                        table.render(option);
                        //table.reload(layTableId, {
                        //    data: ajaxReturnData
                        //});
@@ -695,6 +839,28 @@
            }
            //数据验证
            function AllowLoadData() {

                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式

                //#region å­è¡¨æ ¡éªŒ
                for (var i = 0; i < option.data.length; i++) {

                    //数量格式校验
                    temp = option.data[i]["HPayRate"] + "";
                    if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：付款比例请输入大于0的数字！");
                        return false;
                    }

                    //单价格式校验
                    temp = option.data[i]["HPayTime"] + "";
                    if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：结算周期请输入大于0的数字！");
                        return false;
                    }
                }
                //#endregion

                var HNumber = $("#HNumber").val();
                if (HNumber == null || HNumber == undefined || HNumber == "") {
                    layer.msg("请输入供应商编码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -703,6 +869,15 @@
                var HName = $("#HName").val();
                if (HName == null || HName == undefined || HName == "") {
                    layer.msg("请输入供应商名称", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                var HTaxRate = $("#HTaxRate").val();
                if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
                    layer.msg("请输入增值税率", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (!ref.test(HTaxRate)) {
                    layer.msg("第" + (i + 1) + "行：增值税率请输入大于0的数字！");
                    return false;
                }
                //var HAddress = $("#HAddress").val();
@@ -731,13 +906,12 @@
                    return false;
                }
                var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
                if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "" ) {
                if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "") {
                    layer.msg("请填写正确格式的邮箱", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
                if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "")
                {
                if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "") {
                    layer.msg("请填写正确格式的手机号", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
@@ -804,7 +978,7 @@
            //#endregion

        });
            //以上为layui模块
                //以上为layui模块

    </script>


 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBill_PDA.html

@@ -307,10 +307,7 @@
                                                <tbody id="ProImgByList">
                                                </tbody>
                                            </table>
                                        </div>
                                        <div>
                                            <button class="layui-btn" id="cameraBtn">调用相机</button>
                                        </div>
                                        </div>                                       
                                    </div>
                                </div>
                            </div>