From 6d1eb4d1d542637ef71d29971e14c059c16bb92e Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期五, 06 九月 2024 16:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 293 ++++++++++-----------------------------------------------
1 files changed, 54 insertions(+), 239 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index c900b79..a79c94e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -18,7 +18,14 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <style type="text/css">
+ .layui-table-click {
+ background: #ceedfa;
+ color: black
+ }
+ </style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -54,10 +61,10 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -68,12 +75,6 @@
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block">
@@ -86,6 +87,13 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
</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="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
</div>
<div class="layui-inline">
<div class="layui-row" style="margin-top:5px">
@@ -236,7 +244,6 @@
var sWhere = "";
var option = [];
var optionSub = [];
- var Name = "Cg_POOrderBillWidth";
var HModName = "Cg_POOrderBillQuery";
var HModNameSub = "Cg_POOrderBillQuerySub";
var HBillType = "1102";
@@ -244,11 +251,11 @@
var HModuleType = "1102";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
- //#endregion
+ //#endregion
////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
- //#endregion
+ //#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -269,7 +276,7 @@
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
-
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -364,7 +371,7 @@
};
});
//琛ㄦ牸鐐瑰嚮浜嬩欢
-
+
//閲嶆柊鍚屾鎸夐挳
form.on('submit(btnResCnz)', function (data) {
@@ -404,44 +411,6 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery(table, option,2);
- });
-
- //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
- form.on('submit(Department)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '渚涘簲鍟嗗垪琛�',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/SupplierInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HSupName").val(checkStatus.data[0].HName);
- $("#HSupID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -485,7 +454,7 @@
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(table, option,1)
-
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -523,7 +492,7 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100, totalRow: true }
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, totalRow: true }
- /* 瀹夌憺鏂板瀛楁 begin */
+ /* 瀹夌憺鏂板瀛楁 begin */
, { field: '鍙墦鍗版潯鐮佹暟閲�', title: '鍙墦鍗版潯鐮佹暟閲�', width: 120, totalRow: true}
/* 瀹夌憺鏂板瀛楁 end */
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120, totalRow: true}
@@ -596,12 +565,12 @@
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
]]
-
+
, done: function (res, curr, count) {
soulTable.render(this);
}
};
-
+
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
@@ -642,7 +611,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -666,7 +635,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name=="琛屽叧闂棩鏈�"?"琛屽叧闂汉":data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -681,7 +650,7 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
-
+
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
@@ -725,7 +694,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -830,7 +799,7 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-
+
if (data[0].鐘舵�� == "鍒涘缓") {
$.ajax({
type: "GET",
@@ -850,42 +819,21 @@
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
-
+
}, error: function () {
-
+
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
} else {
layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
-
+
}
-
+
})
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
- }
-
- //棰勮
- function get_ViewReport() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
}
}
@@ -952,7 +900,7 @@
}
}
//#endregion
-
+
//#region 鍙戣捣瀹℃壒
function set_startCheckBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -1157,8 +1105,8 @@
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ //淇敼涓哄姛鍚庡埛鏂板瓙琛ㄧ晫闈�
+ $("tr.layui-table-click").trigger("click");
});
} else {
@@ -1211,117 +1159,6 @@
}
//#endregion
-
- //鑾峰彇鍒楀
- function getColumnsWidth() {
- var result = [];
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- //鑾峰彇鍒楀
- $.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
- async: false,
- type: "Get",
- dataType: "json",
- data: { "colNum": colNum, "Name": Name },
- success: function (data1) {
- if (data1.code == 1) {
- result = data1.data;
- }
- else if (data1.code == -1) {
-
- }
- else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
-
- return result;
- }
- //淇濆瓨鍒楀
- function set_SaveGridColWidth() {
- var arr = [];
- // 鍒楁暟
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- for (var i = 0; i <= colNum; i++) {
- var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
- var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
- if (colName != "" && colName != null) {
- arr.push(colWidth == -1 ? 200 : colWidth);
- }
- }
- arr.unshift(40); //棣栦綅杩藉姞
- $.ajax({
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
- async: false,
- type: "POST",
- dataType: "json",
- data: { "myMap": JSON.stringify(arr), "Name": Name },
- success: function (data1) {
- if (data1.count == 1) {
- layer.alert(data1.Message, { icon: 1 });
- } else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
- else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
- }
- get_FastQuery(table, option);
- }
- //榛樿鍒楀
- function set_DefaultGridColWidth() {
- var arr = [];
- // 鍒楁暟
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- for (var i = 0; i <= colNum; i++) {
- var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
- if (colName != "" && colName != null) {
- arr.push(300); //榛樿瀹藉害200
- }
- }
- arr.unshift(40); //棣栦綅杩藉姞
- $.ajax({
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
- async: false,
- type: "POST",
- dataType: "json",
- data: { "myMap": JSON.stringify(arr), "Name": Name },
- success: function (data1) {
- if (data1.count == 1) {
- layer.alert(data1.Message, { icon: 1 });
-
- } else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
- else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
- }
- get_FastQuery(table, option);
- }
//蹇�熻繃婊�
@@ -1658,7 +1495,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- console.log(titleData)
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < optionSub.cols[0].length - 1; i++) {
@@ -1739,49 +1576,27 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
- //閫変腑琛屾敼鍙橀鑹�
+ //鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //閫変腑琛屾敼鍙橀鑹�
- check_row(obj);
- })
- table.on('row(mainTableSub)', function (obj) {
- var flag = !obj.tr.find(':checkbox:first').prop('checked');
- obj.tr.find(':checkbox').prop('checked', flag);
- if (flag) {
- obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).eq(2).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
- } else {
- obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).eq(2).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ //鍒ゆ柇鏄惁宸茬粡琚�変腑
+ if (obj.tr.find('.layui-form-radioed').length == 0) {
+ //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
}
- //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- layui.each(table.cache.mainTableSub, function (i, l) {
- if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = flag;
- }
- });
+
+
+ })
+ //瀛愯〃鍗曢��
+ table.on('row(mainTableSub)', function (obj) {
+ //鍒ゆ柇鏄惁宸茬粡琚�変腑
+ if (obj.tr.find('.layui-form-radioed').length == 0) {
+ //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
+ }
})
//#endregion
- //#region 鐐瑰嚮琛岄�変腑楂樹寒
- function check_row(obj) {
- var flag = !obj.tr.find(':checkbox:first').prop('checked');
- obj.tr.find(':checkbox').prop('checked', flag);
- if (flag) {
- obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).first().attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
- } else {
- obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).first().attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
- }
- //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- layui.each(table.cache.mainTable, function (i, l) {
- if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = flag;
- }
- });
- }
- //#endregion
+
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
@@ -1860,7 +1675,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+
////鎵ц鏌ヨ鏂规硶
//get_FastQuery();
} else {
--
Gitblit v1.9.1