From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 213 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
index 58e87f1..418bbab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
@@ -40,6 +40,18 @@
<input type="date" class="layui-input" id="HDate1">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSource" id="HSource">
+ </div>
+ </div>
<!--<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-block">
@@ -72,24 +84,20 @@
<span>鍏朵粬鏉′欢></span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
+
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -125,11 +133,13 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+
+
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
//#endregion
-
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
@@ -143,6 +153,7 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -153,20 +164,25 @@
break;
case 'btn-Delete': set_DeleteBill();
break;
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
//瀹℃牳鎸夐挳
case 'btn-Audit': set_CheckBill();
break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_AbandonCheck();
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(2);
break;
};
});
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
var ajaxLoad = layer.load();
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HSource = $("#HSource").val();//鐢熶骇璧勬簮
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
@@ -175,6 +191,9 @@
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HSource) {
+ sWhere += " and 璧勬簮浠ｇ爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
}
$.ajax({
url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
@@ -206,9 +225,10 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSource").val("");//鐢熶骇璧勬簮
$("#btnSearch").click();
});
//#endregion
@@ -224,10 +244,12 @@
get_Display();
}
-
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -240,6 +262,7 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+ , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 115 }
@@ -290,7 +313,6 @@
//鏂板
function set_AddNew()
{
- alert("aa");
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -318,6 +340,12 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1")
+ {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -350,12 +378,17 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+ return false;
+ }
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
+ data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -379,6 +412,12 @@
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
+ }
+
+ //鍒锋柊
+ function set_Refresh()
+ {
+ $("#btnSearch").click();
}
//瀹℃牳
@@ -453,11 +492,168 @@
}
+
//#endregion
+
+
+ table.on('toolbar(mainTable)', function (obj0) {
+ var othis = $(this)
+ , events = othis.attr('lay-event')
+ , openPanel = function (sets) {
+ var list = $(sets.list)
+ , panel = $('<ul class="layui-table-tool-panel"></ul>');
+ panel.html(list);
+ };
+ switch (events) {
+ case 'LAYTABLE_COLS': //绛涢�夊垪
+ openPanel({
+ list: function () {
+
+ }()
+ , done: function () {
+ form.on('checkbox(LAY_TABLE_TOOL_COLS)', function (obj) {
+ console.log("a");
+ var othis = $(obj.elem)
+ , checked = this.checked
+ , key = othis.data('key')
+ , parentKey = othis.data('parentkey');
+
+ layui.each(options.cols, function (i1, item1) {
+ layui.each(item1, function (i2, item2) {
+ if (i1 + '-' + i2 === key) {
+ var hide = item2.hide;
+
+ //鍚屾鍕鹃�夊垪鐨� hide 鍊煎拰闅愯棌鏍峰紡
+ item2.hide = !checked;
+ that.elem.find('*[data-key="' + options.index + '-' + key + '"]')
+ [checked ? 'removeClass' : 'addClass'](HIDE);
+
+ //鏍规嵁鍒楃殑鏄剧ず闅愯棌锛屽悓姝ュ绾ц〃澶寸殑鐖剁骇鐩稿叧灞炴�у��
+ if (hide != item2.hide) {
+ that.setParentCol(!checked, parentKey);
+ }
+
+ //閲嶆柊閫傞厤灏哄
+ that.resize();
+ }
+ });
+ });
+ });
+ }
+ });
+ break;
+ };
+ });
+
+
+ form.on('checkbox(LAY_TABLE_TOOL_COLS)', function (obj) {
+ console.log("a");
+ var othis = $(obj.elem)
+ , checked = this.checked
+ , title = this.title
+ , value = this.value
+ , key = othis.data('key')
+ , parentKey = othis.data('parentkey');
+ console.log(title, value, checked, key, parentKey);
+
+ layui.each(option.cols, function (i1, item1) {
+ layui.each(item1, function (i2, item2) {
+ //console.log(item1, item2);
+ if (i1 + '-' + i2 === key) {
+ var hide = item2.hide;
+ //鍚屾鍕鹃�夊垪鐨� hide 鍊煎拰闅愯棌鏍峰紡
+ item2.hide = !checked;
+ //layui.elem.find('*[data-key="' + options.index + '-' + key + '"]')
+ //[checked ? 'removeClass' : 'addClass'](HIDE);
+
+
+ }
+
+ });
+ });
+ });
+ //宸ュ叿鏍忔搷浣滀簨浠�
+ //table.on('click', '*[lay-event]', function (e) {
+ // var othis = $(this)
+ // , events = othis.attr('lay-event')
+ // , openPanel = function (sets) {
+ // var list = $(sets.list)
+ // , panel = $('<ul class="layui-table-tool-panel"></ul>');
+
+ // panel.html(list);
+ // };
+
+ // switch (events) {
+ // case 'LAYTABLE_COLS': //绛涢�夊垪
+ // openPanel({
+ // list: function () {
+ // var lis = [];
+ // that.eachCols(function (i, item) {
+ // if (item.field && item.type == 'normal') {
+ // lis.push('<li><input type="checkbox" name="' + item.field + '" data-key="' + item.key + '" data-parentkey="' + (item.parentKey || '') + '" lay-skin="primary" ' + (item.hide ? '' : 'checked') + ' title="' + (item.title || item.field) + '" lay-filter="LAY_TABLE_TOOL_COLS"></li>');
+ // }
+ // });
+ // return lis.join('');
+ // }()
+ // , done: function () {
+ // form.on('checkbox(LAY_TABLE_TOOL_COLS)', function (obj) {
+ // var othis = $(obj.elem)
+ // , checked = this.checked
+ // , key = othis.data('key')
+ // , parentKey = othis.data('parentkey');
+
+ // layui.each(options.cols, function (i1, item1) {
+ // layui.each(item1, function (i2, item2) {
+ // if (i1 + '-' + i2 === key) {
+ // var hide = item2.hide;
+
+ // //鍚屾鍕鹃�夊垪鐨� hide 鍊煎拰闅愯棌鏍峰紡
+ // item2.hide = !checked;
+ // that.elem.find('*[data-key="' + options.index + '-' + key + '"]')
+ // [checked ? 'removeClass' : 'addClass'](HIDE);
+
+ // //鏍规嵁鍒楃殑鏄剧ず闅愯棌锛屽悓姝ュ绾ц〃澶寸殑鐖剁骇鐩稿叧灞炴�у��
+ // if (hide != item2.hide) {
+ // that.setParentCol(!checked, parentKey);
+ // }
+
+ // //閲嶆柊閫傞厤灏哄
+ // that.resize();
+ // }
+ // });
+ // });
+ // });
+ // }
+ // });
+ // break;
+ // }
+ //});
+
+ //鐩戝惉澶村伐鍏锋爮
+ //table.on('toolbar(mainTable)', function (obj) {
+ // console.log(obj);
+ // if (obj.event === 'LAYTABLE_COLS')
+ // {
+
+ // }
+ // //if (obj.event === 'refresh') {
+ // // reloadTable();
+ // //}
+ // //else if (obj.event === 'LAYTABLE_EXCEL') {
+ // // var formSelect = form.val('searchForm');
+ // // $.ajax({
+ // // type: 'get'
+ // // , url: ctx + '/inventoryReport/getInventoryHistoryList'
+ // // , data: formSelect
+ // // , success: function (res) {
+ // // table.exportFile('tableList', res.data, 'xls');
+ // // }
+ // // });
+ // //}
+ //});
//浠ヤ笂鏄痩ayui妯″潡
});
-
--
Gitblit v1.9.1