From 3d0a7cceea04c62d75d24d5ea9527b8957aff7fe Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 31 七月 2022 15:01:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 18 ++++++++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 6 +++---
2 files changed, 21 insertions(+), 3 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 46a866e..1acef17 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"
@@ -417,7 +417,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
@@ -456,8 +456,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HDeptName").val("");//鍗曟嵁鍙�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 7a1df58..dfcafaa 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -56,6 +56,7 @@
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -1098,6 +1099,21 @@
})
});
+ //鎵撳嵃
+ form.on('submit(btn_print)', function () {//浜у搧
+ var hinterid = $("#HinterID").val();
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hinterid + '&MyMsg=' + hinterid + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ });
+
//閫夋嫨瀛愪欢寮圭獥PartInformation.html
form.on('submit(btnSearchMater)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1728,6 +1744,8 @@
});
}
+
+
//杩斿洖鐢熶骇浠诲姟鍗�
function GetICMOBillValue(hmainid, HEntryID) {
--
Gitblit v1.9.1