From e63e2d1d2b0354896dc6aaea0e3a13cdb25f7eed Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 14 十月 2024 13:41:34 +0800
Subject: [PATCH] 添康到货确认模块只传单据id
---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 9 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index f73fbf6..e5e9da4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -34,6 +34,7 @@
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="ClearBill" id="ClearBill">鍏ㄦ竻</button>
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Del" id="Del">鍒犻櫎</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
@@ -63,6 +64,12 @@
<label class="layui-form-label" style="width: 85px;">鍒楀</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">榛樿鍒嗛〉</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HPageSize" name="HPageSize" id="HPageSize">
</div>
</div>
</div>
@@ -112,6 +119,12 @@
<input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
+<!--澶嶉�夋 鏄惁缁熻琛�-->
+<script type="text/html" id="IsTotalRow">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="IsTotalRow" lay-filter="IsTotalRow" id="IsTotalRow{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+</script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -135,7 +148,12 @@
var params = getUrlVars();
var HModName = params[params[0]]; //妯″潡鍚嶇О
var colName = params[params[1]]; //鍒楀悕
+ var colTitleName = params[params[2]]; //鍒楀埆鍚�
+ if (colTitleName == undefined) {
+ colTitleName = "";
+ }
colName = decodeURI(colName);//瀵筓RI 杩涜瑙ｇ爜
+ colTitleName = decodeURI(colTitleName);
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -167,6 +185,19 @@
});
});
+ //鏄惁缁熻
+ form.on('checkbox(IsTotalRow)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.IsTotalRow = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
set_AddNew(data);
@@ -195,6 +226,11 @@
Pub_Close(1);
})
+ //鍒犻櫎
+ form.on('submit(Del)', function () {
+ get_Del();
+ })
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -215,25 +251,30 @@
success: function (data1) {
var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
-
+ var dataCol = [];
+
+ if (data1.data.length != 0) {
+ //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+ }
+
colNames = colName.split(',');
- if (data1.data.length != 0 && data1.data.length == colNames.length) {
+ if (data1.data.length != 0 && dataCol.length == colNames.length) {
//鍐荤粨鍒�
$("#HFixCols").val(data1.data[0].HFixCols);
//瀛椾綋澶у皬
$("#HFontSize").val(data1.data[0].HFontSize);
//鍒楀
$("#HColumnWidth").val(data1.data[0].HColumnWidth);
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
- dataCol = data1.data[0].HGridString.split(',');
+ //榛樿鍒嗛〉
+ $("#HPageSize").val(data1.data[0].HPageSize);
//琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
var dataCols = dataCol[i].split('|');
- cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3] })
+ var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
+ cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
}
option.data = cols;
table.render(option);
@@ -244,15 +285,19 @@
if (dataCols[1] == 1) {
$("#IsHide" + (i + 1)).attr("checked", true);
}
+ if (dataCols[6] == 1) {
+ $("#IsTotalRow" + (i + 1)).attr("checked", true);
+ }
$('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
}
form.render('checkbox');
form.render('select');
layer.close(ajaxLoad);
} else {
+ var colTitleNames = colTitleName.split(',');
//榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
- cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
}
option.data = cols;
table.render(option);
@@ -260,6 +305,7 @@
//榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 椤甸潰澶氶�夋 涓嬫媺妗� 閲嶆柊娓叉煋
for (var i = 0; i < colNames.length; i++) {
$('#IsHide' + (i + 1)).prop("checked", false);
+ $('#IsTotalRow' + (i + 1)).prop("checked", false);
$('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
}
form.render('checkbox');
@@ -285,7 +331,10 @@
{ field: 'ColumnName', title: '鍒楀悕', width: 100 }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
- , { field: 'ColumnWidth', title: '鍒楀', width: 100,edit: 'text' }
+ , { field: 'ColumnWidth', title: '鍒楀', width: 100, edit: 'text' }
+ , { field: 'ColumnName_Other', title: '鍒悕', width: 120, edit: 'text' }
+ , { field: 'ColumnName_real', title: '鍒悕瀵瑰簲鍒楀悕', width: 120, edit: 'text', hide: "true" }
+ , { field: 'IsTotalRow', title: '鏄惁缁熻', width: 100, templet:'#IsTotalRow' }
]]
};
}
@@ -298,6 +347,16 @@
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ //榛樿鍒嗛〉
+ var HPageSize = $("#HPageSize").val();
+ if (HPageSize != "") {
+ var nums = /^[0-9]+?[0-9]*$/;
+ if (!nums.test(HPageSize)) {
+ layer.msg("榛樿鍒嗛〉涓嶄负姝ｆ暣鏁�!")
+ return false;
}
}
@@ -342,6 +401,32 @@
return vars;
}
+ //鍒犻櫎
+ function get_Del() {
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/DelgrdAlignmentWMES',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
//#endregion
--
Gitblit v1.9.1