wtt
2024-12-17 c92da7cfc9423d9f39b9968f2638bb2f206af57d
 销售出库单,发货通知单,工程项目添加子类型
6个文件已修改
206 ■■■■ 已修改文件
WebTM/views/项目管理/工程项目/PM_ProjectBill.html 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill.html
@@ -84,6 +84,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                                <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -140,6 +141,22 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">结算方<!--<label style="color:red"> * </label>--></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </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" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
@@ -455,24 +472,6 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">结算方<!--<label style="color:red"> * </label>--></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </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" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
                                            </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" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney" value="0">
@@ -484,6 +483,9 @@
                                                <input type="text" class="layui-input" lay-verify="HProMoney" name="HProMoney" id="HProMoney" value="0">
                                            </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;">
@@ -496,8 +498,6 @@
                                                <input type="text" class="layui-input" lay-verify="HOtherMoney" name="HOtherMoney" id="HOtherMoney" value="0">
                                            </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;">
@@ -510,6 +510,9 @@
                                                <input type="text" class="layui-input" lay-verify="HDepDays" name="HDepDays" id="HDepDays" value="0">
                                            </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;">
@@ -970,11 +973,23 @@
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var HBillSubType = (decodeURI(params[params[3]]) != "工程类" && decodeURI(params[params[3]]) != "任务类") ? "项目类" : decodeURI(params[params[3]]);
            $("#HBillSubType").val(HBillSubType);
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //根据子类型隐藏页签
            $('li').show();
            if (HBillSubType == "工程类") {
                $('li[lay-id="3"]').hide();
                $('li[lay-id="4"]').hide();
            } else if (HBillSubType == "任务类") {
                $('li[lay-id="2"]').hide();
                $('li[lay-id="3"]').hide();
            } else {
                $('li[lay-id="2"]').hide();
                $('li[lay-id="4"]').hide();
            }
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "4750";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -2209,7 +2224,19 @@
                        var tableMain = result.data[0];
                        var tableSub = result.data[1];
                        var tableSub_Emp = result.data[2];
                        HBillSubType = tableMain[0]["HBillSubType"];
                        //根据子类型隐藏页签
                        $('li').show();
                        if (HBillSubType == "工程类") {
                            $('li[lay-id="3"]').hide();
                            $('li[lay-id="4"]').hide();
                        } else if (HBillSubType == "任务类") {
                            $('li[lay-id="2"]').hide();
                            $('li[lay-id="3"]').hide();
                        } else {
                            $('li[lay-id="2"]').hide();
                            $('li[lay-id="4"]').hide();
                        }
                        //主表 èµ‹å€¼
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HInterID": tableMain[0]["HInterID"]
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillList.html
@@ -175,7 +175,7 @@
            var params = getUrlVars();
            var UserName = params[params[2]];
            UserName = decodeURI(UserName);//对URI è¿›è¡Œè§£ç 
            var HBillSubType="项目类";
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -316,11 +316,7 @@
                //初始化组织
                Organ();
                //查询
                if (addSWhereByOpenType()) {                        //addSWhereByOpenType()方法判断是否其它页面打开本页面,若是则处理过滤条件,并返回true
                    get_FastQuery(2);
                } else {
                    get_FastQuery(1);
                }
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -475,7 +471,7 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (number == 1) {
                if (addSWhereByOpenType()) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
@@ -499,6 +495,7 @@
                        sWhere += " and é¡¹ç›®ç»ç† = '" + UserName + "'  and  å•据状态 != '已关闭' ";
                    }
                }
                addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -527,7 +524,7 @@
                    , area: ['100%', '100%']
                    , title: '新增' + HPageTitle
                    , shift: 0//弹出动画
                    , content: '../../项目管理/工程项目/PM_ProjectBill.html?OperationType=1&linterid=0&HSouceBillType='
                    , content: '../../项目管理/工程项目/PM_ProjectBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillSubType=' + HBillSubType
                    ,btn: ['确定'],
                    // æŒ‰é’®1 çš„回调
                    btn1: function (index, layero, that) {
@@ -550,7 +547,7 @@
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle
                        , shift: 0//弹出动画
                        , content: '../../项目管理/工程项目/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../../项目管理/工程项目/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillSubType=' + HBillSubType
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
@@ -890,7 +887,11 @@
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol.length <= i) {
                                    break;
                                }
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
@@ -990,8 +991,14 @@
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开  
                var HOrgID = params[params[1]];
                HBillSubType = (decodeURI(params[params[2]]) != "工程类" && decodeURI(params[params[2]]) != "任务类") ? "项目类" : decodeURI(params[params[2]]);//若解码后type不为工程或任务强制变为项目
                if (openType == 2) {
                    sWhere += " and ISNULL(关闭人,'') = '' and ISNULL(作废人,'') = '' ";
                    if (HBillSubType == "工程类") {
                        sWhere += " and å•据子类型='工程类' "
                    } else if (HBillSubType == "任务类") {
                        sWhere += " and å•据子类型='任务类' "
                    }
                    $("#HOrgID").val(HOrgID);
                    form.render("select");
                    return true;
@@ -1038,11 +1045,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            if (addSWhereByOpenType()) {                        //addSWhereByOpenType()方法判断是否其它页面打开本页面,若是则处理过滤条件,并返回true
                                get_FastQuery(2);
                            } else {
                                get_FastQuery(1);
                            }
                            get_FastQuery();
                            form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html
@@ -69,6 +69,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -601,6 +602,8 @@
                var HSouceBillType = params[params[2]];//源单类型
                var closeType = params[params[3]];//客户应收账款明细 åŒå‡»å¼¹çª—弹出只能查看不能编辑  ç¦ç”¨æŒ‰é’®
            }
            var HBillSubType = getParams("HBillSubType") == "" ? "1205" : getParams("HBillSubType");//单据子类型
            $("#HBillSubType").val(HBillSubType);
            //#endregion
            //初始化子表
