From d6a5691b9aacbae7d09a4ea5a7b4fbc1474f376a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 11 六月 2024 08:34:20 +0800
Subject: [PATCH] 采购订单超链接格式修改，工作联系单bug修复
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 8 +
WebTM/views/质量管理/工作联系单/OA_Add_Edit_WorkLinkBill.html | 76 +++---------------
WebTM/views/质量管理/工作联系单/OA_Reply_WorkLinkBill.html | 78 ++++++-------------
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 74 ++++++++++++++++++
4 files changed, 120 insertions(+), 116 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 794bd89..3978528 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();
@@ -1246,6 +1250,7 @@
//#endregion
+
//#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
function set_PushProductInBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -1368,7 +1373,7 @@
return;
}
- if (data[i].琛岀姸鎬� != "" ) {
+ if (data[i].琛岀姸鎬� != "") {
var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
@@ -1399,6 +1404,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({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
index d6c29ce..6038b77 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
@@ -16,6 +16,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -233,15 +234,15 @@
<div class="layui-inline">
<label class="layui-form-label">鍏宠仈鍗曞彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HRelationBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
- <input id="HMainSourceInterID" name="HRelationInterID" value="0" type="hidden" />
- <input id="HMainSourceEntryID" name="HRelationEntryID" value="0" type="hidden" />
+ <input class="layui-input" name="HRelationBillNo" lay-verify="HRelationBillNo" id="HRelationBillNo" disabled autocomplete="off">
+ <input id="HRelationInterID" name="HRelationInterID" value="0" type="hidden" />
+ <input id="HRelationEntryID" name="HRelationEntryID" value="0" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍏宠仈绫诲瀷:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HRelationBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+ <input class="layui-input" name="HRelationBillType" lay-verify="HMainSourceBillType" id="HRelationBillType" disabled autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -378,15 +379,16 @@
set_AddFNew();
}
else if (OperationType == 2) {
- //鑱斿崟鍒濆鍖�
- var HRelationInterID = params[params[1]];
- var HRelationEntryID = params[params[2]];
- var HRelationBillNo = params[params[3]];
- var HRelationBillType = params[params[4]];
- $("#HRelationInterID").val(HRelationInterID); //鑱旂郴鍗曞崟鍙凤紙鏆傛椂鍙栧�艰鍗曠紪鍙凤級
- $("#HRelationEntryID").val(HRelationEntryID); //鑱旂郴鍗曚富鍐呯爜(鍙栧�糎InterID)
- $("#HRelationBillNo").val(HRelationBillNo); //鑱旂郴鍗曞瓙鍐呯爜(婧愬崟琛屽彿)
- $("#HRelationBillType").val(HRelationBillType); //鑱旂郴鍗曠被鍨�
+ //婧愬崟鏂板
+ var datajson;
+ var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = $.parseJSON(decodeURI(arr));
+ $("#HRelationInterID").val(datajson.HRelationInterID);
+ $("#HRelationEntryID").val(datajson.HRelationEntryID);
+ $("#HRelationBillNo").val(datajson.HRelationBillNo);
+ $("#HRelationBillType").val(datajson.HRelationBillType);
+
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -437,54 +439,6 @@
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
- //#region 鏈夋簮鍗曟柊澧炴棤鐢�
-
- //function set_AddNew() {
- // refSav = "Add";
- // //鍒濆鍩烘湰淇℃伅璧嬪��
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- // $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- // $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
- // $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
- // $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
- // $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
-
- // $.ajax(
- // {
- // type: "GET",
- // url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // async: true,
- // data: {
- // "HRelationInterID": HRelationInterID,
- // "HSourceEntryID": HMainSourceEntryID,
- // "HSourceBillNo": HMainSourceBillNo,
- // "HSourceBillType": HBillType
- // },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // {
- // var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
- // $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
- // $("#HMaterModel").val(LoadData[0].HModel); //浜у搧瑙勬牸
- // $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
- // $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
- // $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
- // $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //婧愬崟绫诲瀷
- // $("#HQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
- // Qty = LoadData[0].HDatePlanQty;
- // }
- // else {
- // layer.alert(data.Message, { icon: 5 });
-
- // }
- // },
- // error: function (err) {
- // layer.alert(err, { icon: 5 });
- // }
- // });
- //}
- //#endregion
//缂栬緫
function set_EditFromGrid()
{
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html"
index 85d9127..3ba7f4a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Reply_WorkLinkBill.html"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
@@ -109,7 +110,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style="background-color: #f7f4f4; ">
<input id="HInterID" name="HInterID" type="hidden" />
- <input id="HEntryID" name="HEntryID" type="hidden" />
+ <input id="HEntryID" name="HEntryID" value="0" type="hidden" />
</div>
</div>
<div class="layui-inline">
@@ -259,6 +260,14 @@
<label class="layui-form-label">鍌績娆℃暟:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSourceBillNo" lay-verify="HSourceBillNo" id="HSourceBillNo" disabled autocomplete="off" type="hidden">
+ <input id="HSourceInterID" name="HSourceInterID" value="0" type="hidden" />
+ <input id="HSourceEntryID" name="HSourceEntryID" value="0" type="hidden" />
+ <input id="HSourceBillType" name="HSourceBillType" value="0" type="hidden" />
</div>
</div>
</div>
@@ -417,9 +426,19 @@
set_AddFNew();
}
else if (OperationType == 2) {//鏈夋簮鍗�
- /*set_AddNew();*/
+ var datajson;
+ var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = $.parseJSON(decodeURI(arr));
+ $("#HSourceInterID").val(datajson.HRelationInterID);
+ $("#HSourceEntryID").val(datajson.HRelationEntryID);
+ $("#HSourceBillNo").val(datajson.HRelationBillNo);
+ $("#HSourceBillType").val(datajson.HRelationBillType);
+ set_EditFromGrid();
+ get_Display(sWhere);
}
else if (OperationType == 3) {//缂栬緫/鍥炲锛岃繖閲屾槸鍥炲
+
set_EditFromGrid();
get_Display(sWhere);
}
@@ -493,55 +512,6 @@
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
-
- //#region 鏈夋簮鍗曟柊澧�
- //function set_AddNew() {
- // refSav = "Add";
- // //鍒濆鍩烘湰淇℃伅璧嬪��
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- // $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- // $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
- // $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
- // $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
- // $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
-
- // $.ajax(
- // {
- // type: "GET",
- // url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // async: true,
- // data: {
- // "HSourceInterID": HMainSourceInterID,
- // "HSourceEntryID": HMainSourceEntryID,
- // "HSourceBillNo": HMainSourceBillNo,
- // "HSourceBillType": HBillType
- // },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // {
- // var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
- // $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
- // $("#HMaterModel").val(LoadData[0].HModel); //浜у搧瑙勬牸
- // $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
- // $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
- // $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
- // $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //婧愬崟绫诲瀷
- // $("#HQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
- // Qty = LoadData[0].HDatePlanQty;
- // }
- // else {
- // layer.alert(data.Message, { icon: 5 });
-
- // }
- // },
- // error: function (err) {
- // layer.alert(err, { icon: 5 });
- // }
- // });
- //}
- //#endregion
-
//缂栬緫
function set_EditFromGrid() {
refSav = "Update";
@@ -558,7 +528,7 @@
var data = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": data.HInterID
- , "HEntryID": data.HEntryID
+ /* , "HEntryID": data.HEntryID*/
, "HBillNo": data.HBillNo
, "HDate": formatDate(data.HDate)
, "HContext": data.HContext
@@ -577,6 +547,10 @@
, "HRelationEntryID": data.HRelationEntryID //鍏宠仈鍗曞瓙ID
, "HRelationBillNo": data.HRelationBillNo //鍏宠仈鍗曞崟鍙�
, "HRelationBillType": data.HRelationBillType //鍏宠仈鍗曠被鍨�
+ //, "HSourceInterID": data.HSourceInterID //婧愬崟ID
+ //, "HSourceEntryID": data.HSourceEntryID //婧愬崟瀛怚D
+ //, "HSourceBillNo": data.HSourceBillNo //婧愬崟鍗曞彿
+ //, "HSourceBillType": data.HSourceBillType //婧愬崟绫诲瀷
, "HMaker": data.HMaker //鍒跺崟浜�
, "HMakeDate": data.HMakeDate //鍒跺崟鏃ユ湡
, "HUpDater": sessionStorage["HUserName"] //淇敼浜�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index da4548a..b196b59 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -713,8 +713,12 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event:'鍗曟嵁鍙�' });
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}else {
switch (data[i].Type) {
//int
--
Gitblit v1.9.1