流转卡列表添加销售订单过滤；出站汇报单导出转义换行键；流转卡批量打印2.5秒执行一次

yusijie

2024-10-07 535b68c38753020b687fc3a39bf281b77501c103

流转卡列表添加销售订单过滤；出站汇报单导出转义换行键；流转卡批量打印2.5秒执行一次

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,7 +10,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2126,6 +2126,14 @@
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option.data
                            data.forEach((item) => {
                                // å¦‚果某个字段的值太长，需要去除换行符
                                if (item.规格型号.length > 0) {  // å‡è®¾å­—段名为field
                                    item.规格型号 = item.规格型号.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            });

                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -34,18 +34,11 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">打印状态</label>
                                    <div class="layui-input-block" style="width:100px">
                                        <select name="city" lay-verify="required" id="SHPrintQty" class="ForFilteringSchemes">
                                            <option value="全部">全部</option>
                                            <option value="未打印">未打印</option>
                                            <option value="已打印">已打印</option>
                                        </select>
                                    <label class="layui-form-label">销售订单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <input type="checkbox" id="wybj" name="wybj" title="只显示委外" lay-filter="wybj" lay-skin="primary" class="ForFilteringSchemes">
                                </div>
                                </div>                               
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
@@ -74,12 +67,19 @@
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-row" style="margin-top:10px;">                                      
                                        <div class="layui-inline">
                                            <label class="layui-form-label">订单跟踪号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HOrderProcNO" id="HOrderProcNO">
                                            <label class="layui-form-label">打印状态</label>
                                            <div class="layui-input-block" style="width:100px">
                                                <select name="city" lay-verify="required" id="SHPrintQty" class="ForFilteringSchemes">
                                                    <option value="全部">全部</option>
                                                    <option value="未打印">未打印</option>
                                                    <option value="已打印">已打印</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="checkbox" id="wybj" name="wybj" title="只显示委外" lay-filter="wybj" lay-skin="primary" class="ForFilteringSchemes">
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">任务单号</label>
@@ -122,6 +122,12 @@

                                                    <!--动态渲染车间-->
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">订单跟踪号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HOrderProcNO" id="HOrderProcNO">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -674,6 +680,7 @@
                $("#HProject").val("");//项目号
                $("#HBatchNo").val("");//批次号
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#HSeOrderBillNo").val("");//销售订单号                
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
                $("#ColContent").val("");
@@ -702,6 +709,7 @@
                var HDate1 = $("#HDate1").val();//结束日期
                var HProject = $("#HProject").val();//项目号
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
                var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号                
                var HWorkBillNo = $("#HWorkBillNo").val();
                var SHname = $("#SHname").val();//物料|子件名称|子件规格
                var HBillNo = $("#HBillNo").val();//单据号
@@ -810,6 +818,9 @@
                if (HOrderProcNO) {
                    sWhere += " and è®¢å•è·Ÿè¸ªå· like ''%" + HOrderProcNO + "%''";
                }
                if (HSeOrderBillNo) {
                    sWhere += " and é”€å”®è®¢å•å· like ''%" + HSeOrderBillNo + "%''";
                }                
                if (SHname) {
                    sWhere += " and  å­ä»¶ä»£ç  like ''%" + SHname + "%''";
                }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html

@@ -613,7 +613,7 @@
                    layer.confirm("确认要批量打印吗?", { title: "确认" }, function (index) {
                        time = setInterval(function () {
                            dy_PL(data);
                        }, 1000);
                        }, 2500);
                        //关闭当前frame
                        layer.close(index);
                    })