From c11891a1ecea24fe7e2591fbce392cd2d5b277dc Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 30 十一月 2022 09:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx | 5
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 6
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html | 123 +++++------------
WebTM/views/基础资料/公用基础资料/Gy_TechParamByProcList.html | 2
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 62 +++++---
WebTM/views/基础资料/公用基础资料/Gy_TechParamByProc.html | 21 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 57 ++++---
WebTM/views/基础资料/基础资料/Gy_MateMould.html | 95 +++++++++----
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/基础资料/基础资料/Gy_MateMouldList.html | 2
11 files changed, 203 insertions(+), 174 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index cb464ac..54bac55 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,7 +4,7 @@
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
- var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost/WEBAPI/"; //棰滃鍙板紡鏈烘湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProc.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProc.html"
index 4da1b61..0ae92a3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProc.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProc.html"
@@ -243,6 +243,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
var sWhere = "";
var date = new Date();
@@ -373,6 +374,24 @@
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
+
+ var data = obj.data;
+ if (obj.event == 'Date') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == 'HProcCheck') {
@@ -844,7 +863,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200, event: 'Date' });
break;
default:
if (data[i].name == '鐗╂枡浠ｇ爜') {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html"
index 7a16f21..6f04e9e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html"
@@ -75,7 +75,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index f2f53a9..d71754d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenOneRecordset(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.婧愬崟瀹㈡埛缂栫爜,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
+ SqlXMLReportData.GenEntireData(this, "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.婧愬崟瀹㈡埛缂栫爜,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx"
index 6197ca0..8cd4a2e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx"
@@ -14,8 +14,9 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- string sql1 = "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.鍞竴ID,1 妯″叿缂栫爜,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鑺綋鐗╂枡浠ｇ爜,a.鑺綋瑙勬牸鍨嬪彿,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,b.宸ュ簭浠ｇ爜,a.鏃ユ湡,a.鏃ヨ鍒掑伐鍗曟棩鏈�,a.鍒跺崟鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.鐢熶骇鏁伴噺,a.鐢熶骇鏁伴噺,a.婧愬崟瀹㈡埛缂栫爜,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid=" + Request.Params["linterid"];
- string sql2 = "select 鍣ㄥ叿缂栫爜 ,鍣ㄥ叿鍚嶇О, 搴撲綅, 鍣ㄥ叿ERP瀵瑰簲瑙勬牸鍨嬪彿 from h_v_Sc_ProcessExchangeBillQuerySub_Mould where hmainid=" + Request.Params["linterid"];
+ var a = Request.Params["linterid"];
+ string sql1 = "select distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.鍞竴ID,1 妯″叿缂栫爜,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鑺綋鐗╂枡浠ｇ爜,a.鑺綋瑙勬牸鍨嬪彿,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,b.宸ュ簭浠ｇ爜,a.鏃ユ湡,a.鏃ヨ鍒掑伐鍗曟棩鏈�,a.鍒跺崟鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.鐢熶骇鏁伴噺,a.鐢熶骇鏁伴噺,a.婧愬崟瀹㈡埛缂栫爜,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid=" + a.ToString();
+ string sql2 = "select 鍣ㄥ叿缂栫爜 ,鍣ㄥ叿鍚嶇О, 搴撲綅, 鍣ㄥ叿ERP瀵瑰簲瑙勬牸鍨嬪彿 from h_v_Sc_ProcessExchangeBillQuerySub_Mould where hmainid=" + a.ToString();
SqlXMLReportData.GenEntireData(this,sql1 ,sql2);
}
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html"
index d5c7a70..29322aa 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html"
@@ -33,6 +33,7 @@
margin-left: -15px;
margin-right: -15px;
}
+
</style>
</head>
<body>
@@ -59,7 +60,7 @@
<label class="layui-form-label">鍥哄畾椤圭洰</label>
<div class="layui-input-block">
<input type="radio" name="FixedItems" value="SMater" title="鐗╂枡">
- <input type="radio" name="FixedItems" value="SRelation" title="妯″叿">
+ <input type="radio" name="FixedItems" value="SMould" title="妯″叿">
<input type="radio" name="FixedItems" value="SUnit" title="鍗曚綅" checked>
<input type="radio" name="FixedItems" value="SFree" title="鑷敱" checked>
</div>
@@ -93,9 +94,9 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">妯″叿浠ｇ爜</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRelationNumber" id="HRelationNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HRelationID" id="HRelationID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchRelation" id="btnSearchRelation" style="width: 40px;">
+ <input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HMouldID" id="HMouldID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMould" id="btnSearchMould" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -103,13 +104,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">妯″叿鍚嶇О</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRelationName" id="HRelationName" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMouldName" id="HMouldName" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRelationModel" id="HRelationModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMouldModel" id="HMouldModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -251,7 +252,7 @@
var option = [];
var HModName = "Gy_MateMould";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","HUnitID","HMaterIDCol","HRelationIDCol","HUnitIDCol"];
+ var titleData = ["HItemID","HUnitID","HMaterIDCol","HMouldIDCol","HUnitIDCol","HRelationIDCol"];
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -297,7 +298,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterIDCol": "", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HRelationIDCol": "",
+ "HMaterIDCol": "", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HMouldIDCol": "",
"妯″叿浠ｇ爜": "", "妯″叿鍚嶇О": "", "HUnitIDCol": "", "鍗曚綅浠ｇ爜": "", "鍗曚綅鍚嶇О": "",
"寮�濮嬫棩鏈�": "", "缁撴潫鏃ユ湡": "", "澶囨敞": ""
};
@@ -318,10 +319,10 @@
NewRow.鐗╂枡鍚嶇О = $("#HMaterName").val();
NewRow.瑙勬牸鍨嬪彿 = $("#HMaterModel").val();
}
- else if (FixedItems == "SRelation") {
- NewRow.HRelationIDCol = $("#HRelationID").val();
- NewRow.妯″叿浠ｇ爜 = $("#HRelationNumber").val();
- NewRow.妯″叿鍚嶇О = $("#HRelationName").val();
+ else if (FixedItems == "SMould") {
+ NewRow.HMouldIDCol = $("#HMouldID").val();
+ NewRow.妯″叿浠ｇ爜 = $("#HMouldNumber").val();
+ NewRow.妯″叿鍚嶇О = $("#HMouldName").val();
}
NewRow.寮�濮嬫棩鏈� = Format(new Date(), "yyyy-MM-dd");
NewRow.缁撴潫鏃ユ湡 = "2100-01-01";
@@ -363,7 +364,14 @@
//鏂板鎸夐挳
form.on('submit(btn-AddNew)', function (data) {
- window.location.reload();
+ //window.location.reload();
+ option.data = [{ HItemID: "0", HMaterIDCol: "0", HMouldIDCol: "0", HRelationIDCol: "0", HUnitID: "0", HUnitIDCol: "0", 鍗曚綅浠ｇ爜: "", 鍗曚綅鍚嶇О: "", 澶囨敞: "", 妯″叿浜у搧瀵瑰簲琛ㄤ唬鐮�: "", 妯″叿浠ｇ爜: "",妯″叿鍚嶇О: "", 鐗╂枡浠ｇ爜: "", 鐗╂枡鍚嶇О: "", 瑙勬牸鍨嬪彿: "" }];
+ table.render(option)
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val("");
+ $("#HUpDater").val("");
+ OperationType = 1.1
});
@@ -400,6 +408,22 @@
});
}
+ if (obj.event == 'Date') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == 'HMaterCheck') {
@@ -426,11 +450,11 @@
, 瑙勬牸鍨嬪彿: checkStatus.data[0].瑙勬牸鍨嬪彿
});
var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
- if (FixedItems == "SRelation") {
+ if (FixedItems == "SMould") {
obj.update({
- HRelationIDCol: $("#HRelationID").val()
- , 妯″叿浠ｇ爜: $("#HRelationNumber").val()
- , 妯″叿鍚嶇О: $("#HRelationName").val()
+ HMouldIDCol: $("#HMouldID").val()
+ , 妯″叿浠ｇ爜: $("#HMouldNumber").val()
+ , 妯″叿鍚嶇О: $("#HMouldName").val()
});
}
layer.close(layer.index);
@@ -441,7 +465,7 @@
}
});
}
- if (obj.event == 'HRelationCheck') {
+ if (obj.event == 'HMouldCheck') {
layer.open({
type: 2,
skin: 'layui-layer-rim',
@@ -459,9 +483,10 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HRelationIDCol: checkStatus.data[0].HItemID
+ HMouldIDCol: checkStatus.data[0].HItemID
, 妯″叿浠ｇ爜: checkStatus.data[0].妯″叿浠ｇ爜
, 妯″叿鍚嶇О: checkStatus.data[0].妯″叿
+ , HRelationIDCol: checkStatus.data[0].HItemID
});
var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
if (FixedItems == "SMater") {
@@ -502,6 +527,7 @@
, 鍗曚綅浠ｇ爜: checkStatus.data[0].HNumber
, 鍗曚綅鍚嶇О: checkStatus.data[0].HName
});
+ console.log(obj)
layer.close(layer.index);
}
, btn2: function (index, layero) {
@@ -526,13 +552,14 @@
//淇濆瓨
function set_SaveBill(data) {
var sSubTable = table.cache['mainTable'];
+ console.log(sSubTable)
for (var i = 0; i < sSubTable.length; i++) {
if (!sSubTable[i].HMaterIDCol) {
var indexRow = i + 1;
layer.msg("绗�" + indexRow + "琛岋紝鐗╂枡涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!sSubTable[i].HRelationIDCol) {
+ if (!sSubTable[i].HMouldIDCol) {
var indexRow = i + 1;
layer.msg("绗�" + indexRow + "琛岋紝妯″叿涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -624,7 +651,7 @@
});
//琛ㄥご淇℃伅妯″叿寮圭獥
- form.on('submit(btnSearchRelation)', function () {
+ form.on('submit(btnSearchMould)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -644,10 +671,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HRelationID").val(checkStatus.data[0].HItemID);
- $("#HRelationNumber").val(checkStatus.data[0].妯″叿浠ｇ爜);
- $("#HRelationName").val(checkStatus.data[0].妯″叿);
- $("#HRelationModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+ $("#HMouldID").val(checkStatus.data[0].HItemID);
+ $("#HMouldNumber").val(checkStatus.data[0].妯″叿浠ｇ爜);
+ $("#HMouldName").val(checkStatus.data[0].妯″叿);
+ $("#HMouldModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -706,7 +733,7 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
rowdata = [{
- "HMaterIDCol": "", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HRelationIDCol": "",
+ "HMaterIDCol": "", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HMouldIDCol": "",
"妯″叿浠ｇ爜": "", "妯″叿鍚嶇О": "", "HUnitIDCol": "", "鍗曚綅浠ｇ爜": "", "鍗曚綅鍚嶇О": "",
"寮�濮嬫棩鏈�": "", "缁撴潫鏃ユ湡": "", "澶囨敞": ""
}];
@@ -725,6 +752,7 @@
//DisPlay_HideColumn();
}
+ // 鑾峰彇缃戞牸鍒楄〃鏁版嵁
function GetMateMouldValue(HItemID) {
var ajaxLoad = layer.load();
$.ajax({
@@ -750,10 +778,21 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200, event: 'Date' });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
+ if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMaterCheck", width: 200 });
+ } else if (data[i].name == '鍗曚綅浠ｇ爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HUnitCheck", width: 200 });
+ } else if (data[i].name == '妯″叿浠ｇ爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMouldCheck", width: 200 });
+ } else if (data[i].name == '妯″叿浜у搧瀵瑰簲琛ㄤ唬鐮�') {
+ data[i].name = '鍣ㄥ叿浜у搧浠ｇ爜'
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
+ }
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html"
index 94b59c4..2c66b0b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html"
@@ -100,7 +100,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
index 917ec54..0c6ea11 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
@@ -73,10 +73,27 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
+ <option style="color:blue;" value="1">鏈</option>
+ <option style="color:blue;" value="2">瀹℃牳閫氳繃</option>
+ <option style="color:blue;" value="3">鍏抽棴</option>
+ <option style="color:blue;" value="4">浣滃簾</option>
+ <option style="color:blue;" value="5">瀹℃牳閫�鍥�</option>
+ <option style="color:blue;" value="6">瀹℃牳涓�</option>
+ <option style="color:blue;" value="7">宸查槄</option>
+ <option style="color:blue;" value="8">宸插洖澶�</option>
+ <option style="color:blue;" value="9">缁撴</option>
+ <option style="color:blue;" value="10">楠岃瘉</option>
+ <option style="color:blue;" value="11">涓嬭揪</option>
+ <option style="color:blue;" value="12">寮�宸�</option>
+ <option style="color:blue;" value="13">鐢宠瀹℃壒</option>
+ <!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
+ <option style="color:blue;" value="15">鐢宠妫�楠�</option>
+ <option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
+ <option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
+
</select>
</div>
</div>
@@ -85,9 +102,11 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
- </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閿�鍞鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曟嵁</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
@@ -97,42 +116,26 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓氬姟鍛�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍙樻洿浜�</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
+ <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝鐢熶骇鏁伴噺</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐熻矗閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
+ <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -491,58 +494,6 @@
//鑾峰彇鏁版嵁
$("#HEmpID").val(checkStatus.data[0].HItemID);
$("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
-
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- })
- }
-
- //瀹㈡埛
- function get_btnHCus() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '瀹㈡埛'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- //鑾峰彇鏁版嵁
- $("#HCusID").val(checkStatus.data[0].HItemID);
- $("#HCusName").val(checkStatus.data[0].HName);
-
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- })
- }
-
- //宸ヤ綔涓績
- function get_btnHCenter() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '宸ヤ綔涓績'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- //鑾峰彇鏁版嵁
- $("#HCenterID").val(checkStatus.data[0].HItemID);
- $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index 514feea..1ceb916 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -136,7 +136,7 @@
</script>
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
@@ -144,7 +144,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
</div>
</script>
@@ -247,15 +247,15 @@
//鍒楄缃�
case 'get_HideColumn1': get_HideColumn1();
break;
- //鏄庣粏鍒楄缃�
- case 'get_HideColumn2': get_HideColumn2();
- break;
- //鏄庣粏鍒楄缃�
- case 'get_HideColumn3': get_HideColumn3();
- break;
- //鏄庣粏鍒楄缃�
- case 'get_HideColumn4': get_HideColumn4();
- break;
+ ////鏄庣粏鍒楄缃�
+ //case 'get_HideColumn2': get_HideColumn2();
+ // break;
+ ////鏄庣粏鍒楄缃�
+ //case 'get_HideColumn3': get_HideColumn3();
+ // break;
+ ////鏄庣粏鍒楄缃�
+ //case 'get_HideColumn4': get_HideColumn4();
+ // break;
};
});
@@ -298,8 +298,8 @@
case 'get_StationIn': get_StationIn();
break;
//鍒楄缃�
- case 'get_HideColumn1': get_HideColumn1();
- break;
+ //case 'get_HideColumn1': get_HideColumn1();
+ // break;
//鏄庣粏鍒楄缃�
case 'get_HideColumn2': get_HideColumn2();
break
@@ -552,7 +552,7 @@
}
//鍔ㄦ�佹樉绀哄垪鍚�
- table.render({
+ option3 = {
elem: '#mainTable1'
, toolbar: '#toolbarDemo3'
, cols: [col]
@@ -562,7 +562,8 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- });
+ }
+ table.render(option3);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -575,6 +576,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ DisPlay_HideColumn_Mod();
}
//#endregion
@@ -609,8 +611,9 @@
}
}
}
+
//鍔ㄦ�佹樉绀哄垪鍚�
- table.render({
+ option4 = {
elem: '#mainTable3'
, toolbar: '#toolbarDemo4'
, cols: [col]
@@ -620,8 +623,9 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- });
-
+ }
+ table.render(option4);
+
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -633,6 +637,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ DisPlay_HideColumn_Tech();
}
//#endregion
@@ -1120,11 +1125,11 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "_Mod" + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn3();
+ DisPlay_HideColumn_Mod();
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1132,11 +1137,11 @@
}
//鏄剧ず
- function DisPlay_HideColumn3() {
+ function DisPlay_HideColumn_Mod() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ data: { "HModName": HModName + "_Mod", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1234,11 +1239,11 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "_Tech" + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn4();
+ DisPlay_HideColumn_Tech();
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1246,11 +1251,11 @@
}
//鏄剧ず
- function DisPlay_HideColumn4() {
+ function DisPlay_HideColumn_Tech() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ data: { "HModName": HModName + "_Tech", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 3a16b25..9c9a0c4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -275,11 +275,11 @@
]]
,done: function (res) {
var count = 0;
- var HBillNo = "";
+ var OnlyID = -1;
for (var i = 0; i < res.data.length; i++) {
- if (res.data[i]["娴佽浆鍗″彿"] != HBillNo) {
+ if (res.data[i]["鍞竴ID"] != OnlyID) {
count += res.data[i]["鏁存壒"];
- HBillNo = res.data[i]["娴佽浆鍗″彿"];
+ OnlyID = res.data[i]["鍞竴ID"];
}
}
var divArr = $(".layui-table-total div.layui-table-cell");
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index a7577c1..0378ef0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -361,13 +361,35 @@
}
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1401' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HSSDate").val(shijian);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(HInterID);
+ /* RoadBillSub(linterid);*/
+ }
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//閫�鍑烘寜閽�
- form.on('submit(Cancel)', function () {
+ form.on('submit(Exit)', function () {
Pub_Close(1);
})
@@ -420,6 +442,20 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "../../user/login.html"; });
}
+ }
+ //#endregion
+
+ //#region 鏃堕棿杞崲
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
}
//#endregion
@@ -487,29 +523,7 @@
var month = date.getMonth() + 1;
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '1401' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HSSDate").val(shijian);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(HInterID);
- /* RoadBillSub(linterid);*/
- }
+
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
--
Gitblit v1.9.1