From 9cf69741daafee74e41020205ef631cf5ba264bc Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 03 三月 2025 09:34:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 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 29e8ee2..3f8c168 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"
@@ -21,7 +21,7 @@
<div class="layui-col-md12">
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group" >
+ <form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
@@ -185,32 +185,32 @@
</div>
</div>
</div>
-
+
<!--<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="hname" id="hname">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浜у搧浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="hnumber" id="hnumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="hmodel" id="hmodel">
- </div>
- </div>
- </div>-->
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hname" id="hname">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hnumber" id="hnumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hmodel" id="hmodel">
+ </div>
+ </div>
+ </div>-->
</div>
</div>
<table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
@@ -227,6 +227,9 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
<i class="layui-icon layui-icon-file"></i>鍒犻櫎
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnGX" id="BtnGX">
+ <i class="layui-icon layui-icon-file"></i>鏁版嵁鏇存柊
</button>
</div>
</script>
@@ -260,7 +263,7 @@
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ ,height: 'full-50'
, page: true
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -323,7 +326,7 @@
if ($("#HInitTimeCycle").val() == 0 && $("#HInitTimeCycle").val() == "") {
setSelect_HInitTimeCycle();
}
-
+
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
@@ -517,7 +520,7 @@
//鏍囨敞閫変腑鏍峰紡
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
});
-
+
//鎵撳嵃
//form.on('submit(Print)', function (obj) {//閫�鍑�
// var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
@@ -584,13 +587,13 @@
var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
if (checkStatus.data.length == 1) {
var HBarCode_Pack = checkStatus.data[0].鍞竴鏉＄爜;
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
, title: '鐧芥爣鎵撳嵃' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../../杞﹂棿绠＄悊/浜х嚎/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
@@ -609,7 +612,7 @@
////var linterid = $("#HInterID").val();
////var linterid = "28973";
var Type = "HBarCodePrint";
- var OpenTmp = "鐧芥爣鎵撳嵃1";
+ var OpenTmp = "鐧芥爣鎵撳嵃15";
//var ReportViewer = document.getElementById("ReportViewer");
window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
});
@@ -694,6 +697,33 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
});
+
+
+ //鏇存柊
+ form.on('submit(BtnGX)', function (data) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ var HRemark = "鏃�";
+ $.ajax({
+ url: GetWEBURL1() + '/LEMS/SaveToSc_PackUnionBillSub_Back',
+ type: "GET",
+ data: { "HInterID": HInterID, "HRemark": HRemark },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹洿鏂帮紒');
+ }
+ });
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
@@ -705,7 +735,7 @@
}
$("#HInitTimeCycle").empty(); //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
- $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
$("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
--
Gitblit v1.9.1