From 2cf8feaab7eebaee2d66a84689a11395539d725a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 23 九月 2024 15:51:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/Baseset/SRM_OpenTmpList.html | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index 42c44c5..b02e4d3 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -22,6 +22,7 @@
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="ReportPrint">鎶ヨ〃鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
</div>
@@ -56,7 +57,7 @@
var option = [];
var HModName = "SRM_OpenTmpList";
- option={
+ option = {
elem: '#mainTable'
// , url: '/demo/table/user/'
, data: []
@@ -116,7 +117,7 @@
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
//table.reload('mainTable', {
// data: ajaxReturnData
-
+
//});
option.data = ajaxReturnData;
table.render(option);
@@ -174,7 +175,7 @@
type: "GET",
url: GetWEBURL() + "/Open_PrintTem/DelOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "HItemID": OpenTmp },
+ data: { "HItemID": OpenTmp, "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -210,7 +211,7 @@
type: "GET",
url: GetWEBURL() + "/Open_PrintTem/SaveOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName },
+ data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName, "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -236,7 +237,7 @@
element.tabDelete('tabDemo', '2'); //鍒犻櫎
});
- form.on('submit(Select)', function (data) {//閫夋嫨
+ form.on('submit(Select)', function (data) {//鎶ヨ〃鎵撳嵃
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var OpenTmp = data[0].妯℃澘鍚嶇О;
@@ -253,6 +254,7 @@
url = "UpdatePOInStockBillPrintQty"
break;
}
+
//鏇存柊鎵撳嵃鏁伴噺
//$.ajax(
// {
@@ -270,10 +272,24 @@
// }
// });
+
//鍏抽棴褰撳墠绐楀彛
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
+
+ form.on('submit(ReportPrint)', function (data) {//閫夋嫨
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 0) {
+ return layer.msg("璇烽�夋嫨妯＄増!");
+ }
+ parent.ReportPrint(data);
+ //鍏抽棴褰撳墠绐楀彛
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ })
//闅愯棌鍒楄缃�
form.on('submit(HideColumn)', function (data) {
@@ -291,7 +307,7 @@
function get_HideColumn() {
var colName = "";
var contentUrl = "";
- for (var i = 1; i < option.cols[0].length ; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
@@ -302,7 +318,7 @@
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
--
Gitblit v1.9.1