From ed0dd78ab0041fff33a8ef490fc36123f02fd0c3 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 02 九月 2021 16:14:36 +0800
Subject: [PATCH] 设备点检记录表+编辑点检记录表
---
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 10
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 130 ++
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 46
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 25
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 15
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 286 ++----
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 375 +++++--
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 74
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 22
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 90 +
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 23
WebTM/views/index.html | 3
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 47
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 22
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html | 4
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 20
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 6
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 6
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 9
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 24
WebTM/views/基础资料/公用基础资料/Gy_PropertyList.html | 20
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillList.html | 2
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 2
WebTM/views/车间管理/工序进站接收单/Sc_StationInBill_Mul.html | 709 +++++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 363 ++++--
WebTM/WebTM.csproj | 1
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 412 +++-----
28 files changed, 1,833 insertions(+), 915 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b0e17c5..3469d44 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -680,6 +680,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1b98a2f..780d995 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -353,7 +353,8 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗＄淮鎶�</a></dd>
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曠淮鎶�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曠淮鎶�</a></dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
index 9f2660b..5f8d9f3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
@@ -148,8 +148,8 @@
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
- alert(hID);
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ //alert(hID);
+ // 鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "GetGy_UnitDetail",
type: "GET",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index f8be730..4da19e4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -231,26 +231,34 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var ItemID = data[0].HItemID.toString();
- var ajaxLoad = layer.load();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
url: GetWEBURL() + 'DeltetGy_Department',
type: "GET",
data: { "HItemID": ItemID },
success: function (result) {
+ console.log('gouba' + result);
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- get_Display(sWhere);
- layer.close(ajaxLoad);
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
} else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
}
}, error: function () {
- layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
});
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 255b6cf..f5f5833 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -22,11 +22,7 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鑱屽憳浠ｇ爜</label>
<div class="layui-input-block">
@@ -52,6 +48,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></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="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
@@ -60,8 +57,7 @@
</script>
</form>
</div>
- </div>
- </div>
+ </div>/ </div>
</div>x
<script>
@@ -109,6 +105,9 @@
break;
case 'btn-Delete':
set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
break;
//瀹℃牳鎸夐挳
case 'btn-Audit':
@@ -169,6 +168,8 @@
//#endregion
+
+
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
//鍒濆鍖栫綉鏍�
@@ -182,7 +183,7 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', sort: true }
+ , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', sort: true, width: 175 }
, { field: '鑱屽憳鍚嶇О', title: '鑱屽憳鍚嶇О', sort: true }
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
, { field: 'HDeptID', title: 'HDeptID', hide: true }
@@ -341,7 +342,15 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
}
}
+
//#endregion
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index baafcb7..46f67f9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -144,10 +144,7 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#HModel").val("");
- $("#HOrgName").val("");
+ set_ClearQuery();
//$("#btnSearch").click();
});
//#endregion
@@ -201,6 +198,16 @@
}
//#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#HModel").val("");
+ $("#HOrgName").val("");
+ sWhere = "";
+ }
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
var wait = layer.load();//閬僵
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
index df51c4f..9ae4c78 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
@@ -19,23 +19,19 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
<div class="layui-inline">
- <label class="layui-form-label">杈呭姪灞炴�т唬鐮�</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴�т唬鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">杈呭姪灞炴�у悕绉�</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴�у悕绉�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+
<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>
@@ -137,6 +133,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad = layer.load();
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
if (HNumber) {
@@ -154,11 +151,14 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index add8e6e..c7bde75 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -19,51 +19,57 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
+
+ <!--<div style="padding: 10px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
+ </div>-->
+ <!--<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">-->
+ <!--<div class="layui-row" style="padding:10px 0">-->
+ <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
+ <div id="treeunit" lay-filter="treeunit" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
+ </div>-->
+ <!--<div class="layui-col-xs9 layui-inline">-->
+ <!--<div class="layui-row">-->
+ <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" name="HNumber" id="HNumber">
</div>
</div>
- <!--<div style="padding: 10px;">
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
+ <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" name="HName" id="HName">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">璁￠噺鍗曚綅浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁￠噺鍗曚綅鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
</div>-->
- <!--<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">-->
- <!--<div class="layui-row" style="padding:10px 0">-->
- <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
- <div id="treeunit" lay-filter="treeunit" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="layui-col-xs9 layui-inline">-->
- <!--<div class="layui-row">-->
- <div class="layui-inline">
- <label class="layui-form-label">璁￠噺鍗曚綅浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁￠噺鍗曚綅鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <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>
- <!--</div>-->
- <!--<div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
-
- </div>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
<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>
+ <!--</div>-->
+ <!--<div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+
+ </div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -240,6 +246,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad = layer.load();
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
if (HNumber) {
@@ -256,11 +263,14 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 8dc1416..e9492f7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -261,26 +261,35 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var ItemID = data[0].HItemID.toString();
- var ajaxLoad = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + 'DeltetGy_Warehouse',
- type: "GET",
- data: { "HItemID": ItemID },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- get_Display(sWhere);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_Warehouse',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
+
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
index 15df35c..a99321f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
@@ -8,11 +8,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style media="screen">
- /*.custom-tree-item-clicked {
- color: #FC9003
- }*/
- </style>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -21,103 +21,44 @@
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
- <!--<div class="layui-collapse">
- <div class="layui-colla-item">-->
- <!--<div style="padding: 10px;">-->
- <!--<div class="layui-col-xs2">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
-
- <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- </div>-->
-
- <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs12 layui-inline" >
- <!--<div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>-->
- </div>
- <div class="layui-col-xs12 layui-inline">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- </div>
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <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" name="HNumber" id="HNumber">
</div>
</div>
-
- <div class="layui-row layui-form-item">
- <!--<div class="layui-inline">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <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>
- </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" name="HName" id="HName">
+ </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="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <!--<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" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
- </script>
- </form>
+ </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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
</div>
</div>
</div>
</div>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
-
-
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <!--<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>-->
<script>
+
var treeCkData = { id: 0 };
var TagId = "";
var TagParentId = "";
@@ -139,6 +80,7 @@
, tree = layui.tree
, util = layui.util
var sWhere = "";
+ var option = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -153,8 +95,23 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //娴忚
+ case 'get_PrintReport': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
break;
};
});
@@ -163,9 +120,7 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- //$("#btnSearch").click();
+ set_ClearQuery();
});
//#endregion
@@ -174,59 +129,60 @@
get_FastQuery();
});
//#endregion
- //#region 淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
- if (TagId != "") {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫宸ヤ綔涓績'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- else {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
- TagParentId = data[0].ParentID.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫宸ヤ綔涓績'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- });
+ ////#region 淇敼鎸夐挳
+ //form.on('submit(btnModify)', function (data) {
+ // if (TagId != "") {
+ // layer.open({
+ // type: 2
+ // , area: ['50%', '50%']
+ // , title: '缂栬緫宸ヤ綔涓績'
+ // , closeBtn: 1
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+ // , resize: false,
+ // end: function () {
+ // //鍒锋柊椤甸潰,
+ // location.reload();
+ // }
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ // }
+ // else {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var hID = data[0].HItemID.toString();
+ // TagParentId = data[0].ParentID.toString();
+ // //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ // layer.open({
+ // type: 2
+ // , area: ['50%', '50%']
+ // , title: '缂栬緫宸ヤ綔涓績'
+ // , closeBtn: 1
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+ // , resize: false,
+ // end: function () {
+ // //鍒锋柊椤甸潰,
+ // location.reload();
+ // }
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+
+ // } else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ // }
+ // }
+ //});
//#endregion
//#endregion
@@ -309,30 +265,28 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
- //#region 鏂板
- form.on('submit(btnAdd)', function (obj) {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板宸ヤ綔涓績',
- closeBtn: 1,
- shift: 2,
- area: ['90%', '90%'],
- maxmin: true,
- content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + ''],
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
- }
- });
- return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
- })
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ sWhere = "";
+ }
//#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔涓績-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
@@ -353,84 +307,56 @@
}
}
//#endregion
-
+
//#region 鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
- var ModRightNameDelete = 'Gy_WorkCenter_Delete'
- if (TagId != "") {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_WorkCenter/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_WorkCenter',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
}
- })
- }
- });
- }
- else {
- //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
- // , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var layEvent = checkStatus.event;
- if (checkStatus.data.length === 1) {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_WorkCenter/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
});
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ })
}
- });
- //#endregion
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index b618769..7e86aed 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板/缂栬緫鐢熶骇璧勬簮</title>
+ <title>鏂板/缂栬緫宸ヤ綔涓績</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -303,7 +303,7 @@
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ //ReRoadBillMain();
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -312,7 +312,7 @@
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
- console.log("Reason" + sMainStr);
+ //console.log("Reason" + sMainStr);
}
});
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
index a6d1250..982f317 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
@@ -19,23 +19,19 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>-->
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐浠ｇ爜</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+
<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>
@@ -128,6 +124,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad = layer.load();
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
if (HNumber) {
@@ -145,11 +142,14 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index 8f49276..da50e18 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -8,14 +8,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <style media="screen">
- /* .custom-tree-item-clicked {
- color: #FC9003*/
- /*}*/
- </style>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -24,41 +21,35 @@
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs12 layui-inline">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <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" name="HNumber" id="HNumber">
</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" name="HName" id="HName">
+ </div>
+ </div>
+ <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
</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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <!--<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" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -103,9 +94,20 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
-
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
break;
};
@@ -114,70 +116,13 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- //$("#btnSearch").click();
+ set_ClearQuery();
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
- });
- //#endregion
-
- //#region 淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
- if (TagId != "") {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫鐝粍'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- location.reload();
- }
- })
- }
- else {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
- TagParentId = data[0].ParentID.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫鐝粍'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- location.reload();
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
});
//#endregion
@@ -222,7 +167,8 @@
//#endregion
//#region 鏌ヨ
- function get_Display(sWhere) {
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Group/list',
@@ -232,11 +178,14 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
+ layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -259,29 +208,25 @@
}
//#endregion
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ sWhere = "";
+ }
+ //#endregion
//#region 鏂板
- form.on('submit(btnAdd)', function (obj) {
- //椤甸潰灞�-鑷畾涔�
+ function set_AddNew() {
layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板鐝粍',
- closeBtn: 1,
- shift: 2,
- area: ['50%', '50%'],
- maxmin: true,
- content: ['../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html?hID=' + TagId + ''],
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
- return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
- })
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璧勬簮-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
//#endregion
//#region 缂栬緫
@@ -305,82 +250,53 @@
//#endregion
//#region 鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
- var ModRightNameDelete = 'Gy_Group_Delete'
- if (TagId != "") {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_Group/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'Gy_Group/EditBill',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
}
- })
- }
- });
- }
- else {
- //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
- // , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var layEvent = checkStatus.event;
- if (checkStatus.data.length === 1) {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_Group/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
});
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ })
}
- });
- // #endregion
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index 9640b4d..bb06066 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -299,7 +299,7 @@
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ //ReRoadBillMain();
}
else {
layer.alert(data.Message, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index f138628..0d7f46a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -421,7 +421,7 @@
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ //ReRoadBillMain();
}
else {
layer.alert(data.Message, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index f09c46a..b8f1060 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -21,11 +21,7 @@
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">涓嶈壇鍘熷洜浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -49,9 +45,9 @@
<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-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
</div>
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index b80d5a6..5914acf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -8,11 +8,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -23,20 +28,15 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭浠ｇ爜</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭鍚嶇О</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
@@ -50,15 +50,11 @@
<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" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -97,19 +93,29 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
- break;
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
};
});
//#endregion
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");//宸ュ簭浠ｇ爜
- $("#HName").val("");//宸ュ簭鍚嶇О
- //$("#btnSearch").click();
+ set_ClearQuery();
});
//#endregion
@@ -153,15 +159,15 @@
, { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
, { field: '閮ㄩ棬', title: '閮ㄩ棬' }
, { field: '搴忓彿', title: '搴忓彿' }
- , { field: '瀵瑰簲K3浠ｇ爜', title: '瀵瑰簲K3浠ｇ爜' }
+ , { field: '瀵瑰簲K3浠ｇ爜', title: '瀵瑰簲K3浠ｇ爜', width: 115 }
, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
, { field: '鐝骇瀹氶', title: '鐝骇瀹氶' }
- , { field: '鍔犵彮琛ヨ创瀹氶', title: '鍔犵彮琛ヨ创瀹氶' }
+ , { field: '鍔犵彮琛ヨ创瀹氶', title: '鍔犵彮琛ヨ创瀹氶', width: 120 }
, { field: '鑷姩绉昏浆', title: '鑷姩绉昏浆' }
, { field: '澶囨敞', title: '澶囨敞' }
- , { field: 'HProcessID_K3', title: 'HProcessID_K3' }
- , { field: 'ERP宸ュ簭浠ｇ爜', title: 'ERP宸ュ簭浠ｇ爜' }
- , { field: 'ERP宸ュ簭鍚嶇О', title: 'ERP宸ュ簭鍚嶇О' }
+ , { field: 'HProcessID_K3', title: 'HProcessID_K3', width: 130 }
+ , { field: 'ERP宸ュ簭浠ｇ爜', title: 'ERP宸ュ簭浠ｇ爜', width: 125 }
+ , { field: 'ERP宸ュ簭鍚嶇О', title: 'ERP宸ュ簭鍚嶇О', width: 125 }
]]
};
}
@@ -210,6 +216,27 @@
}
//#endregion
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璧勬簮-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -230,6 +257,55 @@
}
//#endregion
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_Process',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
});
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index c1c9f1d..761a638 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -237,26 +237,34 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var ItemID = data[0].HItemID.toString();
- var ajaxLoad = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + 'DeltetGy_Source',
- type: "GET",
- data: { "HItemID": ItemID },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- get_Display(sWhere);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_Source',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 6269bb0..21937ca 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -21,11 +21,7 @@
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
<div class="layui-input-block">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index ab45d01..9742cef 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -21,11 +21,7 @@
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹㈡埛浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -50,11 +46,11 @@
<table class="" id="mainTable" lay-filter="mainTable"> </table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" ><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-form"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-form"></i>绂佺敤</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-form"></i>鍙嶇鐢�</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-form"></i>绂佺敤</button>-->
+ <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-form"></i>鍙嶇鐢�</button>-->
</div>
</script>
@@ -183,6 +179,7 @@
}
//蹇�熸煡璇㈡寜閽�
function get_FastQuery() {
+ var ajaxLoad = layer.load();
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
if (HNumber) {
@@ -200,11 +197,14 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 75fc162..44f9c8a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐢熶骇浠诲姟鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,10 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
-
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -37,9 +40,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -67,12 +70,16 @@
<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" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>-->
</div>
</script>
</form>
@@ -100,106 +107,151 @@
, laydate = layui.laydate
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
+ var sWhere = "";
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- ,height: 'full-50'
- , page: true
- ,cellMinWidth: 90
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
- //, { field: 'HDeptID', title: 'HDeptID' }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
- //, { field: 'HMaterID', title: 'HMaterID' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- //, { field: 'hunitid', title: 'hunitid' }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- //, { field: 'hempid', title: 'hempid' }
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
- , { field: 'hcusid', title: 'hcusid' }
- , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜' }
- , { field: '瀹㈡埛', title: '瀹㈡埛' }
- //, { field: 'HCenterID', title: 'HCenterID' }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- //, { field: 'hbomid', title: 'hbomid' }
- , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�' }
- //, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
- , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜' }
- , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎' }
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
- , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
- , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
- , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- //, { field: 'hsubid', title: 'hsubid' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
- ]]
- };
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- var index0 = layer.load(0, { shade: false });
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index0);
- } else {
- layer.close(index0);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //涓嬫帹
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- $("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#btnSearch").click();
+ set_ClearQuery();
+
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+ get_FastQuery();
+ });
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
+ //, { field: 'HDeptID', title: 'HDeptID' }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
+ //, { field: 'HMaterID', title: 'HMaterID' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ //, { field: 'hunitid', title: 'hunitid' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ //, { field: 'hempid', title: 'hempid' }
+ , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
+ , { field: 'hcusid', title: 'hcusid' }
+ , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜' }
+ , { field: '瀹㈡埛', title: '瀹㈡埛' }
+ //, { field: 'HCenterID', title: 'HCenterID' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ //, { field: 'hbomid', title: 'hbomid' }
+ , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�' }
+ //, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜' }
+ , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ //, { field: 'hsubid', title: 'hsubid' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+ ]]
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
@@ -216,40 +268,44 @@
if (WorkCenter) {
sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
}
- var index = layer.load(0, { shade: false });
- $.ajax({
- url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
+ }
+ //#endregion
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
- //涓嬫帹
- case 'set_pushDown': set_pushDown();
- break;
- };
- });
-
- //涓嬫帹鍗曟嵁
- function set_pushDown() {
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HDate").val("");//寮�濮嬫棩鏈�
+ $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+ ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ //var index0 = layer.load(0, { shade: false });
+ //$.ajax({
+ // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ // url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.close(index0);
+ // } else {
+ // layer.close(index0);
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(index0);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ //缂栬緫鍗曟嵁
+ function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (data.length === 1) {
@@ -265,13 +321,52 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
+ type: "GET",
+ data: { "HInterID": hmainid },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ get_Display(sWhere);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
//laydate.render({
// elem: '#HDate'
// , type: 'datetime'
// , trigger: 'click'
// , format:'yyyy-MM-dd HH:mm'
//});
-
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index f7e47f0..fc48453 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -367,9 +367,12 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
- var OperationType = 2;
- var linterid = 11880;
- var HSouceBillType = 3722;
+
+ ////娴嬭瘯鐢ㄦ暟鎹�
+ //var OperationType = 2;
+ //var linterid = 11880;
+ //var HSouceBillType = 3722;
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillList.html"
index 5d650ef..5f3c7f0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillList.html"
@@ -302,7 +302,7 @@
, area: ['100%', '100%']
, title: '璐ㄩ噺姹囨姤鍗�-娴忚'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇璐ㄩ噺姹囨姤鍗�/Add_Edit_Gy_Sc_QualityReportBillListnew.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
+ , content: '../璐ㄩ噺姹囨姤鍗�/Add_Edit_Gy_Sc_QualityReportBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹祻瑙堬紒');
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index df21492..06745b6 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -9,6 +9,11 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -44,6 +49,10 @@
<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
<i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
</button>
+ <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">
+ <i class="layui-icon layui-icon-logout layuiadmin-button-btn"><span class="btn-title">閫�鍑�</span></i>
+ </button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -328,10 +337,7 @@
<span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
{{# } }}
</script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+
<script>
layui.config({
@@ -465,6 +471,7 @@
}
break;
}
+
});
//琛屽唴浜嬩欢
@@ -829,6 +836,15 @@
else {
return true;
}
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ if (OperationType == 1) {
+ Pub_Close(2);
+ }
+ else if (OperationType == 2) {
+ Pub_Close(1);
+ }
+ })
}
</script>
</body>
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 70076c3..fa21150 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸ヨ壓璺嚎鍒楄〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,11 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
-
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -19,11 +23,6 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -31,7 +30,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="hnumber" id="hnumber">
</div>
@@ -52,13 +51,11 @@
<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" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -67,10 +64,6 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -87,87 +80,147 @@
, laydate = layui.laydate
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
+ var option = [];
- var option = {
- elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- ,height: 'full-50'
- , page: true
- ,cellMinWidth: 90
- , cols: [[
- //{ field: 'hmainid', title: 'hmainid', width: 110 }
- { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
- //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- //, { field: 'hsubid', title: 'hsubid', width: 80 }
- , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
- , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- //, { field: 'hprocid', title: 'hprocid', width: 105 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭' }
- //, { field: 'HSupID', title: 'HSupID', width: 105 }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
- , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
- , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
- , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
- , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
- , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
- , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
- , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
- , { field: '鑹巼', title: '鑹巼' }
- , { field: '绱鑹巼', title: '绱鑹巼' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
- //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
- , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭'}
- , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
- ]]
- };
- var index = layer.load(0, { shade: false });
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //娴忚
+ case 'get_PrintReport': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ //{ field: 'hmainid', title: 'hmainid', width: 110 }
+ ,{ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
+ //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ //, { field: 'hsubid', title: 'hsubid', width: 80 }
+ , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
+ , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+ //, { field: 'hprocid', title: 'hprocid', width: 105 }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
+ //, { field: 'HSupID', title: 'HSupID', width: 105 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
+ , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
+ , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
+ , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
+ , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
+ , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
+ , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
+ , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
+ , { field: '鑹巼', title: '鑹巼' }
+ , { field: '绱鑹巼', title: '绱鑹巼' }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
+ //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
+ //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
+ //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
+ , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
+ //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
+ , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width:150 }
+ , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+ ]]
+ };
+ }
+ //var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ //$.ajax({
+ // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ // url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.close(index);
+ // } else {
+ // layer.close(index);
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(index);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+ get_FastQuery();
+ });
+ //#endregion
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -175,22 +228,12 @@
$("#hnumber").val("");//鐗╂枡
$("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
$("#btnSearch").click();
+ set_ClearQuery();
});
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
- var hnumber = $("#hnumber").val();//鐗╂枡
- var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
- if (HOrderProcNO) {
- sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
- }
- if (hnumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
- }
- if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
- }
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
@@ -200,25 +243,117 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+ //#endregion
+
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ var hnumber = $("#hnumber").val();
+ //var HName = $("#HName").val();
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (hnumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'";
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔涓績-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
+ //#endregion
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔涓績-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+ type: "GET",
+ data: { "lngBillKey": hmainid },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ get_Display(sWhere);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index 6567385..090f0db 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -22,55 +22,47 @@
</div>
<div class="layui-fluid">
- <div class="layui-row layui-col-space15">
<div class="layui-col-md12">
- <div class="layui-card">
-
- <div class="layui-card-body">
- <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
- <form class="layui-form" action="">
- <div class="layui-form-item">
- <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 class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <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" name="HBillNo" id="HBillNo">
+ </div>
</div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate1" id="HDate1">
+ <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" name="HDate1" id="HDate1">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate2" id="HDate2">
+ <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" name="HDate2" id="HDate2">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
+ <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
-
- </form>
- <!--</div>-->
- </div>
-
-
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <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-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
</div>
</script>
+ </form>
</div>
- </div>
- </div>
+ </div>
+ </div>
</div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
@@ -161,18 +153,18 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
, { field: 'hsubid', title: 'hsubid' ,hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 170 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
, { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105 }
- , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', width: 125 }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 125 }
, { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115 }
- , { field: '妫�楠屽憳浠ｇ爜', title: '妫�楠屽憳浠ｇ爜', width: 115 }
+ , { field: '妫�楠屽憳浠ｇ爜', title: '妫�楠屽憳浠ｇ爜', width: 175 }
, { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О' }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 160 }
, { field: '淇敼浜�', title: '淇敼浜�', width: 160 }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 2c48e83..62fc164 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -194,9 +194,6 @@
</div>
</div>
<div class="layui-row">
-
- </div>
- <div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
@@ -370,6 +367,7 @@
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
<input type="hidden" name="eventType" id="eventType" value="Add">
+ <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
</form>
</div>
</div>
@@ -397,10 +395,17 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HBillNo = params[params[3]];//鍗曟嵁鍙�
}
- /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+ function consoleParams() {
+ console.log(OperationType);
+ console.log(linterid);
+ console.log(HSouceBillType);
+ console.log(HBillNo);
+ console.log("-----");
+ }
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
+ consoleParams();
//鑾峰彇鏈�澶у崟鎹彿
var ajaxLoad = layer.load();
$.ajax({
@@ -422,7 +427,8 @@
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
}
- else if(OperationType == 3){
+ else if (OperationType == 3) {
+ consoleParams();
$("#eventType").val("Modify");
RoadBillMain(linterid);
$('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
@@ -432,6 +438,7 @@
//RoadBillSub(linterid);
}
else if (OperationType == 4) {
+ consoleParams();
RoadBillMain(linterid);
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
@@ -502,6 +509,7 @@
} else if (OperationType == 3) {
Pub_Close(1);
} else if (OperationType == 4) {
+ Pub_Close(2);
Pub_Close(1);
}
});
@@ -528,7 +536,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
}
//#endregion
@@ -644,9 +652,6 @@
}
});
}
- //#endregion
- //#region 淇濆瓨鍚庢祻瑙堟柟娉�
-
//#endregion
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html"
new file mode 100644
index 0000000..8cce20f
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html"
@@ -0,0 +1,709 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button type="button" id="set_SaveBarCode" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBarCode" style="display:none;">鎵爜淇濆瓨</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <h2>宸ュ簭杩涚珯鎺ユ敹鍗�(鎵归噺)</h2>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcNo" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <h2 style="float: left;">宸茶繘绔�</h2>
+ <input type="text" name="HMainEntryRow" id="HMainEntryRow" value="0" style="width: 30px; border: none; text-align: center; font-size: 24px; ">
+ <h2 style="float: right;">寮犲崟鎹�</h2>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <h2></h2>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏉″舰鐮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇疯緭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>涓诲崟鎹彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMainBillNo" id="HMainBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQty" id="HQty">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkSource" id="get_checkSource" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇鐝粍</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkGroup" id="get_checkGroup" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkEmp" id="get_checkEmp" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鏄庣粏淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鏄庣粏淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <input type="hidden" name="HBillNo" id="HBillNo" value="">
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID" value="0">
+ <input type="hidden" name="HICMOBillNo" id="HICMOBillNo" value="">
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ <input type="hidden" name="HMaterName" id="HMaterName" value="">
+ <input type="hidden" name="HMaterNumber" id="HMaterNumber" value="">
+ <input type="hidden" name="HMaterModel" id="HMaterModel" value="">
+ <input type="hidden" name="HPieceQty" id="HPieceQty" value="0">
+ <input type="hidden" name="HPlanQty" id="HPlanQty" value="0">
+ <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" value="">
+ <input type="hidden" name="HICMOQty" id="HICMOQty" value="0">
+ <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+ <input type="hidden" name="HOrderProcNO" id="HOrderProcNO" value="">
+ <input type="hidden" name="HProcName" id="HProcName" value="">
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <input type="hidden" name="HCenterName" id="HCenterName" value="">
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+ <input type="hidden" name="eventType" id="eventType" value="Add">
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="barDemo1">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element
+ , util = layui.util;
+ var HMainEntryRow = 1;//鍗曟嵁鍙峰悗缂�
+
+ //鍒濆琛ㄦ牸鏁版嵁
+ var option1 = {
+ elem: '#mainTable1'
+ , toolbar: '#toolbarDemo1'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-300'
+ , cellMinWidth: 110
+ , totalRow: true
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�' }
+ , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ , { field: 'HQty', title: '鏁伴噺' }
+ , { field: 'HProcExchBillNo', title: '娴佽浆鍗�' }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟' }
+ , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
+ , { field: 'HMaterName', title: '浜у搧鍚嶇О' }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HSourceName', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupName', title: '鐢熶骇鐝粍' }
+ , { field: 'HEmpName', title: '鎺ユ敹浜�' }
+ , { field: 'HMaker', title: '鍒跺崟浜�' }
+ , {
+ field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', templet: function (d) {
+ if (d.HMakeDate == null) {
+ return "";
+ }
+ return util.toDateString(d.HMakeDate, "yyyy-MM-dd HH:mm:ss");
+ }
+ }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
+ ]]
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍒濆鍔犺浇琛ㄦ牸
+ option1.data = [];
+ table.render(option1);
+
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3790' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HMainInterID").val(d.data[0].HInterID);
+ $("#HMainBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+ else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+
+ }
+ else if (OperationType == 3) {//缂栬緫
+
+ }
+ else if (OperationType == 4) {//娴忚
+
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 閫夋嫨鐢熶骇璧勬簮鎸夐挳
+ form.on('submit(get_checkSource)', function () {
+ get_checkSource();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐝粍鎸夐挳
+ form.on('submit(get_checkGroup)', function () {
+ get_checkGroup();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鎺ユ敹浜烘寜閽�
+ form.on('submit(get_checkEmp)', function () {
+ get_checkEmp();
+ });
+ //#endregion
+
+ //#region 鎵潯褰㈢爜(娴佽浆鍗�)
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ if ($("#HProcNo").val() == "") {
+ layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
+ if ($("#HQty").val() == "") {
+ layer.msg("璇峰厛濉啓鎺ユ敹鏁伴噺锛�", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
+ if ($("#HSourceID").val() == 0) {
+ layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
+ if ($("#HGroupID").val() == 0) {
+ layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨鎺ユ敹浜猴紒", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
+ txtHBarCode_KeyDown($("#HBarCode").val());
+ }
+ });
+ //#endregion
+
+ //#region 鎻愪氦鎸夐挳(淇濆瓨)
+ form.on('submit(set_SaveBarCode)', function (data) {//鎻愪氦
+ var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_StationInBill/AddBill",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(index);
+ layer.msg("鎵爜杩涚珯鎴愬姛锛�",{ icon: 6 });
+ $("#HMainEntryRow").val(HMainEntryRow);
+ HMainEntryRow++;
+ //鍔犺浇鏄庣粏淇℃伅
+ get_BarCodeDetail();
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ if (OperationType == 1) {
+ Pub_Close(2);
+ } else if (OperationType == 2) {
+ Pub_Close(1);
+ }
+ })
+ //#endregion
+
+ //#region 琛屽唴浜嬩欢
+ table.on('tool(mainTable1)', function (obj) {
+ var rowData = obj.data;
+ if (obj.event === 'del') {
+ layer.confirm('纭畾鍒犻櫎' + rowData.HBadReasonNumber + '鍚楋紵', function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ //$.ajax({
+ // url: GetWEBURL() + '/Sc_QualityReportBill/del_BarCodeDetail',
+ // type: "GET",
+ // data: { "HItemID": rowData.HItemID },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // get_BarCodeDetail();
+ // layer.close(ajaxLoad);
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(result.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ layer.close(index);
+ });
+ }
+ });
+ //#endregion
+
+ //#region 娴佹按鍙峰洖杞︽柟娉�
+ $('#HProcNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ $("#HBarCode").focus();
+ }
+ });
+ //#endregion
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇璧勬簮鏂规硶
+ function get_checkSource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/SourceInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ });
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐝粍鏂规硶
+ function get_checkGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐝粍鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨妫�楠屽憳鏂规硶
+ function get_checkEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/UserInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 鎵爜淇濆瓨鍚庤皟鐢ㄧ殑鏄剧ず鏄庣粏淇℃伅鏂规硶
+ function get_BarCodeDetail() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationInBill/get_BarCodeDetail',
+ type: "GET",
+ data: { "HMainInterID": $("#HMainInterID").val() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option1.data = data1.data;
+ table.render(option1);
+ layer.close(ajaxLoad);
+ } else {
+ option1.data = [];
+ table.render(option1);
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇娴佽浆鍗′俊鎭�
+ function txtHBarCode_KeyDown(HBarCode) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ $("#HICMOInterID").val(data.hicmointerid);
+ $("#lngICMOEntryID").val(data.lngICMOEntryID);
+ $("#HICMOBillNo").val(data.浠诲姟鍗曞彿);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.浜у搧);
+ $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
+ $("#HMaterModel").val(data.瑙勬牸鍨嬪彿);
+ $("#HPieceQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HPlanQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HProcExchBillNo").val(data.鍗曟嵁鍙�);
+ $("#HICMOQty").val(data.浠诲姟鍗曟暟閲�);
+ $("#lngBillKey").val(data.hmainid);
+ $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+ layer.close(index);
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ txtHProcNo_KeyDown(HBarCode, $("#HProcNo").val());
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇娴佹按鍙蜂俊鎭�
+ function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ $("#lngBillSubKey").val(data.hsubid);
+ $("#HProcName").val(data.宸ュ簭);
+ $("#HProcID").val(data.HProcID);
+ $("#HCenterName").val(data.宸ヤ綔涓績);
+ $("#HCenterID").val(data.HCenterID);
+ layer.close(index);
+ //鑾峰彇鍗曟嵁ID
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3790' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val($("#HMainBillNo").val() + "-" + HMainEntryRow);
+ layer.close(ajaxLoad);
+ //淇濆瓨
+ $("#set_SaveBarCode").click();
+ }
+ });
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1