From 8e9ee3f46270685217e1ad4c82695a562f21a6e1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 22 八月 2025 10:34:06 +0800
Subject: [PATCH] 出站汇报单同步页面，列表修改
---
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 8 ++++----
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html | 33 ++++++++++++++++++++++++---------
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 01edbfe..8965232 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,11 +7,11 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
-/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�
// var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//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 2506fda..902b94e 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"
@@ -730,7 +730,7 @@
}
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- $.get("../../../filterRowTemplate.html", function (data) {
+ $.get("../../filterRowTemplate.html", function (data) {
$("#filter-row").html(data);
ColFilter(); // 閲嶆柊鐢熸垚涓嬫媺閫夐」
layui.form.render(); // 娓叉煋琛ㄥ崟鎺т欢
@@ -2105,13 +2105,13 @@
sWhere += "";
break;
case '0': //鏈鏍�
- sWhere += " and 瀹℃牳浜�=''";
+ sWhere += " and 瀹℃牳浜�=''''";
break;
case '1': //宸插鏍�
- sWhere += " and 瀹℃牳浜�<>''";
+ sWhere += " and 瀹℃牳浜�<>''''";
break;
case '2': //宸插叧闂�
- sWhere += " and 鍏抽棴浜�<>''";
+ sWhere += " and 鍏抽棴浜�<>''''";
default:
}
}
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_StationOutBillSync.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_StationOutBillSync.html"
index 01dc9a8..3c04918 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_StationOutBillSync.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_StationOutBillSync.html"
@@ -41,6 +41,7 @@
<option value="1" selected="selected">鍏ㄩ儴</option>
<option value="2">宸插悓姝�</option>
<option value="3">鏈悓姝�</option>
+ <option value="4">鍚屾澶辫触</option>
</select>
</div>
</div>
@@ -106,6 +107,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InSync" id="btn-InSync"><i class="layui-icon layui-icon-ok-circle"></i>鍚屾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭閿欒淇℃伅</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InSync_Batch" id="btn_InSync_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍚屾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
@@ -136,6 +138,7 @@
var sWhere = "";
var option = [];
var HModName = "Cj_StationOutBillSync"
+ var syncMessage = []//鍚屾鎶ラ敊淇℃伅
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -242,6 +245,10 @@
//鍒楄缃�
case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ table.exportFile(['閿欒淇℃伅'], syncMessage, 'xls');
+ break;
//閫�鍑�
case 'btn-Exit': get_Exit();
break;
@@ -265,7 +272,7 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HWorkBillNo = $("#HWorkBillNo").val();
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
@@ -282,6 +289,9 @@
break;
case "3":
sWhere += " and 鍚屾鐘舵�� = ''";
+ break;
+ case "4":
+ sWhere += " and 鍚屾鐘舵�� = '鍚屾澶辫触'";
break;
}
if (ColName != 0 && Comparator != 0) {
@@ -306,7 +316,7 @@
sWhere += " and " + ColName + " " + com;
}
if (HDate) {
- sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) = '" + HDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) > '" + HDate + "'";
}
if (HWorkBillNo) {
sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
@@ -386,6 +396,7 @@
if (checkStatus.data.length > 0) {
var InterID = '';
var BillNo = '';
+ syncMessage = [];
for (var i = 0; i < data.length; i++) {
InterID=(data[i].hmainid.toString());
BillNo=(data[i].鍗曟嵁鍙�.toString());
@@ -395,15 +406,19 @@
async: true,
data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
+ success: function (data1) {
+ if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ // parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ //});
}
else {
- layer.alert(data.Message, { icon: 5 });
+ let errMessage = [];
+ errMessage.push(data1.Message);
+ syncMessage.push(errMessage);
+ //layer.alert(data1.Message, { icon: 5 });
+
}
},
error: function (err) {
--
Gitblit v1.9.1