@@ -4222,6 +4225,19 @@
                });
            }
            //#endregion
            //将url参数中的中文乱码重新转换成中文
            function getParams(key) {
                var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
                //如果地址栏中出现中文则进行编码
                var r = encodeURI(window.location.search).substr(1).match(reg);
                if (r != null) {
                    //将中文编码的字符重新变成中文
                    return decodeURI(unescape(r[2]));
                }
                return "";
            };
            //#endregion
@@ -4369,6 +4385,9 @@
                        $("#HCreditRating_Now").val(data.HCreditRating_Now);
                        $("#HLinkMan").val(data.HLinkMan);
                        $("#HLinkPhone").val(data.HLinkPhone);
                        $("#HCurID").val(data.HCurID);
                        $("#HCurName").val(data.HCurName);
                        $("#HExRate").val(data.HExRate);
                        //设置默认货币信息
                        if (data.HCurID == 0) {
                            $("#HCurID").val(1);
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -96,6 +96,17 @@
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">子类型</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="" disabled>
                                                    <option value="0" selected="selected"></option>
                                                    <option value="工程类">工程类</option>
                                                    <option value="任务类">任务类</option>
                                                </select>
                                            </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
@@ -252,7 +263,7 @@
            var HModName = "Kf_SellOutBillList";
            var HBillType = "1205";
            var HBillSubType = "";
            var ins;                        //用于导出excel
            //#endregion
@@ -985,7 +996,13 @@
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HProjectNumber) {
                    sWhere += " and é¡¹ç›®ç¼–码 like '%" + HProjectNumber + "%'";
                    if (HBillSubType == "工程类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='工程类'"
                    } else if (HBillSubType == "任务类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='任务类'"
                    }
                }
                if (HCusID) {
                    sWhere += " and å®¢æˆ· like '%" + HCusID + "%'";
@@ -1080,7 +1097,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../../领料发货/销售出库/Kf_SellOutBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                    content: '../../领料发货/销售出库/Kf_SellOutBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType,
                    end: function () {
                        //刷新页面,
                        $("#btnSearch").trigger('click');
@@ -1107,7 +1124,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../领料发货/销售出库/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                        , content: '../../领料发货/销售出库/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType
                        , resize: false,
                        end: function () {
                            //刷新页面,
@@ -1972,14 +1989,32 @@
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                HBillSubType = getParams("HBillSubType");
                var addSWhere = "";
                if (openType == 2) {
                    addSWhere = " and çŠ¶æ€ = '已审核' and HOrgID = " + HOrgID;
                    if (HBillSubType == "工程类") {
                        addSWhere += "and HBillSubType='工程类'"
                    } else if (HBillSubType == "任务类") {
                        addSWhere += "and HBillSubType='任务类'"
                    }
                }
                return addSWhere;
            }
            //将url参数中的中文乱码重新转换成中文
            function getParams(key) {
                var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
                //如果地址栏中出现中文则进行编码
                var r = encodeURI(window.location.search).substr(1).match(reg);
                if (r != null) {
                    //将中文编码的字符重新变成中文
                    return decodeURI(unescape(r[2]));
                }
                return "";
            };
            //#endregion
            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html
@@ -74,6 +74,7 @@
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
                                                <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -406,7 +407,8 @@
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
            }
            var HBillSubType = getParams("HBillSubType") == "" ? "1201" : getParams("HBillSubType");//单据子类型
            $("#HBillSubType").val(HBillSubType);
           //#region èŽ·å–æœ€å¤§å•æ®å·
@@ -3163,6 +3165,17 @@
            //#endregion
            //将url参数中的中文乱码重新转换成中文
            function getParams(key) {
                var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
                //如果地址栏中出现中文则进行编码
                var r = encodeURI(window.location.search).substr(1).match(reg);
                if (r != null) {
                    //将中文编码的字符重新变成中文
                    return decodeURI(unescape(r[2]));
                }
                return "";
            };
            //以上是layui模块
        });
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html
@@ -258,7 +258,7 @@
            var sWhere = "";
            var option = [];
            var HModName = "Kf_POStockInBillList";
            var HBillSubType = "";
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "1201";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -681,7 +681,7 @@
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../../验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            content: '../../验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType,
                            end: function () {
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
@@ -927,6 +927,11 @@
                }
                if (HProjectNumber) {
                    sWhere += " and é¡¹ç›®ä»£ç  like '%" + HProjectNumber + "%'";
                    if (HBillSubType == "工程类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='工程类'"
                    } else if (HBillSubType == "任务类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='任务类'"
                    }
                }
                if (HSupID) {
                    sWhere += " and ä¾›åº”商 like '%" + HSupID + "%'";
@@ -1636,14 +1641,30 @@
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                HBillSubType = getParams("HBillSubType");
                var addSWhere = "";
                if (openType == 2) {
                    addSWhere = " and çŠ¶æ€ = '已审核' and è¡ŒçŠ¶æ€ = '' and HOrgID = " + HOrgID;
                    if (HBillSubType == "工程类") {
                        addSWhere += "and HBillSubType='工程类'"
                    } else if (HBillSubType == "任务类") {
                        addSWhere += "and HBillSubType='任务类'"
                    }
                }
                return addSWhere;
            }
            //将url参数中的中文乱码重新转换成中文
            function getParams(key) {
                var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
                //如果地址栏中出现中文则进行编码
                var r = encodeURI(window.location.search).substr(1).match(reg);
                if (r != null) {
                    //将中文编码的字符重新变成中文
                    return decodeURI(unescape(r[2]));
                }
                return "";
            };
            //#endregion