From 7cb55f3673e8a5f8907119d0201a750281a56ef6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 29 十二月 2023 17:46:30 +0800
Subject: [PATCH] 报工台修改图标；排产模块增加工艺路线，工厂日历按钮，增加优先级为0的判断提示；隐藏主控台右上角的layui版本信息
---
WebTM/views/indexMenu.html | 7 -
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 59 +++++++++++---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 140 ++++++++++++++++++++++++++++++++--
WebTM/views/IpadIndex.html | 6
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 27 ++++++
5 files changed, 209 insertions(+), 30 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 8eff9a3..74a5b5d 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1042,7 +1042,7 @@
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="OpenWork(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-pause imgicon"></span>
+ <span class="layui-icon layui-icon-play imgicon"></span>
<span class="imgtitle">寮�宸�</span>
</div>
</div>
@@ -1071,7 +1071,7 @@
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-pause imgicon"></span>
+ <span class="layui-icon layui-icon-read imgicon"></span>
<span class="imgtitle">浣滀笟鎸囧涔�</span>
</div>
</div>
@@ -1117,7 +1117,7 @@
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-play imgicon"></span>
+ <span class="layui-icon layui-icon-pause imgicon"></span>
<span class="imgtitle">鍋滃伐</span>
</div>
</div>
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 30c7c5a..bb8fc77 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -82,7 +82,7 @@
<i class="layui-icon layui-icon-screen-full"></i>
</a>
</li>
- <li class="layui-nav-item" lay-unselect>
+ <li class="layui-nav-item" lay-unselect style="margin-right:15px;">
<a href="javascript:;">
<cite>
<label name="UserName" id="UserName"></label>
@@ -91,14 +91,13 @@
<dl class="layui-nav-child">
<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>
<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
- <hr>
<dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
</dl>
</li>
- <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
- </li>
+ </li>-->
<li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
<a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
</li>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 877e967..874c79d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -230,7 +230,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><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_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><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="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
@@ -239,6 +239,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>宸ヨ壓璺嚎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>宸ュ巶鏃ュ巻</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
@@ -370,10 +372,10 @@
obj.tr.find(':checkbox').prop('checked', flag);
if (flag) {
obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
} else {
obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
}
//mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
layui.each(table.cache.mainTable, function (i, l) {
@@ -489,8 +491,14 @@
case 'set_Souce':
set_Souce(data);
break;
-
-
+ //鏌ョ湅宸ヨ壓璺嚎
+ case 'set_Routing':
+ set_Routing();
+ break;
+ //宸ュ巶鏃ュ巻
+ case 'set_Calendar':
+ set_Calendar();
+ break;
}
});
@@ -526,7 +534,29 @@
} else if (table.cache["mainTable"].length == 0) {
return layer.msg("鏃犳暟鎹�,鏃犳硶淇濆瓨!");
} else {
- set_AddNew();
+ var HYxjQty = 0;
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["浼樺厛绾�"]) == 0) {
+ HYxjQty++
+ }
+ }
+ }
+ if (HYxjQty > 0) {
+ layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['纭', '鍙栨秷']
+ }, function (index, layero) {
+ //纭
+ set_AddNew();
+ }, function (index) {
+ //鍙栨秷
+ return
+ });
+ } else {
+ set_AddNew();
+ }
}
});
@@ -722,7 +752,6 @@
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'});
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
- columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
columns.push({
@@ -881,6 +910,7 @@
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
@@ -2376,7 +2406,7 @@
function set_AddNew() {
//鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
- var num = [];
+ var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
@@ -2388,7 +2418,7 @@
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
- }
+ }
//var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
@@ -2626,6 +2656,98 @@
});
}
+ //鏌ョ湅宸ヨ壓璺嚎
+ function set_Routing() {
+ var checkStatus = table.checkStatus('mainTable');
+ var ajaxLoad = layer.load();
+ if (checkStatus.data.length != 1) {
+ layer.alert("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ } else {
+ var TabData = checkStatus.data;
+ var HMaterID = TabData[0].HMaterID;
+ var HMaterNumber = TabData[0].鐗╂枡浠ｇ爜;
+ var HMaterName = TabData[0].鐗╂枡鍚嶇О;
+ var HMaterModel = TabData[0].瑙勬牸鍨嬪彿;
+ var HRoutingInterID = 0;//宸ヨ壓璺嚎涓诲唴鐮�
+ var HStandardQty = 0; //鐗╂枡榛樿宸ヨ壓璺嚎鏁伴噺
+ //鏍规嵁鐗╂枡ID 鏌ヨ褰撳墠鐗╂枡鏄惁瀛樺湪 榛樿鐨勫伐鑹鸿矾绾�
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetRoutingListByMater',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+ //鑾峰彇褰撳墠閫夋嫨鐗╂枡鐨勯粯璁ゅ伐鑹鸿矾绾� 涓诲唴鐮�
+ for (let i = 0; i < data.length; i++) {
+ if (data[i].HStandard == 1) {
+ HRoutingInterID = data[i].HInterID;
+ HStandardQty++;
+ }
+ }
+ if (HStandardQty > 1) {
+ layer.alert("褰撳墠鐗╂枡瀛樺湪澶氫釜榛樿宸ヨ壓璺嚎锛岃杩涜璋冩暣");
+ } else if (HStandardQty == 0) {
+ layer.alert("褰撳墠鐗╂枡娌℃湁璁剧疆榛樿宸ヨ壓璺嚎锛岃鍓嶅線宸ヨ壓璺嚎缁存姢椤甸潰璁剧疆榛樿宸ヨ壓璺嚎");
+ } else if (HStandardQty == 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HRoutingInterID + '&HSouceBillType=4610&IsHavingPermissions=' + data1.IsHavingPermissions
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+
+ //褰撳墠鐢ㄦ埛鏈夋柊澧為〉闈�
+ if (data1.IsHavingPermissions == 1) {
+ layer.confirm('褰撳墠鐗╂枡娌℃湁璁剧疆宸ヨ壓璺嚎,鏄惁璺宠浆鑷冲伐鑹鸿矾绾挎柊澧為〉闈紵', function (index) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + HRoutingInterID + '&HSouceBillType=4610&HMaterID='+ HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
+
+ //璁剧疆宸ュ巶鏃ュ巻
+ function set_Calendar() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ巶鏃ュ巻'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html?OperationType=3'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
//鎺掍骇鍔熻兘
function set_Arrangement() {
var checkStatus = table.checkStatus('mainTable_ICMO')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index 6af9766..f98bced 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -56,6 +56,7 @@
<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="btn_Exit" id="btn_Exit" style="padding:0 5px">閫�鍑�</button>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
</div>
</div>
@@ -105,6 +106,10 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
+
var TagId = "";
var option1 = [];
var option2 = [];
@@ -234,7 +239,15 @@
get_Display_Tree(sWhere);
get_Display("");
});
-
+
+ //閫�鍑�
+ form.on('submit(btn_Exit)', function (data) {
+ if (OperationType == 3) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+ });
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -571,7 +584,17 @@
}
//#endregion
-
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
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 309bd7b..a9c2f57 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"
@@ -509,7 +509,7 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
- // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID" }//涓嶅～
// , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
@@ -543,7 +543,7 @@
//, { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
//, { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
//, { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
-
+
//, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
//, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -625,6 +625,30 @@
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var HBillSubType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
//var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+ var IsHavingPermissions = 0; //鎺掍骇椤甸潰璺宠浆杩囨潵鏃跺垽鏂敤鎴锋槸鍚︽湁宸ヨ壓璺嚎缂栬緫鏉冮檺,0浠ｇ爜娌℃湁鏉冮檺锛�1浠ｈ〃鏈夋潈闄�
+ //鎺掍骇椤甸潰璺宠浆缂栬緫鏌ョ湅宸ヨ壓璺嚎
+ if (HBillSubType == 4610 && OperationType == 3) {
+ HBillSubType = 3301
+ IsHavingPermissions = params[params[3]];
+ if (IsHavingPermissions == 0) {
+ //娌℃湁宸ヨ壓璺嚎鐨勭紪杈戞潈闄愶紝绂佺敤鎸夐挳
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ }
+ //鎺掍骇椤甸潰璺宠浆鏂板宸ヨ壓璺嚎
+ if (HBillSubType == 4610 && OperationType == 1) {
+ HBillSubType = 3301
+
+ $("#HMaterID").val(params[params[3]]);//鐗╂枡ID
+
+ $("#HMaterNumber").val(getParams("HMaterNumber"));//鐗╂枡浠ｇ爜
+ $("#HMaterName").val(getParams("HMaterName"));//鐗╂枡鍚嶇О
+ $("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//瑙勬牸鍨嬪彿
+ }
if (HBillSubType == "SUB") {
//鏄剧ず宸ュ簭
@@ -923,19 +947,19 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
- break;
+ break;
//涓婁竴琛�
case 'btn_up':
btn_up(data);
- break;
+ break;
//涓嬩竴琛�
case 'btn_under':
btn_under(data);
- break;
+ break;
//鍒锋柊娴佹按鍙�
case 'btn_Refresh':
btn_Refresh(data);
- break;
+ break;
}
});
@@ -1391,7 +1415,7 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length ==0) {
+ if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
@@ -1408,7 +1432,7 @@
NowNum = i + 1;
}
}
-
+
//鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
var WorkCente = [];
var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
@@ -1483,7 +1507,7 @@
//var HCenterID = 0;
//var HCenterNUmber = "";
//var HCenterName = "";
-
+
////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
//obj.update({
@@ -1673,7 +1697,7 @@
, "HQCSchemeNumber_Fst": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
, "HQCSchemeName_Fst": checkStatus.data[0].鏂规鍚嶇О
})
-
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1761,7 +1785,7 @@
$("input[name='checkboxHStandard']").prop("checked", false);
}
-
+
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": OperationType == 2 ? "" : d.data[0].鍗曟嵁鍙�
@@ -2076,7 +2100,7 @@
function btn_under(data) {
if (data.length != 1) {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- } else if (option.data[option.data.length-1]["HProcNo"] == data[0]["HProcNo"]) {
+ } else if (option.data[option.data.length - 1]["HProcNo"] == data[0]["HProcNo"]) {
layer.msg("鏈鏁版嵁鏃犳硶绉诲姩锛�");
} else {
var tables = [];
@@ -2183,6 +2207,17 @@
})
}
//#endregion
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
});
</script>
--
Gitblit v1.9.1