From 535b68c38753020b687fc3a39bf281b77501c103 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 07 十月 2024 12:25:02 +0800
Subject: [PATCH] 流转卡列表添加销售订单过滤；出站汇报单导出转义换行键；流转卡批量打印2.5秒执行一次
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 2 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 41 ++++++++++++++++++++++++++---------------
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 8 ++++++++
4 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 6854431..6c800de 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/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/"; //濂ラ偊
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 0315c7e..6508b7a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/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 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 95414fa..74f02d9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/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 + "%''";
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index e71dcb9..4c2a4f9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/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);
})
--
Gitblit v1.9.1