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 | 214 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 179 insertions(+), 35 deletions(-)
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index bf28ad3..b02e4d3 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -22,7 +22,9 @@
<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>
</div>
</div>
@@ -45,18 +47,23 @@
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script>
layui.use(['table', 'form', 'layer', 'element'], function () {
var table = layui.table
, form = layui.form
, layer = layui.layer
, element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
- table.render({
+
+ var option = [];
+ var HModName = "SRM_OpenTmpList";
+ option = {
elem: '#mainTable'
// , url: '/demo/table/user/'
, data: []
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , height: 'full-10'
+ , loading: false
, cols: [[
{ type: 'radio' }
, { field: 'HItemID', width: 150, title: 'ID', hide: true }
@@ -64,8 +71,12 @@
, { field: 'HName', width: 150, title: '妯″潡鍚嶇О', hide: true }
, { field: '妯℃澘鍚嶇О', width: 150, title: '妯℃澘鍚嶇О' }
]]
- });
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ };
+ DisPlay_HideColumn();
table.on('row(mainTable)', function (obj) {////娉細test鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//閫変腑琛屾牱寮�
@@ -88,6 +99,7 @@
var linterid = params[params[0]];
var MyMsg = params[params[1]];
var Type = params[params[2]];
+
//var lentryid = params[params[1]];
///鍔犺浇鏄剧ず鏁版嵁
function RoadList(Where) {
@@ -103,14 +115,12 @@
//data: { "Value": Value },
success: function (result) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , loading: false
- , done: function (index, res) {
+ //table.reload('mainTable', {
+ // data: ajaxReturnData
- }
- });
+ //});
+ option.data = ajaxReturnData;
+ table.render(option);
},
error: function (result) {
console.log(result);
@@ -165,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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -182,9 +192,11 @@
}
});
});
+
form.on('submit(Reload)', function (data) {//鍒锋柊
RoadList(Type);
});
+
form.on('submit(Save)', function (obj) {//淇濆瓨
var Tmp = obj.field;
if (Tmp.HName == '') {
@@ -199,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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -219,52 +231,71 @@
}
});
});
+
form.on('submit(Cancel)', function (data) {//鍙栨秷
element.tabChange('tabDemo', '1');
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].妯℃澘鍚嶇О;
+ console.log(linterid.toString());
//鎵撳紑鎵撳嵃妯℃澘
window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
//鏍规嵁妯″潡鑾峰彇WEBAPI閾炬帴
var url = "";
switch (Type) {
- case "HBarCodePrint":
- url = "UpdateBarcodePrintQty"
+ case "HGy_BarCodeBill": //HBarCodePrint
+ url = "/Sc_BarCode/UpdateBarcodePrintQty"
break;
case "HPOInStockBill":
url = "UpdatePOInStockBillPrintQty"
break;
}
+
//鏇存柊鎵撳嵃鏁伴噺
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": MyMsg },
- dataType: "json",
- success: function (data) {
- //if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // layer.msg(data.Message, { icon: 1 });
- //}
- //else {
- // layer.msg(data.Message, { icon: 5 });
- //}
- layer.closeAll("loading");
- },
- error: function (err) {
- parent.f_alert("閿欒:" + err);
- }
- });
+ //$.ajax(
+ // {
+ // type: "POST",
+ // url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // async: true,
+ // data: { "msg": MyMsg },
+ // dataType: "json",
+ // contentType: 'application/json',
+ // success: function (data) {
+ // layer.closeAll("loading");
+ // },
+ // error: function (err) {
+ // parent.f_alert("閿欒:" + err);
+ // }
+ // });
+
//鍏抽棴褰撳墠绐楀彛
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) {
+ get_HideColumn();
+ });
+
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
@@ -272,6 +303,119 @@
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ 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" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [""];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
});
</script>
--
Gitblit v1.9.1