From 4423fec3a561fdea67d8799a3fcf4eaa4f279f8c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 11 六月 2024 21:11:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
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 dbd1fd7..673c90f 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"
@@ -268,6 +268,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductInBill" id="btn-PushProductInBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇鍏ュ簱鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushQualityReportBill" id="btn-PushQualityReportBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璐ㄩ噺姹囨姤鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductionReturnBill" id="btn-PushProductionReturnBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇閫�搴撳崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushWorkLinkBill" id="btn-PushWorkLinkBill"><i class="layui-icon layui-icon-delete"></i>鑱旂郴鍗�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
@@ -413,6 +414,9 @@
break;
//涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)
case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
+ break;
+ //鑱旂郴鍗�
+ case 'btn-PushWorkLinkBill': set_PushWorkLinkBill();
break;
//涓嬫帹(鐢熶骇鍏ュ簱鍗�)
case 'btn-PushProductInBill': set_PushProductInBill();
@@ -1247,6 +1251,7 @@
//#endregion
+
//#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
function set_PushProductInBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -1369,7 +1374,7 @@
return;
}
- if (data[i].琛岀姸鎬� != "" ) {
+ if (data[i].琛岀姸鎬� != "") {
var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
@@ -1400,6 +1405,73 @@
}
//#endregion
+ //#region 鑱旂郴鍗�
+ function set_PushWorkLinkBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var temp = {
+ "HRelationInterID":data[0].hmainid,
+ "HRelationEntryID":data[0].hsubid,
+ "HRelationBillNo":data[0].鍗曟嵁鍙�,
+ "HRelationBillType":"3710"
+ }
+ var HRelationInterID = data[0].hmainid;
+ var HRelationEntryID = data[0].hsubid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListBySourceID',
+ type: "GET",
+ data: { "HRelationInterID": HRelationInterID.toString(), "HRelationEntryID": HRelationEntryID.toString() },
+ success: function (result) {
+ if (result.count == 1) {
+ var HInterID = result.data[0].HInterID;
+ var HEntryID = result.data[0].HEntryID;
+ var url = encodeURI('../../璐ㄩ噺绠＄悊/宸ヤ綔鑱旂郴鍗�/OA_Reply_WorkLinkBill.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=3710&res=' + JSON.stringify(temp));
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璁㈠崟鍥炲宸ヤ綔鑱旂郴鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: url
+ , resize: false,
+ end: function () {
+ get_FastQuery(table, option);
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ var url = encodeURI('../../璐ㄩ噺绠＄悊/宸ヤ綔鑱旂郴鍗�/OA_Add_Edit_WorkLinkBill.html?OperationType=2&linterid=&HEntryID=&HSouceBillType=3710&res=' + JSON.stringify(temp))
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '涓嬫帹鏂板宸ヤ綔鑱旂郴鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: url,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁鑱旂郴锛�');
+ }
+ }
+ //#endregion
+
//鏂板
function set_AddNew() {
layer.open({
--
Gitblit v1.9.1