From 4322ae28f78e1c393eb85eece4d8a4485bb23f7c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 15 十月 2024 10:18:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 100 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 9 deletions(-)
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 cfbaca9..d111719 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"
@@ -194,14 +194,15 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="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" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="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" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>鍚敤榛樿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
@@ -300,6 +301,9 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍚敤榛樿
+ case 'set_defaultRoute': set_defaultRoute();
break;
//鍙戣捣瀹℃壒
case 'set_startCheckBill': set_startCheckBill();
@@ -1171,6 +1175,39 @@
get_DisplayPage(sWhere);
}
+ //鍚敤榛樿
+ function set_defaultRoute() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸惎鐢ㄨ宸ヨ壓璺嚎涓虹墿鏂欓粯璁ゅ伐鑹鸿矾绾垮悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/set_defaultRoute',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -1186,9 +1223,54 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
if (result.count == 1) {
- get_FastQuery();
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
+ if (num == 1) {
+ //妫�鏌ユ槸鍚﹀叿澶囧惎鐢ㄩ粯璁ゅ伐鑹鸿矾绾跨殑鏉冮檺锛屽瓨鍦紝鍒欏脊绐楁彁闂�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/set_defaultRoute_CheckRight',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
+ success: function (result1) {
+ if (result1.count == 1) { //鎷ユ湁鏉冮檺
+ layer.confirm("纭瑕佸惎鐢ㄨ宸ヨ壓璺嚎涓虹墿鏂欓粯璁ゅ伐鑹鸿矾绾垮悧?", function (index1) {
+ //鍚敤榛樿宸ヨ壓璺嚎
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/set_defaultRoute',
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
+ success: function (result2) {
+ if (result2.count == 1) {
+ get_FastQuery();
+ layer.msg(result2.Message, { icon: 1 });
+ } else {
+ layer.alert(result2.code + result2.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ get_FastQuery();
+ layer.close(wait);
+ } else {
+ get_FastQuery();
+ layer.close(wait);
+ layer.close(index);
+ }
+ }, error: function () {
+ get_FastQuery();
+ layer.close(wait);
+ layer.close(index);
+ }
+ });
+ } else {
+ get_FastQuery();
+ layer.close(wait);
+ layer.close(index);
+ }
+ //layer.closeAll('dialog');
+
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
--
Gitblit v1.9.1