From fd319af47693707296c792520f8659b27e350cc1 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 11 九月 2025 10:19:34 +0800
Subject: [PATCH] 增加斯莫尔打印地址，包装单增加白标打印模板
---
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index bd17a33..d7a1eb6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/MESLanguage.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-select .layui-input {
padding-right: 0px;
@@ -305,6 +306,21 @@
function set_ClearBill() {
//鍒濆鍖栫粍缁�
Organ();
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鏌ヨ
get_FastQuery();
}
@@ -413,10 +429,10 @@
sWhere += " and 鍗曟嵁鍙� like '%" + 鍗曟嵁鍙� + "%'";
}
if (HBeginDate != "") {
- sWhere += " and 鍒跺崟鏃ユ湡 >= '" + HBeginDate + "'";
+ sWhere += " and convert(varchar(10),鍒跺崟鏃ユ湡,120) >= '" + HBeginDate + "'";
}
if (HEndDate != "") {
- sWhere += " and 鍒跺崟鏃ユ湡 <= '" + HEndDate + "'";
+ sWhere += " and convert(varchar(10),鍒跺崟鏃ユ湡,120) <= '" + HEndDate + "'";
}
sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
@@ -730,7 +746,7 @@
$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
- $("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+ $("#HInitTimeCycle").val("1"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
}
//#endregion
--
Gitblit v1.9.1