From 773d2dbe642d31e4dd2e2e9962ea8f60a024b4cc Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 06 三月 2026 13:00:17 +0800
Subject: [PATCH] 1
---
WebTM/views/成本管理/成本费用报表/CB_ActualItemMoneyCost.html | 639 +++++++++++++++
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 3
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 266 ++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 4
WebTM/views/基础资料/成本基础资料/Add_Edit_Gy_CostAverageType.html | 45 +
WebTM/views/成本管理/费用单引入/CB_ItemMoneyBill_Excel.html | 1
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 24
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html | 35
WebTM/views/设备管理/设备报表/Sb_EquipDotCheckTaskReport.html | 55 +
WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html | 4
WebTM/views/验收入库/产品入库/Kf_ProductInBillEdit.html | 34
WebTM/views/index_QiaoYi.html | 7
WebTM/views/基础资料/成本基础资料/CB_Wip_excelImport.html | 22
WebTM/views/基础资料/公用基础资料/Gy_MaterialPackingRelation_Edit.html | 73 +
WebTM/views/成本管理/期初在产品表/Gy_WIPBal_Excel.html | 302 +++++++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 16
WebTM/views/模治具管理/器具报表/Sc_MouldDotCheckTaskReport.html | 56 +
WebTM/views/成本管理/期初在产品表/Kf_WIPBal.html | 543 +++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 15
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 24
WebTM/WebTM.csproj | 5
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html | 199 ----
22 files changed, 2,128 insertions(+), 244 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b14533d..8af88f0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -665,6 +665,11 @@
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeMaterEntryReport.html" />
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillList.html" />
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillEdit.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鎶ヨ〃\CB_ActualItemMoneyCost.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤璋冩暣鍗昞CB_ChangeMoneyBillEdit.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤璋冩暣鍗昞CB_ChangeMoneyBillList.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鏈熷垵鍦ㄤ骇鍝佽〃\Gy_WIPBal_Excel.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鏈熷垵鍦ㄤ骇鍝佽〃\Kf_WIPBal.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7645aa8..811c313 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,12 +2,15 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- /* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/"; //闄堥晲鍝叉湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index f1fad27..60fe8c1 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -220,10 +220,11 @@
<a>楠屾敹鍏ュ簱</a>
<dl class="layui-nav-child">
<!--<dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
- <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd>
- <dd><a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">鐢熶骇閫�搴撳崟缁存姢</a></dd>-->
+ <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd>-->
+ <dd><a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曠淮鎶�</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">鐢熶骇閫�搴撳崟缁存姢</a></dd>-->
<dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曠淮鎶�</a></dd>-->
<!--<dd><a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">濮斿鍔犲伐鍏ュ簱鍗曠淮鎶�</a></dd>
<dd><a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">濮斿鍔犲伐鍑哄簱鍗曠淮鎶�</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>-->
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_DepartmentList.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_DepartmentList.html"
index 2903dc7..c23a129 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_DepartmentList.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_DepartmentList.html"
@@ -1297,7 +1297,8 @@
if (typeof(openType) != "undefined") {
if (openType == 1) {
/*addSWhere = " and 绂佺敤鏍囪 = '' 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
- addSWhere = " and 绂佺敤鏍囪 = ' ' and 杞﹂棿鏍囪 = 'Y' ";
+ //addSWhere = " and 绂佺敤鏍囪 = ' ' and 杞﹂棿鏍囪 = 'Y' ";
+ addSWhere = " ";
} else {
addSWhere = " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> '' ";
}
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_MaterialPackingRelation_Edit.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_MaterialPackingRelation_Edit.html"
index 9681879..ce377bd 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_MaterialPackingRelation_Edit.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_MaterialPackingRelation_Edit.html"
@@ -243,14 +243,14 @@
</script>
<!--琛屼笅鎷夐�夋嫨(鍛ㄨ浆瀹瑰櫒鏍囪)-->
<script type="text/html" id="HTransPackFlag">
- <select name="HTransPackFlag" lay-filter="HTransPackFlag" id="HTransPackFlag{{d.LAY_TABLE_INDEX+1}}">
+ <select name="HTransPackFlag" lay-filter="HTransPackFlag" id="HTransPackFlag{{d.LAY_TABLE_INDEX+1}}" disabled>
<option value="0">鍚�</option>
<option value="1">鏄�</option>
</select>
</script>
<!--琛屼笅鎷夐�夋嫨(鍙戣揣瀹瑰櫒鏍囪)-->
<script type="text/html" id="HSendPackFlag">
- <select name="HSendPackFlag" lay-filter="HSendPackFlag" id="HSendPackFlag{{d.LAY_TABLE_INDEX+1}}">
+ <select name="HSendPackFlag" lay-filter="HSendPackFlag" id="HSendPackFlag{{d.LAY_TABLE_INDEX+1}}" disabled>
<option value="0">鍚�</option>
<option value="1">鏄�</option>
</select>
@@ -879,11 +879,31 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
+ //鍒ゆ柇鏄惁宸茬粡瀛樺湪璇ュ鍣ㄤ簡
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HMouldID"] == checkStatus.data[0].hmainid) {
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ layer.msg("瀹瑰櫒銆愬鍣ㄤ唬鐮侊細" + checkStatus.data[0].妯″叿缂栧彿 + "锛涘鍣ㄥ悕绉帮細" + checkStatus.data[0].妯″叿鍚嶇О + "銆戯細褰撳墠瀹瑰櫒宸茬粡瀛樺湪锛屼笉鍙噸澶嶈缃紒锛�");
+ obj.event = "";
+ return false;
+ }
+ }
+
+ //鏇存柊鏁版嵁
obj.update({
"HMouldID": checkStatus.data[0].hmainid,
"HMouldNumber": checkStatus.data[0].妯″叿缂栧彿,
"HMouldName": checkStatus.data[0].妯″叿鍚嶇О,
+ "HMouldLength": checkStatus.data[0].闀�,
+ "HMouldWidth": checkStatus.data[0].瀹�,
+ "HMouldHeight": checkStatus.data[0].楂�,
+ "HMouldFoldHeight": checkStatus.data[0].鎶樺彔楂樺害,
+ "HTransPackFlag": checkStatus.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == "Y" ? 1 : 0,
+ "HSendPackFlag": checkStatus.data[0].鍙戣揣瀹瑰櫒鏍囪 == "Y" ? 1 : 0,
});
+
+ setSelectByTableRender(); //鏍规嵁瀛愯〃鍊奸噸鏂版覆鏌撲笅鎷夊垪琛�
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
});
@@ -962,6 +982,30 @@
$.each(option.data, function (index, value) {
if (dataindex == index) {
value.HDefaultTransPackFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+
+ //鍒ゆ柇鏄惁鏈夊叾浠栭粯璁ょ殑鍛ㄨ浆瀹瑰櫒
+ if (data.value * 1 == 1) {
+ if (value.HTransPackFlag * 1 == 0) {
+ value.HDefaultTransPackFlag = 0; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultTransPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultTransPackFlag鍊艰缃笅鎷夊垪琛�
+ layer.msg("褰撳墠瀹瑰櫒涓嶄负鍛ㄨ浆瀹瑰櫒锛屽彲浠ヨ缃负榛樿鍛ㄨ浆瀹瑰櫒锛侊紒锛�");
+ return;
+ }
+
+ var count = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HDefaultTransPackFlag"] * 1 == 1) {
+ count++;
+ }
+ }
+ if (count > 1) {
+ value.HDefaultTransPackFlag = 0; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultTransPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultTransPackFlag鍊艰缃笅鎷夊垪琛�
+ layer.msg("褰撳墠宸茬粡瀛樺湪鍏朵粬榛樿鍛ㄨ浆瀹瑰櫒锛岃鍏堝彇娑堝叾浠栭粯璁ゅ懆杞鍣ㄥ悗鍐嶈缃瀹瑰櫒涓洪粯璁ゅ懆杞鍣紒锛侊紒");
+ return;
+ }
+ }
+
setSelectHDefaultTransPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultTransPackFlag鍊艰缃笅鎷夊垪琛�
}
});
@@ -984,6 +1028,31 @@
$.each(option.data, function (index, value) {
if (dataindex == index) {
value.HDefaultSendPackFlag = data.value * 1; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+
+ //鍒ゆ柇鏄惁鏈夊叾浠栭粯璁ょ殑鍛ㄨ浆瀹瑰櫒
+ if (data.value * 1 == 1) {
+ if (value.HSendPackFlag * 1 == 0) {
+ value.HDefaultSendPackFlag = 0; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultSendPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ layer.msg("褰撳墠瀹瑰櫒涓嶄负鍙戣揣瀹瑰櫒锛屼笉鍙涓洪粯璁ゅ彂璐у鍣紒锛侊紒");
+ return;
+ }
+
+ //鍒ゆ柇鏄惁鏈夊叾浠栧鍣ㄥ凡缁忚缃负榛樿鍙戣揣瀹瑰櫒
+ var count = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HDefaultSendPackFlag"] * 1 == 1) {
+ count++;
+ }
+ }
+ if (count > 1) {
+ value.HDefaultSendPackFlag = 0; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultSendPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ layer.msg("褰撳墠宸茬粡瀛樺湪鍏朵粬榛樿鍙戣揣瀹瑰櫒锛岃鍏堝彇娑堝叾浠栭粯璁ゅ彂璐у鍣ㄥ悗鍐嶈缃瀹瑰櫒涓洪粯璁ゅ彂璐у鍣紒锛侊紒");
+ return;
+ }
+ }
+
setSelectHDefaultSendPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
}
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
index d16d635..23d0fa3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
@@ -433,6 +433,10 @@
"HMaterTypeID": row["HMaterTypeID"] || 0,
"HMaterType": row["HName"] || "",
"HWeight": row["鏉冮噸"] || 0,
+ "HProcID": row["HProcID"] || 0,
+ "HProcName": row["宸ュ簭"] || "",
+
+
});
}
@@ -550,6 +554,8 @@
"HWeight": "0"
, "HMaterTypeID": "0"
, "HMaterType": ""
+ , "HProcID": "0"
+ , "HProcName": ""
};
@@ -608,6 +614,8 @@
, { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HMaterTypeID', title: 'HMaterTypeID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HMaterType', title: '鐗╂枡鍒嗙被', edit: 'text', event: "HMaterTypeList", style: 'background-color: #f9f9f9;' }
+ , { field: 'HProcID', title: 'HProcID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HProcName', title: '宸ュ簭', edit: 'text', event: "HHProcList", style: 'background-color: #f9f9f9;' }
, { field: 'HWeight', title: '鏉冮噸', edit: 'text', style: 'background-color: #f9f9f9;' }
@@ -664,7 +672,42 @@
window.tableEditObj = obj;
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
-
+
+ if (obj.event == "HHProcList") {
+ //CusType = 2;
+ // 鏂板锛氬皢缂栬緫瀵硅薄obj璧嬪�肩粰鍏ㄥ眬鍙橀噺锛屼緵GetProjectMoneyValue浣跨敤
+ //tableEditObj = obj;
+ // 鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣擄紙鍘熸湁浠ｇ爜涓嶅彉锛�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ area: ['90%', '90%'],
+ title: '椤圭洰璐圭敤鍒楄〃',
+ shift: 2,
+ content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ //OptionData = checkStatus.data[0];
+ obj.update({
+ "HProcID": checkStatus.data[0].HItemID
+ , "HProcName": checkStatus.data[0].宸ュ簭鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ //obj.update({
+ // "HBeginAddr": OptionData.HItemID
+ // , "HBeginAddrName": OptionData.鍦板尯鍚嶇О
+ //})
+ }
+ })
+ }
if (obj.event == "HMaterTypeList") {
//CusType = 2;
// 鏂板锛氬皢缂栬緫瀵硅薄obj璧嬪�肩粰鍏ㄥ眬鍙橀噺锛屼緵GetProjectMoneyValue浣跨敤
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html"
index c150c16..43e8430 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html"
@@ -4,14 +4,17 @@
<head>
<meta charset="utf-8" />
<title>wip瀵煎叆</title>
- <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="../../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../../layuiadmin/PubCustom.js"></script>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
@@ -93,7 +96,7 @@
<script>
layui.config({
- base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
@@ -191,6 +194,7 @@
if (monthSelect) {
monthSelect.value = currentMonth;
}
+ form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
index 9ebb046..6d63046 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
@@ -385,10 +385,10 @@
, page: true
, cellMinWidth: 120
, totalRow: true
- , limit: 50
+ , limit: 200
, height: 'full-50'
, cols: [] // 鍒濆涓虹┖锛屽姩鎬佸姞杞�
- , limits: [50, 500, 5000, 20000]
+ , limits: [200, 500, 5000, 50]
, done: function (res, curr, count) {
console.log("=== 琛ㄦ牸娓叉煋瀹屾垚鍥炶皟 ===");
console.log("鎬绘潯鏁�:", count);
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
index f1904fb..15ad73d 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
@@ -264,14 +264,15 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , laydate = layui.laydate;
//妯″潡鍚�
var HModName = "CB_ItemMoneyBillEdit";
@@ -314,6 +315,8 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
}
@@ -363,18 +366,6 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
-
- //鏂板琛岃〃鏍兼暟鎹�
- var NewRow =
- {
- "HBeginAddr": "0"
- , "HBeginAddrName": ""
- , "HEndAddr": "0"
- , "HEndAddrName": ""
- , "HTransType": ""
- , "HMoney": "0"
-
- };
switch (obj.event) {
case 'btn-AddLine':
// 鑾峰彇褰撳墠鏃ユ湡
@@ -406,9 +397,6 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
-
- // 閲嶆柊缁戝畾鏃ユ湡閫夋嫨鍣ㄤ簨浠�
- bindDatePickers();
layer.msg('澧炲姞涓�琛屾垚鍔燂紒');
break;
@@ -447,6 +435,22 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ var data = obj.data; //鑾峰彇褰撳墠琛岀殑鏁版嵁 //灏唎bj.data 瀛楃涓茬被鍨� 璧嬪�肩粰data
+ if (obj.event == 'HDate') { //鍒ゆ柇鎺ュ彈鍒扮殑鏁版嵁瀛楁 id鏄惁涓� Hdata
+ var field = $(this).data('field');//鑾峰彇鏃ユ湡瀛楁
+ laydate.render({
+ elem: this.firstChild //灏嗘棩鏈熼�夋嫨鍣ㄧ粦瀹氬埌瑙﹀彂浜嬩欢鐨勫厓绱犵殑绗竴涓瓙鍏冪礌
+ , show: true //鐩存帴鏄剧ず 鏃ユ湡閫夋嫨鍣紝鑰屼笉鏄瓑寰呯敤鎴风偣鍑�
+ , closeStop: this // 鍒ゆ柇鐐瑰嚮鏃ユ湡閫夋嫨鍣ㄥ閮ㄦ椂鏄惁鍏抽棴
+ , done: function (nowDate) { //褰撴棩鏈熼�夋嫨瀹屾垚鏃舵墽琛岀殑鍥炶皟鍑芥暟
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate; //data瀵硅薄涓殑鏃ユ湡瀛楁
+ obj.update(data); //鏇存柊鍥炶皟鏁版嵁
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
});
@@ -731,36 +735,6 @@
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
- // 缁戝畾鏃ユ湡閫夋嫨鍣ㄤ簨浠�
- function bindDatePickers() {
- // 绉婚櫎鏃х殑浜嬩欢缁戝畾
- $(document).off('change', '#mainTable .date-picker');
-
- // 缁戝畾鏂扮殑浜嬩欢
- $(document).on('change', '#mainTable .date-picker', function () {
- var selectedDate = $(this).val();
- var tr = $(this).closest('tr');
- var index = tr.attr('data-index');
-
- // 鑾峰彇琛ㄦ牸鏁版嵁
- var tableData = table.cache.mainTable;
- if (tableData && tableData[index]) {
- // 鏇存柊鏁版嵁
- tableData[index].HDate = selectedDate;
-
- // 鍙�夛細濡傛灉闇�瑕佺珛鍗虫洿鏂版樉绀�
- $(this).val(selectedDate);
-
- console.log('绗�' + (parseInt(index) + 1) + '琛屾棩鏈熸洿鏂颁负:', selectedDate);
- }
- });
- }
-
- // 鍦ㄩ〉闈㈠姞杞藉悗鍒濆鍖栫粦瀹�
- setTimeout(function () {
- bindDatePickers();
- }, 300);
-
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -853,7 +827,9 @@
, totalRow: true
, cellMinWidth: 120
, height: 400
- , limit: 100
+ , limit: 10
+ , limits: [10, 100, 500, 1000]
+ , page: true
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
@@ -870,17 +846,7 @@
, { field: 'HWaster', title: '鎹熻��', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', style: 'background-color: #f9f9f9;' }
- , {
- field: 'HDate',
- title: '鏃ユ湡',
- width: 160,
- edit: false, // 绂佺敤layui鐨勭紪杈戯紝浣跨敤鎴戜滑鑷繁鐨�
- templet: function (d) {
- // 浣跨敤HTML5鐨刣ate杈撳叆妗�
- var dateValue = d.HDate || new Date().toISOString().split('T')[0];
- return '<input type="date" class="layui-input date-picker" value="' + dateValue + '" style="height: 28px; padding: 0 5px; width: 100%; border: none; background: transparent;">';
- }
- }
+ , {field: 'HDate',title: '鏃ユ湡',width: 160,event: 'HDate'}
, { field: 'HBeginBalance', title: '寮�濮嬫暟鍊�', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HEndBalance', title: '缁撴潫鏁板��', edit: 'text', style: 'background-color: #f9f9f9;' }
, { field: 'HTimes', title: '鏃堕棿鍛ㄦ湡', edit: 'text', style: 'background-color: #f9f9f9;' }
@@ -899,13 +865,13 @@
, "HProcName": ""
, "HProcID": "0"
, "HMoney": "0"
- , "HWaster": ""
+ , "HWaster": "0"
, "HQty": "0"
, "HPrice": "0"
- , "HDate": ""
+ , "HDate": Format(new Date(), "yyyy-MM-dd")
, "HBeginBalance": "0"
, "HEndBalance": "0"
- , "HTimes": ""
+ , "HTimes": "0"
}];
option.data = rowdata;
@@ -1155,106 +1121,7 @@
function setInit_PushBill() {
//鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
createBillNo();
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , cellMinWidth: 120
- , height: 400
- , limit: 100
- , cols: [[
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
- , { field: 'HBeginAddr', title: '濮嬪彂鍦癐D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HBeginAddrName', title: '濮嬪彂鍦�', edit: 'text', event: "HAreaList", style: 'background-color: #f9f9f9;' }
- , { field: 'HEndAddr', title: '鐩殑鍦癐D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HEndAddrName', title: '鐩殑鍦�', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
-
- , { field: 'HTransType', title: '杩愯緭鏂瑰紡', templet: '#HTransType' }
- , { field: 'HMoney', title: '杩愯緭璐圭敤', edit: 'text', style: 'background-color: #f9f9f9;' }
- /* , { field: 'HTaxRate', title: '绋庣巼', edit: 'text', style: 'background-color: #f9f9f9;' }*/
-
-
- , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', style: 'background-color: #f9f9f9;' }
- , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' }
- ]]
- }
- //鍒濆鍖栨棩鏈熴�佸埗鍗曚汉銆佸埗鍗曟棩鏈�
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HReceiveDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HDeptID").val(sessionStorage["HDeptID"]);
- $("#HDeptName").val(sessionStorage["HDept"]);
- $("#HDeptName").val(sessionStorage["HDept"]);
- $("#HEmpID").val(sessionStorage["HEmpID"]);
- $("#HEmpName").val(sessionStorage["HEmpName"]);
-
- //璁剧疆婧愬崟绫诲瀷
- //$("#HSourceBillType").val(HSourceBillType);
- //var temp = $("#HSourceBillType").val();
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
- //$("#HSourceBillType").val() == "3321"
- if (true) {
- //鑾峰彇 getUrlVars
- var data = getUrlVars_JSON().data;
- var dataArray = [];
-
- for (var i = 0; i < data.length; i++) {
- var temp = getPushSource_ICMOBillInit(data[i].HInterID, data[i].HEntryID);
- if (temp != "none") {
- dataArray.push(temp);
- dataID = dataID + "," + data[i].HInterID;
- } else {
- layer.alert("鐩爣鎵胯繍鍟嗗拰杩愬崟鎵胯繍鍟嗕笉鍚�!", {
- icon: 5,
- btn: ['纭畾']
- }, function () {
- // 鍏抽棴褰撳墠寮圭獥
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- parent.$("#btnSearch").trigger('click');
-
-
- });
- return;
- }
- }
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMainSourceInterID": "0"
- , "HMainSourceEntryID": "0"
- , "HMainSourceBillNo": ""
- , "HMainSourceBillType": $("#BillType").val()
-
-
- , "HCarrierID": dataArray[0].鎵胯繍鍟咺D
- , "HCarrierName": dataArray[0].鎵胯繍鍟嗗悕绉�
- , "HCurID": dataArray[0].甯佸埆
- , "HCurName": dataArray[0].甯佸埆鍚嶇О
- // , "HExRate": dataArray[0].姹囩巼
- });
-
- //瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdata.push(
- {
- 'HBeginAddr': dataArray[i].濮嬪彂鍦�
- , 'HBeginAddrName': dataArray[i].濮嬪彂鍦板悕绉� ?? ""
- , 'HEndAddr': dataArray[i].鐩殑鍦�
- , 'HEndAddrName': dataArray[i].鐩殑鍦板悕绉� ?? ""
- , "HTransType": dataArray[i].杩愯緭鏂瑰紡 ?? ""
- , "HMoney": dataArray[i].杩愯緭璐圭敤 ?? ""
- }
- );
- }
- option.data = rowdata;
- table.render(option);
- }
- else {
- return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟涓嬫帹锛侊紒');
- }
+
}
//#endregion
@@ -1673,14 +1540,6 @@
});
}
}
-
- setTimeout(function () {
- // 閲嶆柊缁戝畾琛屽唴浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- });
- }, 300);
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\346\212\245\350\241\250/CB_ActualItemMoneyCost.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\346\212\245\350\241\250/CB_ActualItemMoneyCost.html"
new file mode 100644
index 0000000..5cc12fe
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\346\212\245\350\241\250/CB_ActualItemMoneyCost.html"
@@ -0,0 +1,639 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鏈熷垵鍦ㄤ骇鍝佹姤琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!-- 娉ㄦ剰锛氭墍鏈夊紩鐢ㄨ矾寰勪繚鎸佷笌鍘熼」鐩竴鑷达紝纭繚鍔熻兘瀹屾暣 -->
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <form class="layui-form" action="" lay-filter="component-form-group" autocomplete="off">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!-- 鍔ㄦ�佹覆鏌撹溅闂� -->
+ </select>
+ </div>
+ </div>
+ <!-- 鐗╂枡 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">璐圭敤椤圭洰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HItMoneyName" id="HItMoneyName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HItMoneyID" id="HItMoneyID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HItemMoneyList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鎴愭湰瀵硅薄 </label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCostObjectName" id="HCostObjectName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HCostObjectID" id="HCostObjectID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCostobjList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HProcID" id="HProcID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!-- 寮�濮嬪勾鏈� -->
+ <div class="layui-inline" style="margin-left: 20px;">
+ <label class="layui-form-label">寮�濮嬪勾鏈�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="ID-laydate-start-month" placeholder="閫夋嫨寮�濮嬪勾鏈�" readonly>
+ </div>
+ </div>
+
+ <!-- 缁撴潫骞存湀 -->
+ <div class="layui-inline" style="margin-left: 20px;">
+ <label class="layui-form-label">缁撴潫骞存湀</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="ID-laydate-end-month" placeholder="閫夋嫨缁撴潫骞存湀" readonly>
+ </div>
+ </div>
+ <!-- 鏌ヨ鎸夐挳 -->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <!-- 閲嶇疆鎸夐挳 -->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ </form>
+ <div style="margin-top: 10px;">
+ <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+ <!-- 琛ㄦ牸澶村伐鍏锋爮 -->
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/'
+ }).extend({
+ index: 'lib/index',
+ }).use(['index', 'form', 'table', 'element', 'laydate', 'soulTable', 'tableSelect'], function () {
+ var $ = layui.$,
+ admin = layui.admin,
+ layer = layui.layer,
+ table = layui.table,
+ form = layui.form,
+ element = layui.element,
+ laydate = layui.laydate,
+ soulTable = layui.soulTable,
+ tableSelect = layui.tableSelect;
+
+ // 妯″潡鍚嶏紙鐢ㄤ簬鍒楄缃瓨鍌級
+ var HModName2 = "Pay_PaymentEntryReport2";
+ // 琛ㄦ牸閫夐」
+ var option2 = {
+ elem: '#mainTable2',
+ toolbar: '#toolbarDemo2',
+ height: 'full-120', // 閫傚綋鐣欏嚭搴曢儴绌洪棿
+ page: true,
+ cellMinWidth: 90,
+ totalRow: true,
+ limit: 500,
+ limits: [50, 500, 5000, 20000],
+ done: function (res, curr, count) {
+ soulTable.render(this);
+ },
+ cols: [[]]
+ };
+
+ // 鍏ㄥ眬鏌ヨ鏉′欢瀛楃涓�
+ var sWhere = "";
+
+
+ function initPage() {
+ // 娓叉煋杞﹂棿涓嬫媺妗�
+ loadDeptSelect();
+
+ // 璁剧疆榛樿鏃ユ湡: 寮�濮嬪勾鏈堜负7涓湀鍓嶏紝缁撴潫骞存湀涓轰粖澶�
+ var currentDate = new Date();
+ var lastMonth = new Date(currentDate);
+ lastMonth.setMonth(currentDate.getMonth() - 12);
+
+ // 鏂板锛氭覆鏌撳紑濮嬪勾鏈堥�夋嫨鍣�
+ laydate.render({
+ elem: '#ID-laydate-start-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: lastMonth,
+ done: function (value, date) {
+ // 鍙互閫夋嫨鍦ㄨ繖閲岃Е鍙戞煡璇�
+ // getFastQuery(2);
+ }
+ });
+
+ // 鏂板锛氭覆鏌撶粨鏉熷勾鏈堥�夋嫨鍣�
+ laydate.render({
+ elem: '#ID-laydate-end-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: currentDate,
+ done: function (value, date) {
+ // 鍙互閫夋嫨鍦ㄨ繖閲岃Е鍙戞煡璇�
+ // getFastQuery(2);
+ }
+ });
+
+ getFastQuery(2);
+ // 閲嶆柊娓叉煋琛ㄥ崟鍏冪礌锛坰elect绛夛級
+ form.render('select');
+ }
+
+ // 鑾峰彇杞﹂棿涓嬫媺
+ function loadDeptSelect() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] || 1 }, // 榛樿缁勭粐1
+ success: function (result) {
+ var html = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ if (result.count == 1 && result.data) {
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ html += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ }
+ $("#HDeptID").html(html);
+ form.render('select');
+ },
+ error: function () {
+ layer.alert('鑾峰彇杞﹂棿鍒楄〃澶辫触', { icon: 2 });
+ }
+ });
+ }
+
+
+
+ // 淇敼鍚庣殑getFastQuery鍑芥暟
+ function getFastQuery(type) {
+ // 淇敼锛氫粠骞存湀閫夋嫨鍣ㄨ幏鍙栧�硷紝鑰屼笉鏄粠鏃ユ湡杈撳叆妗�
+ var HStartYearMonth = $("#ID-laydate-start-month").val();
+ var HEndYearMonth = $("#ID-laydate-end-month").val();
+
+ // 鏂板锛氶獙璇佹槸鍚﹂�夋嫨浜嗗紑濮嬪勾鏈�
+ if (!HStartYearMonth) {
+ layer.msg('璇烽�夋嫨寮�濮嬪勾鏈�', { icon: 2 });
+ return;
+ }
+
+ // 鏂板锛氶獙璇佹槸鍚﹂�夋嫨浜嗙粨鏉熷勾鏈�
+ if (!HEndYearMonth) {
+ layer.msg('璇烽�夋嫨缁撴潫骞存湀', { icon: 2 });
+ return;
+ }
+
+ // 鏂板锛氳В鏋愬紑濮嬪勾鏈堜负骞村拰鏈�
+ var startParts = HStartYearMonth.split('-');
+ var HStartYear = startParts[0];
+ var HStartPeriod = startParts[1];
+
+ // 鏂板锛氳В鏋愮粨鏉熷勾鏈堜负骞村拰鏈�
+ var endParts = HEndYearMonth.split('-');
+ var HEndYear = endParts[0];
+ var HEndPeriod = endParts[1];
+
+ // 鏂板锛氶獙璇佸勾鏈堣寖鍥存槸鍚︽湁鏁�
+ var startValue = parseInt(HStartYear) * 100 + parseInt(HStartPeriod);
+ var endValue = parseInt(HEndYear) * 100 + parseInt(HEndPeriod);
+
+ if (startValue > endValue) {
+ layer.msg('寮�濮嬪勾鏈堜笉鑳藉ぇ浜庣粨鏉熷勾鏈�', { icon: 2 });
+ return;
+ }
+
+ var HCostObjID = $("#HMaterID").val() || '0';
+ var HWorkShopID = $("#HDeptID").val() || '0';
+ var HWorkShopID = $("#HDeptID").val() || '0';
+ var HProcID = $("#HProcID").val() || '0';
+
+ // 淇敼锛氬瓨鍌ㄨ繃绋嬪弬鏁版敼涓哄紑濮嬪勾銆佸紑濮嬫湀銆佺粨鏉熷勾銆佺粨鏉熸湀銆佽溅闂淬�佺墿鏂�
+ var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
+ HEndYear + "','" + HEndPeriod + "','" +
+ HWorkShopID + "','" + HCostObjID + "'" + ",'" + HProcID+"'";
+ sWhere = spParams;
+
+ if (type == 2) {
+ get_Display(spParams);
+ }
+ }
+
+ // 鍔犺浇闃舵璁′欢鏁版嵁
+ function get_Display(params) {
+ var loadIndex = layer.load(1, { shade: false });
+
+ var sql = "exec h_p_CB_ActualItemMoneyCost" + params;
+
+ $.ajax({
+ url: GetWEBURL() + '/CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList',
+ type: "GET",
+ data: { "sWhere": sql },
+ success: function (data1) {
+ layer.close(loadIndex);
+ if (data1.count == 1) {
+ // 瑙ｆ瀽鍒楀畾涔�
+ var colDefs = []; // 瀛樻斁 {id, name, Type}
+ if (data1.list && data1.list.length > 0) {
+ for (var k in data1.list) {
+ colDefs.push({
+ id: data1.list[k].ColmCols,
+ name: data1.list[k].ColmCols,
+ Type: data1.list[k].ColmType
+ });
+ }
+ }
+
+ // 鏋勫缓琛ㄦ牸鍒�
+ var cols = [];
+ // 澶氶�夋鍒�
+ cols.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+
+ // 杈呭姪鍒ゆ柇鏃ユ湡瀛楁(褰㈠"2025-02-20")锛屽師浠ｇ爜鐢╥sValidDate浣嗘湭瀹氫箟锛岀畝鍗曟寜瀛楁鍚嶆槸鍚﹀惈妯嚎鍒ゆ柇锛屽疄闄呮牴鎹笟鍔¤皟鏁�
+ for (var i = 0; i < colDefs.length; i++) {
+ var fieldName = colDefs[i].name;
+ var fieldId = colDefs[i].id;
+ var fieldType = colDefs[i].Type;
+
+ // 閽堝闃舵鎶ヨ〃锛屾湁浜涘垪鍙兘鏄姩鎬佹棩鏈�(渚嬪鈥�02-20鈥�)锛屽師浠ｇ爜鐢╥sValidDate鍒ゆ柇锛屾垜浠畝鍗曟ā鎷燂細濡傛灉瀛楁鍚嶅寘鍚� '-' 涓旈暱搴�<=10 瑙嗕负鏃ユ湡鐭垪
+ var isShortDate = (fieldName.indexOf('-') > 0 && fieldName.length <= 10);
+ if (isShortDate) {
+ // 鏄剧ず鎴� MM-dd 鏍煎紡锛屽師浠ｇ爜灏濊瘯Format浣嗘湭瀹氫箟锛屾澶勭洿鎺ユ樉绀哄師瀛楁鍚�
+ cols.push({
+ field: fieldId,
+ title: fieldName, // 鍘熶唬鐮�: Format(fieldName,'MM-dd') 浣咶ormat鍑芥暟鍙兘鏈紩鍏ワ紝淇濇寔鍘熸牱
+ width: 70,
+ totalRow: true,
+ filter: true,
+ align: 'center'
+ });
+ } else if (fieldType == 'DateTime') {
+ cols.push({
+ field: fieldId,
+ title: fieldName,
+ align: 'center',
+ sort: true,
+ filter: true,
+ templet: "<div>{{ d." + fieldId + " == '' ? '' : layui.util.toDateString(d." + fieldId + ", 'yyyy-MM-dd HH:mm:ss') }}</div>",
+ width: 180
+ });
+ } else {
+ cols.push({
+ field: fieldId,
+ title: fieldName,
+ align: 'center',
+ sort: true,
+ width: 150,
+ filter: true
+ });
+ }
+ }
+
+ // 鏇存柊琛ㄦ牸閰嶇疆
+ option2.cols = [cols];
+ option2.data = data1.data || [];
+
+ // 搴旂敤鍒楅殣钘忚缃紙濡傛灉瀛樺湪锛�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"] || 'admin', option2, []);
+
+ // 娓叉煋琛ㄦ牸
+ table.render(option2);
+ } else {
+ layer.alert(data1.code + ' ' + data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(loadIndex);
+ layer.alert("鎺ュ彛璇锋眰澶辫触", { icon: 5 });
+ }
+ });
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ // 淇敼鍚庣殑clearQuery鍑芥暟
+ function clearQuery() {
+ var currentDate = new Date();
+ var lastMonth = new Date(currentDate);
+ lastMonth.setMonth(currentDate.getMonth() - 7);
+
+ // 淇敼锛氶噸鏂拌缃紑濮嬪勾鏈堥�夋嫨鍣ㄧ殑鍊�
+ laydate.render({
+ elem: '#ID-laydate-start-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: lastMonth,
+ show: false // 涓嶆樉绀洪潰鏉�
+ });
+
+ // 淇敼锛氶噸鏂拌缃粨鏉熷勾鏈堥�夋嫨鍣ㄧ殑鍊�
+ laydate.render({
+ elem: '#ID-laydate-end-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: currentDate,
+ show: false // 涓嶆樉绀洪潰鏉�
+ });
+
+ $("#HDeptID").val(0);
+ $("#HMaterID").val("0");
+ $("#HMaterName").val("");
+ $("#HProcID").val("0");
+ $("#HProcName").val("");
+ form.render('select');
+ }
+
+ // ---------- 浜嬩欢缁戝畾 ----------
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function () {
+ getFastQuery(2);
+ return false;
+ });
+
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function () {
+ clearQuery();
+ getFastQuery(2);
+ return false;
+ });
+
+ // 鐝粍寮瑰嚭妗�(淇濈暀鍘熸湁寮圭獥鏂瑰紡锛屼笌tableSelect鍏卞瓨锛屼紭鍏堜娇鐢╰ableSelect锛涘悓鏃舵敮鎸佸脊绐楅�夋嫨)
+ form.on('submit(HGroupList)', function () {
+ openGroupDialog();
+ return false;
+ });
+
+ // 鑱屽憳寮瑰嚭妗� HItemMoneyList
+ form.on('submit(HMaterList)', function () {
+ openHMaterDialog();
+ return false;
+ });
+
+ form.on('submit(HProcList)', function () {
+ openHProcDialog();
+ return false;
+ });
+
+ form.on('submit(HCostobjList)', function () {
+ openHCostobjDialog();
+ return false;
+ });
+
+ form.on('submit(HItemMoneyList)', function () {
+ openHItemMoneyDialog();
+ return false;
+ });
+ function openHCostobjDialog() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '宸ュ簭',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.html?', 'yes'],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCostObjectID").val(checkStatus.data[0].HItemID);
+ $("#HCostObjectName").val(checkStatus.data[0].鎴愭湰椤圭洰鍚嶇О);
+ layer.close(index);
+ }
+ });
+ }
+
+ function openHProcDialog() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '宸ュ簭',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?Type=HMaterList', 'yes'],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 鎵撳紑鐝粍寮圭獥锛堝師鍑芥暟 get_checkGroup锛�
+ function openGroupDialog() {
+ layer.open({
+ type: 2,
+ skin: "layui-layer-rim",
+ title: "鐝粍鍒楄〃",
+ closeBtn: 1,
+ shift: 2,
+ area: ["90%", "90%"],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes'],
+ btn: ["纭畾", "鍙栨秷"],
+ btn1: function (index, laero) {
+ var iframeWindow = window["layui-layer-iframe" + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 鎵撳紑鑱屽憳寮圭獥 (鍘� get_checkEmp)
+ function openHMaterDialog() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鑱�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?Type=HMaterList', 'yes'],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 澶村伐鍏锋爮浜嬩欢 (mainTable2)
+ table.on('toolbar(mainTable2)', function (obj) {
+ switch (obj.event) {
+ case 'set_HideColumn2':
+ get_HideColumnNoPage(HModName2, sessionStorage["HUserName"] || 'admin', option2, function () { getFastQuery(2); });
+ break;
+ case 'btn-reload2':
+ getFastQuery(2);
+ break;
+ case 'get_export2':
+ exportExcel2();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ default:
+ break;
+ }
+ });
+
+ // 瀵煎嚭Excel (鍘� get_Export2)
+ function exportExcel2() {
+ var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck",
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option2.data || [];
+ // 娓呮礂鏁版嵁
+ data.forEach(function (item) {
+ for (var key in item) {
+ if (item[key] == null) item[key] = "";
+ if (typeof item[key] === 'string') {
+ item[key] = item[key].replace(/[\r\n]+/g, '').replace(/,/g, '');
+ }
+ }
+ });
+ table.exportFile("mainTable2", data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璧勬枡瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_WIPBal_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
+ // 鍏ㄥ眬杈呭姪鍑芥暟 Format (濡傛灉涓嶅瓨鍦紝绠�鍗曞畾涔�)
+ if (typeof Format !== 'function') {
+ window.Format = function (date, fmt) {
+ if (!date) return '';
+ var d = new Date(date);
+ var o = {
+ "M+": d.getMonth() + 1,
+ "d+": d.getDate(),
+ "H+": d.getHours(),
+ "m+": d.getMinutes(),
+ "s+": d.getSeconds()
+ };
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+ };
+ }
+
+ // 鍚姩椤甸潰
+ initPage();
+ });
+
+ // 涓嬮潰涓や釜鏂规硶渚涘脊绐楀洖璋冧娇鐢� (Gy_EmployeeList.html 鍜� Gy_Group.html 浼氳皟鐢�)
+ function GetHEmpListValue(obj) {
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ function GetHGroupValue(obj) {
+ if (obj && obj.length > 0) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ }
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
new file mode 100644
index 0000000..0607335
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
@@ -0,0 +1,302 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍣ㄥ叿涓绘。瀵煎叆</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <div class="layui-inline" style="margin-left: 20px;">
+ <label class="layui-form-label">骞存湀</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="ID-laydate-type-month" placeholder="閫夋嫨骞存湀" readonly>
+ </div>
+ </div>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+
+
+ laydate.render({
+ elem: '#ID-laydate-type-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: new Date(),
+ done: function (value, date) {
+ if (!option.data || option.data.length === 0) {
+ layer.msg('璇峰厛瀵煎叆鏁版嵁锛�', { icon: 0 });
+ return;
+ }
+ var parts = value.split('-');
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]['骞�'] = parts[0];
+ option.data[i]['鏈�'] = parts[1];
+ }
+ table.render(option);
+ layer.msg('骞存湀宸叉洿鏂颁负锛�' + value, { icon: 1, time: 1500 });
+ }
+ });
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Kf_WIPBal/Kf_WIPBal_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (obj) { // 涓婁紶鍓�
+ layer.load(1, {
+ shade: [0.3, '#000'] // 0.3閫忔槑搴﹂粦鑹查伄缃�
+ });
+ },
+ done: function (data1) {
+ layer.closeAll('loading'); // 鍏抽棴鍔犺浇灞�
+ if (data1.count == 1) {
+ option.data = data1.data;
+
+ // 鑾峰彇褰撳墠骞存湀
+ var now = new Date();
+ var year = now.getFullYear();
+ var month = (now.getMonth() + 1).toString().padStart(2, '0');
+ var currentYearMonth = year + '-' + month;
+
+ // 璁剧疆骞存湀杈撳叆妗嗙殑鍊�
+ $('#ID-laydate-type-month').val(currentYearMonth);
+
+ // 涓哄鍏ョ殑鏁版嵁娣诲姞骞村拰鏈堝瓧娈�
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]['骞�'] = year.toString();
+ option.data[i]['鏈�'] = month;
+ }
+
+ table.render(option);
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.closeAll('loading'); // 鍏抽棴鍔犺浇灞�
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+
+
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '骞�', title: '骞�', width: 120 }
+ , { field: '鏈�', title: '鏈�', width: 120 }
+ , { field: 'HWorkShopID', title: 'HWorkShopID', width: 120, hide: true }
+ , { field: '杞﹂棿浠ｇ爜', title: '杞﹂棿浠ｇ爜', width: 120 }
+ , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О', width: 120 }
+ , { field: 'HCostObjID', title: 'HCostObjID', width: 120, hide: true }
+ , { field: '鎴愭湰瀵硅薄浠ｇ爜', title: '鎴愭湰瀵硅薄浠ｇ爜', width: 120 }
+ , { field: '鎴愭湰瀵硅薄鍚嶇О', title: '鎴愭湰瀵硅薄鍚嶇О', width: 120 }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120,hide:true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120}
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: 'HCostItemID', title: 'HCostItemID', width: 120, hide: true }
+ , { field: '鎴愭湰椤圭洰浠ｇ爜', title: '鎴愭湰椤圭洰浠ｇ爜', width: 120 }
+ , { field: '鎴愭湰椤圭洰鍚嶇О', title: '鎴愭湰椤圭洰鍚嶇О', width: 120 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 120, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HProcID', title: 'HProcID', width: 120, hide: true }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 120 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 120 }
+ , { field: '鏈熷垵閲戦', title: '鏈熷垵閲戦', width: 120}
+ , { field: '鏈熷垵鏁伴噺', title: '鏈熷垵鏁伴噺', width: 120}
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Kf_WIPBal/Kf_WIPBal_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Kf_WIPBal.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Kf_WIPBal.html"
new file mode 100644
index 0000000..493ff58
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Kf_WIPBal.html"
@@ -0,0 +1,543 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鏈熷垵鍦ㄤ骇鍝佹姤琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!-- 娉ㄦ剰锛氭墍鏈夊紩鐢ㄨ矾寰勪繚鎸佷笌鍘熼」鐩竴鑷达紝纭繚鍔熻兘瀹屾暣 -->
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <form class="layui-form" action="" lay-filter="component-form-group" autocomplete="off">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!-- 鍔ㄦ�佹覆鏌撹溅闂� -->
+ </select>
+ </div>
+ </div>
+ <!-- 鐗╂枡 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!-- 寮�濮嬪勾鏈� -->
+ <div class="layui-inline" style="margin-left: 20px;">
+ <label class="layui-form-label">寮�濮嬪勾鏈�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="ID-laydate-start-month" placeholder="閫夋嫨寮�濮嬪勾鏈�" readonly>
+ </div>
+ </div>
+
+ <!-- 缁撴潫骞存湀 -->
+ <div class="layui-inline" style="margin-left: 20px;">
+ <label class="layui-form-label">缁撴潫骞存湀</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="ID-laydate-end-month" placeholder="閫夋嫨缁撴潫骞存湀" readonly>
+ </div>
+ </div>
+ <!-- 鏌ヨ鎸夐挳 -->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <!-- 閲嶇疆鎸夐挳 -->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ </form>
+ <div style="margin-top: 10px;">
+ <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+ <!-- 琛ㄦ牸澶村伐鍏锋爮 -->
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/'
+ }).extend({
+ index: 'lib/index',
+ }).use(['index', 'form', 'table', 'element', 'laydate', 'soulTable', 'tableSelect'], function () {
+ var $ = layui.$,
+ admin = layui.admin,
+ layer = layui.layer,
+ table = layui.table,
+ form = layui.form,
+ element = layui.element,
+ laydate = layui.laydate,
+ soulTable = layui.soulTable,
+ tableSelect = layui.tableSelect;
+
+ // 妯″潡鍚嶏紙鐢ㄤ簬鍒楄缃瓨鍌級
+ var HModName2 = "Pay_PaymentEntryReport2";
+ // 琛ㄦ牸閫夐」
+ var option2 = {
+ elem: '#mainTable2',
+ toolbar: '#toolbarDemo2',
+ height: 'full-120', // 閫傚綋鐣欏嚭搴曢儴绌洪棿
+ page: true,
+ cellMinWidth: 90,
+ totalRow: true,
+ limit: 500,
+ limits: [50, 500, 5000, 20000],
+ done: function (res, curr, count) {
+ soulTable.render(this);
+ },
+ cols: [[]]
+ };
+
+ // 鍏ㄥ眬鏌ヨ鏉′欢瀛楃涓�
+ var sWhere = "";
+
+
+ function initPage() {
+ // 娓叉煋杞﹂棿涓嬫媺妗�
+ loadDeptSelect();
+
+ // 璁剧疆榛樿鏃ユ湡: 寮�濮嬪勾鏈堜负7涓湀鍓嶏紝缁撴潫骞存湀涓轰粖澶�
+ var currentDate = new Date();
+ var lastMonth = new Date(currentDate);
+ lastMonth.setMonth(currentDate.getMonth() - 12);
+
+ // 鏂板锛氭覆鏌撳紑濮嬪勾鏈堥�夋嫨鍣�
+ laydate.render({
+ elem: '#ID-laydate-start-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: lastMonth,
+ done: function (value, date) {
+ // 鍙互閫夋嫨鍦ㄨ繖閲岃Е鍙戞煡璇�
+ // getFastQuery(2);
+ }
+ });
+
+ // 鏂板锛氭覆鏌撶粨鏉熷勾鏈堥�夋嫨鍣�
+ laydate.render({
+ elem: '#ID-laydate-end-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: currentDate,
+ done: function (value, date) {
+ // 鍙互閫夋嫨鍦ㄨ繖閲岃Е鍙戞煡璇�
+ // getFastQuery(2);
+ }
+ });
+
+ getFastQuery(2);
+ // 閲嶆柊娓叉煋琛ㄥ崟鍏冪礌锛坰elect绛夛級
+ form.render('select');
+ }
+
+ // 鑾峰彇杞﹂棿涓嬫媺
+ function loadDeptSelect() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] || 1 }, // 榛樿缁勭粐1
+ success: function (result) {
+ var html = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ if (result.count == 1 && result.data) {
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ html += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ }
+ $("#HDeptID").html(html);
+ form.render('select');
+ },
+ error: function () {
+ layer.alert('鑾峰彇杞﹂棿鍒楄〃澶辫触', { icon: 2 });
+ }
+ });
+ }
+
+
+
+ // 淇敼鍚庣殑getFastQuery鍑芥暟
+ function getFastQuery(type) {
+ // 淇敼锛氫粠骞存湀閫夋嫨鍣ㄨ幏鍙栧�硷紝鑰屼笉鏄粠鏃ユ湡杈撳叆妗�
+ var HStartYearMonth = $("#ID-laydate-start-month").val();
+ var HEndYearMonth = $("#ID-laydate-end-month").val();
+
+ // 鏂板锛氶獙璇佹槸鍚﹂�夋嫨浜嗗紑濮嬪勾鏈�
+ if (!HStartYearMonth) {
+ layer.msg('璇烽�夋嫨寮�濮嬪勾鏈�', { icon: 2 });
+ return;
+ }
+
+ // 鏂板锛氶獙璇佹槸鍚﹂�夋嫨浜嗙粨鏉熷勾鏈�
+ if (!HEndYearMonth) {
+ layer.msg('璇烽�夋嫨缁撴潫骞存湀', { icon: 2 });
+ return;
+ }
+
+ // 鏂板锛氳В鏋愬紑濮嬪勾鏈堜负骞村拰鏈�
+ var startParts = HStartYearMonth.split('-');
+ var HStartYear = startParts[0];
+ var HStartPeriod = startParts[1];
+
+ // 鏂板锛氳В鏋愮粨鏉熷勾鏈堜负骞村拰鏈�
+ var endParts = HEndYearMonth.split('-');
+ var HEndYear = endParts[0];
+ var HEndPeriod = endParts[1];
+
+ // 鏂板锛氶獙璇佸勾鏈堣寖鍥存槸鍚︽湁鏁�
+ var startValue = parseInt(HStartYear) * 100 + parseInt(HStartPeriod);
+ var endValue = parseInt(HEndYear) * 100 + parseInt(HEndPeriod);
+
+ if (startValue > endValue) {
+ layer.msg('寮�濮嬪勾鏈堜笉鑳藉ぇ浜庣粨鏉熷勾鏈�', { icon: 2 });
+ return;
+ }
+
+ var HCostObjID = $("#HMaterID").val() || '0';
+ var HWorkShopID = $("#HDeptID").val() || '0';
+
+ // 淇敼锛氬瓨鍌ㄨ繃绋嬪弬鏁版敼涓哄紑濮嬪勾銆佸紑濮嬫湀銆佺粨鏉熷勾銆佺粨鏉熸湀銆佽溅闂淬�佺墿鏂�
+ var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
+ HEndYear + "','" + HEndPeriod + "','" +
+ HWorkShopID + "','" + HCostObjID + "'";
+ sWhere = spParams;
+
+ if (type == 2) {
+ get_Display(spParams);
+ }
+ }
+
+ // 鍔犺浇闃舵璁′欢鏁版嵁
+ function get_Display(params) {
+ var loadIndex = layer.load(1, { shade: false });
+
+ var sql = "exec h_p_Kf_WIPBalReport" + params;
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ data: { "sWhere": sql },
+ success: function (data1) {
+ layer.close(loadIndex);
+ if (data1.count == 1) {
+ // 瑙ｆ瀽鍒楀畾涔�
+ var colDefs = []; // 瀛樻斁 {id, name, Type}
+ if (data1.list && data1.list.length > 0) {
+ for (var k in data1.list) {
+ colDefs.push({
+ id: data1.list[k].ColmCols,
+ name: data1.list[k].ColmCols,
+ Type: data1.list[k].ColmType
+ });
+ }
+ }
+
+ // 鏋勫缓琛ㄦ牸鍒�
+ var cols = [];
+ // 澶氶�夋鍒�
+ cols.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+
+ // 杈呭姪鍒ゆ柇鏃ユ湡瀛楁(褰㈠"2025-02-20")锛屽師浠ｇ爜鐢╥sValidDate浣嗘湭瀹氫箟锛岀畝鍗曟寜瀛楁鍚嶆槸鍚﹀惈妯嚎鍒ゆ柇锛屽疄闄呮牴鎹笟鍔¤皟鏁�
+ for (var i = 0; i < colDefs.length; i++) {
+ var fieldName = colDefs[i].name;
+ var fieldId = colDefs[i].id;
+ var fieldType = colDefs[i].Type;
+
+ // 閽堝闃舵鎶ヨ〃锛屾湁浜涘垪鍙兘鏄姩鎬佹棩鏈�(渚嬪鈥�02-20鈥�)锛屽師浠ｇ爜鐢╥sValidDate鍒ゆ柇锛屾垜浠畝鍗曟ā鎷燂細濡傛灉瀛楁鍚嶅寘鍚� '-' 涓旈暱搴�<=10 瑙嗕负鏃ユ湡鐭垪
+ var isShortDate = (fieldName.indexOf('-') > 0 && fieldName.length <= 10);
+ if (isShortDate) {
+ // 鏄剧ず鎴� MM-dd 鏍煎紡锛屽師浠ｇ爜灏濊瘯Format浣嗘湭瀹氫箟锛屾澶勭洿鎺ユ樉绀哄師瀛楁鍚�
+ cols.push({
+ field: fieldId,
+ title: fieldName, // 鍘熶唬鐮�: Format(fieldName,'MM-dd') 浣咶ormat鍑芥暟鍙兘鏈紩鍏ワ紝淇濇寔鍘熸牱
+ width: 70,
+ totalRow: true,
+ filter: true,
+ align: 'center'
+ });
+ } else if (fieldType == 'DateTime') {
+ cols.push({
+ field: fieldId,
+ title: fieldName,
+ align: 'center',
+ sort: true,
+ filter: true,
+ templet: "<div>{{ d." + fieldId + " == '' ? '' : layui.util.toDateString(d." + fieldId + ", 'yyyy-MM-dd HH:mm:ss') }}</div>",
+ width: 180
+ });
+ } else {
+ cols.push({
+ field: fieldId,
+ title: fieldName,
+ align: 'center',
+ sort: true,
+ width: 150,
+ filter: true
+ });
+ }
+ }
+
+ // 鏇存柊琛ㄦ牸閰嶇疆
+ option2.cols = [cols];
+ option2.data = data1.data || [];
+
+ // 搴旂敤鍒楅殣钘忚缃紙濡傛灉瀛樺湪锛�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"] || 'admin', option2, []);
+
+ // 娓叉煋琛ㄦ牸
+ table.render(option2);
+ } else {
+ layer.alert(data1.code + ' ' + data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(loadIndex);
+ layer.alert("鎺ュ彛璇锋眰澶辫触", { icon: 5 });
+ }
+ });
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ // 淇敼鍚庣殑clearQuery鍑芥暟
+ function clearQuery() {
+ var currentDate = new Date();
+ var lastMonth = new Date(currentDate);
+ lastMonth.setMonth(currentDate.getMonth() - 7);
+
+ // 淇敼锛氶噸鏂拌缃紑濮嬪勾鏈堥�夋嫨鍣ㄧ殑鍊�
+ laydate.render({
+ elem: '#ID-laydate-start-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: lastMonth,
+ show: false // 涓嶆樉绀洪潰鏉�
+ });
+
+ // 淇敼锛氶噸鏂拌缃粨鏉熷勾鏈堥�夋嫨鍣ㄧ殑鍊�
+ laydate.render({
+ elem: '#ID-laydate-end-month',
+ type: 'month',
+ format: 'yyyy-MM',
+ value: currentDate,
+ show: false // 涓嶆樉绀洪潰鏉�
+ });
+
+ $("#HDeptID").val(0);
+ $("#HMaterID").val("0");
+ $("#HMaterName").val("");
+ form.render('select');
+ }
+
+ // ---------- 浜嬩欢缁戝畾 ----------
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function () {
+ getFastQuery(2);
+ return false;
+ });
+
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function () {
+ clearQuery();
+ getFastQuery(2);
+ return false;
+ });
+
+ // 鐝粍寮瑰嚭妗�(淇濈暀鍘熸湁寮圭獥鏂瑰紡锛屼笌tableSelect鍏卞瓨锛屼紭鍏堜娇鐢╰ableSelect锛涘悓鏃舵敮鎸佸脊绐楅�夋嫨)
+ form.on('submit(HGroupList)', function () {
+ openGroupDialog();
+ return false;
+ });
+
+ // 鑱屽憳寮瑰嚭妗�
+ form.on('submit(HMaterList)', function () {
+ openHMaterDialog();
+ return false;
+ });
+
+ // 鎵撳紑鐝粍寮圭獥锛堝師鍑芥暟 get_checkGroup锛�
+ function openGroupDialog() {
+ layer.open({
+ type: 2,
+ skin: "layui-layer-rim",
+ title: "鐝粍鍒楄〃",
+ closeBtn: 1,
+ shift: 2,
+ area: ["90%", "90%"],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes'],
+ btn: ["纭畾", "鍙栨秷"],
+ btn1: function (index, laero) {
+ var iframeWindow = window["layui-layer-iframe" + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 鎵撳紑鑱屽憳寮圭獥 (鍘� get_checkEmp)
+ function openHMaterDialog() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鑱�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?Type=HMaterList', 'yes'],
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ layer.close(index);
+ }
+ });
+ }
+
+ // 澶村伐鍏锋爮浜嬩欢 (mainTable2)
+ table.on('toolbar(mainTable2)', function (obj) {
+ switch (obj.event) {
+ case 'set_HideColumn2':
+ get_HideColumnNoPage(HModName2, sessionStorage["HUserName"] || 'admin', option2, function () { getFastQuery(2); });
+ break;
+ case 'btn-reload2':
+ getFastQuery(2);
+ break;
+ case 'get_export2':
+ exportExcel2();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ default:
+ break;
+ }
+ });
+
+ // 瀵煎嚭Excel (鍘� get_Export2)
+ function exportExcel2() {
+ var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck",
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option2.data || [];
+ // 娓呮礂鏁版嵁
+ data.forEach(function (item) {
+ for (var key in item) {
+ if (item[key] == null) item[key] = "";
+ if (typeof item[key] === 'string') {
+ item[key] = item[key].replace(/[\r\n]+/g, '').replace(/,/g, '');
+ }
+ }
+ });
+ table.exportFile("mainTable2", data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璧勬枡瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_WIPBal_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
+ // 鍏ㄥ眬杈呭姪鍑芥暟 Format (濡傛灉涓嶅瓨鍦紝绠�鍗曞畾涔�)
+ if (typeof Format !== 'function') {
+ window.Format = function (date, fmt) {
+ if (!date) return '';
+ var d = new Date(date);
+ var o = {
+ "M+": d.getMonth() + 1,
+ "d+": d.getDate(),
+ "H+": d.getHours(),
+ "m+": d.getMinutes(),
+ "s+": d.getSeconds()
+ };
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+ };
+ }
+
+ // 鍚姩椤甸潰
+ initPage();
+ });
+
+ // 涓嬮潰涓や釜鏂规硶渚涘脊绐楀洖璋冧娇鐢� (Gy_EmployeeList.html 鍜� Gy_Group.html 浼氳皟鐢�)
+ function GetHEmpListValue(obj) {
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ function GetHGroupValue(obj) {
+ if (obj && obj.length > 0) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ }
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html"
index 884cd43..9879a0f 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html"
@@ -190,6 +190,7 @@
if (monthSelect) {
monthSelect.value = currentMonth;
}
+ form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html"
index 0226cd6..9d09215 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldDotCheckTaskReport.html"
@@ -33,6 +33,7 @@
<li lay-id="1" class="layui-this">浠婃棩寰呯偣妫�</li>
<li lay-id="2">浠婃棩宸茬偣妫�</li>
<li lay-id="3">浠婂ぉ鍏ㄩ儴浠诲姟</li>
+ <li lay-id="4">閫炬湡鏈偣妫�</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -46,6 +47,10 @@
<div class="layui-tab-item">
<!--浠婂ぉ鍏ㄩ儴浠诲姟-->
<table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--浠婂ぉ鍏ㄩ儴浠诲姟-->
+ <table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
</div>
</div>
</div>
@@ -78,6 +83,7 @@
var option_waitCheck = ""; //浠婃棩寰呯偣妫�
var option_finishCheck = ""; //浠婃棩宸茬偣妫�
var option_task = ""; //浠婂ぉ鍏ㄩ儴浠诲姟
+ var option_outTime = ""; // 閫炬湡鏈偣妫�浠诲姟
var ins;
var TableTab = "mainTable_waitCheck"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滀粖鏃ュ緟鐐规鈥� 椤电
var cur_title = "浠婃棩寰呯偣妫�"; //褰撳墠閫変腑椤电
@@ -116,6 +122,8 @@
TableTab = "mainTable_finishCheck";
} else if (cur_title == "浠婂ぉ鍏ㄩ儴浠诲姟") {
TableTab = "mainTable_task";
+ } else if (cur_title == "閫炬湡鏈偣妫�") {
+ TableTab = "mainTable_outTime";
}
})
//#endregion
@@ -170,6 +178,18 @@
function set_InitGrid_task() {
option_task = {
elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ // 鍒濆鍖栭�炬湡鏈偣妫�鍒楄〃
+ function set_InitGrid_outTime() {
+ option_outTime = {
+ elem: '#mainTable_outTime'
, page: false
, height: 500
, cellMinWidth: 90
@@ -321,6 +341,42 @@
}
table.render(option_task);
+
+ var HBillNo_outTime = "";
+ var HRowBackgroundColor_outTime = "#E0F5F7";
+ option_outTime = {
+ elem: '#mainTable_outTime'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sc_MouldDotCheckTaskReport3
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_outTime == "") {
+ HBillNo_outTime = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
+ } else if (HBillNo_outTime == item.鍣ㄥ叿鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
+ } else if (HBillNo_outTime != item.鍣ㄥ叿鐐规璁″垝鍗曞彿 && HBillNo_outTime != "") {
+ if (HRowBackgroundColor_outTime == "#E0F5F7") {
+ HRowBackgroundColor_outTime = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_outTime = "#E0F5F7"
+ }
+ HBillNo_outTime = item.鍣ㄥ叿鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
+ }
+
+ })
+ }
+ }
+ table.render(option_outTime);
+
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "鍣ㄥ叿鐐规浠诲姟";
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/Gy_MouldFile.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/Gy_MouldFile.html"
index 9372ffc..ccb8b79 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -464,6 +464,20 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <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="HPackV" id="HPackV" value="0">
+ </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="HStandardQtyForMouldInPack" id="HStandardQtyForMouldInPack" value="0">
+ </div>
+ </div>
+ </div>
<div class="layui-row">
@@ -2030,6 +2044,8 @@
$("#HMouldWidth").val(d.data[0].瀹�);
$("#HMouldHeight").val(d.data[0].楂�);
$("#HMouldFoldHeight").val(d.data[0].鎶樺彔楂樺害);
+ $("#HPackV").val(d.data[0].鎵樹綋绉�);
+ $("#HStandardQtyForMouldInPack").val(d.data[0].鎵樻爣鍑嗗鍣ㄦ暟閲�);
$("#checkboxHTransPackFlag").prop("checked", d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1); // 璁剧疆鍛ㄨ浆瀹瑰櫒鏍囪
$("#HTransPackFlag").val(d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1 ? "true" : "false");
$("#checkboxHSendPackFlag").prop("checked", d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1); // 璁剧疆鍙戣揣瀹瑰櫒鏍囪
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index a5288ca..86d3d2e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -1083,8 +1083,8 @@
var lastDay = new Date(year, month, 0).getDate(); //褰撴湀鏈�鍚庝竴澶�
var thisDay = new Date().getDay(); //褰撳ぉ鏄湰鏈堢鍑犲ぉ
- var valueList = [7, lastDay - thisDay+1,31,40,50];
- var titleList = ["7澶�", "鏈湀","31澶�","40澶�","50澶�"];
+ var valueList = [7, lastDay - thisDay + 1, 31, 40, 50, 100];
+ var titleList = ["7澶�", "鏈湀", "31澶�", "40澶�", "50澶�", "100澶�"];
var HArrangeProductDayQty_ArrayList = '';
for (var i = 0; i < valueList.length; i++) {
@@ -1095,7 +1095,7 @@
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
form.render('select');
- $("#HArrangeProductDayQty").val("40");
+ $("#HArrangeProductDayQty").val("100");
}
//#endregion
@@ -1368,6 +1368,265 @@
columns.push({
field: Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 50 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 50 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+
+
+ columns.push({
+ field: Format(myDate.getTime() + 51 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 51 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 51 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 51 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 51 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 52 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 52 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 52 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 52 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 52 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 53 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 53 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 53 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 53 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 53 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 54 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 54 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 54 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 54 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 54 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 55 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 55 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 55 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 55 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 55 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 56 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 56 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 56 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 56 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 56 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 57 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 57 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 57 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 57 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 57 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 58 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 58 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 58 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 58 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 58 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 59 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 59 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 59 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 59 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 59 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 60 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 60 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 60 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 60 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 60 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 61 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 61 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 61 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 61 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 61 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 62 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 62 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 62 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 62 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 62 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 63 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 63 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 63 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 63 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 63 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 64 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 64 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 64 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 64 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 64 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 65 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 65 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 65 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 65 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 65 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 66 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 66 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 66 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 66 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 66 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 67 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 67 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 67 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 67 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 67 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 68 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 68 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 68 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 68 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 68 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 69 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 69 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 69 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 69 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 69 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+
+ columns.push({
+ field: Format(myDate.getTime() + 70 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 70 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 70 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 70 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 70 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 71 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 71 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 71 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 71 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 71 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 72 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 72 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 72 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 72 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 72 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 73 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 73 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 73 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 73 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 73 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 74 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 74 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 74 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 74 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 74 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 75 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 75 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 75 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 75 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 75 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 76 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 76 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 76 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 76 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 76 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 77 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 77 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 77 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 77 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 77 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 78 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 78 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 78 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 78 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 78 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 79 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 79 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 79 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 79 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 79 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 80 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 80 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 80 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 80 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 80 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 81 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 81 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 81 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 81 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 81 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 82 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 82 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 82 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 82 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 82 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 83 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 83 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 83 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 83 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 83 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 84 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 84 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 84 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 84 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 84 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 85 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 85 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 85 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 85 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 85 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 86 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 86 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 86 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 86 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 86 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 87 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 87 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 87 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 87 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 87 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 88 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 88 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 88 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 88 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 88 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 89 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 89 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 89 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 89 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 89 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 90 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 90 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 90 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 90 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 90 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 91 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 91 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 91 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 91 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 91 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 92 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 92 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 92 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 92 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 92 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 93 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 93 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 93 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 93 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 93 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 94 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 94 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 94 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 94 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 94 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 95 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 95 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 95 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 95 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 95 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 96 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 96 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 96 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 96 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 96 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 97 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 97 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 97 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 97 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 97 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 98 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 98 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 98 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 98 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 98 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 99 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 99 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 99 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 99 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 99 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 100 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 100 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 100 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 100 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 100 * oneday, 'yyyy-MM-dd'));
}
})//0
@@ -3461,6 +3720,7 @@
}
function set_AddNew1(num) {
+ delete num["LAY_TABLE_INDEX"];
//var sMainStr = JSON.stringify(data.field);
var sSubStr = "["+JSON.stringify(num)+"]";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index e497d67..66aecb5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -36,7 +36,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CopyBill" id="set_CopyBill">澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">鎵撳嵃</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
@@ -740,6 +740,8 @@
success: function (result) {
if (result.count == 1) {
HIsCheck = true;
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+
layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -1240,6 +1242,26 @@
$("#HMainSourceEntryID").val(data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID);
$("#HExplanation").val("");
$("#HRemark").val(data.琛ㄥご澶囨敞);
+ $("#HMaker").val(data.鍒跺崟浜� || "");
+ $("#HMakeDate").val(data.鍒跺崟鏃ユ湡 ? formatDate(data.鍒跺崟鏃ユ湡) : "");
+ $("#HChecker").val(data.瀹℃牳浜� || "");
+ $("#HCheckDate").val(data.瀹℃牳鏃ユ湡 ? formatDate(data.瀹℃牳鏃ユ湡) : "");
+ $("#HUpDater").val(data.淇敼浜� || "");
+ $("#HUpDateDate").val(data.淇敼鏃ユ湡 ? formatDate(data.淇敼鏃ユ湡) : "");
+ $("#HCloseMan").val(data.鍏抽棴浜� || "");
+ $("#HCloseDate").val(data.鍏抽棴鏃ユ湡 ? formatDate(data.鍏抽棴鏃ユ湡) : "");
+ $("#HDeleteMan").val(data.浣滃簾浜� || "");
+ $("#HDeleteDate").val(data.浣滃簾鏃ユ湡 ? formatDate(data.浣滃簾鏃ユ湡) : "");
+ if (data.瀹℃牳浜� && data.瀹℃牳浜�.trim() !== "") {
+
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#get_PrintReport').removeClass("layui-btn-disabled").attr("disabled", false);
+ HIsCheck = true;
+ } else {
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
+ HIsCheck = false;
+ }
PicUpload();
get_file();
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html"
index f0dfef2..9a491a5 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDotCheckTaskReport.html"
@@ -33,6 +33,7 @@
<li lay-id="1" class="layui-this">浠婃棩寰呯偣妫�</li>
<li lay-id="2">浠婃棩宸茬偣妫�</li>
<li lay-id="3">浠婂ぉ鍏ㄩ儴浠诲姟</li>
+ <li lay-id="4">閫炬湡鏈偣妫�</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -46,6 +47,10 @@
<div class="layui-tab-item">
<!--浠婂ぉ鍏ㄩ儴浠诲姟-->
<table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--閫炬湡鏈偣妫�-->
+ <table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
</div>
</div>
</div>
@@ -78,6 +83,7 @@
var option_waitCheck = ""; //浠婃棩寰呯偣妫�
var option_finishCheck = ""; //浠婃棩宸茬偣妫�
var option_task = ""; //浠婂ぉ鍏ㄩ儴浠诲姟
+ var option_outTime = ""; //閫炬湡鏈偣妫�浠诲姟
var ins;
var TableTab = "mainTable_waitCheck"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滀粖鏃ュ緟鐐规鈥� 椤电
var cur_title = "浠婃棩寰呯偣妫�"; //褰撳墠閫変腑椤电
@@ -116,6 +122,8 @@
TableTab = "mainTable_finishCheck";
} else if (cur_title == "浠婂ぉ鍏ㄩ儴浠诲姟") {
TableTab = "mainTable_task";
+ } else if (cur_title == "閫炬湡鏈偣妫�") {
+ TableTab = "mainTable_outTime";
}
})
//#endregion
@@ -170,6 +178,18 @@
function set_InitGrid_task() {
option_task = {
elem: '#mainTable_task'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ // 鍒濆鍖栭�炬湡浠诲姟鍒楄〃
+ function set_InitGrid_outTime() {
+ option_outTime = {
+ elem: '#mainTable_outTime'
, page: false
, height: 500
, cellMinWidth: 90
@@ -321,6 +341,41 @@
}
table.render(option_task);
+ var HBillNo_outTime = "";
+ var HRowBackgroundColor_outTime = "#E0F5F7";
+ option_outTime = {
+ elem: '#mainTable_outTime'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_Sb_EquipDotCheckTaskReport3
+ , height: 'full-120'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (HBillNo_outTime == "") {
+ HBillNo_outTime = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
+ } else if (HBillNo_outTime == item.璁惧鐐规璁″垝鍗曞彿) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
+ } else if (HBillNo_outTime != item.璁惧鐐规璁″垝鍗曞彿 && HBillNo_outTime != "") {
+ if (HRowBackgroundColor_outTime == "#E0F5F7") {
+ HRowBackgroundColor_outTime = "#E8E5FA"
+ } else {
+ HRowBackgroundColor_outTime = "#E0F5F7"
+ }
+ HBillNo_outTime = item.璁惧鐐规璁″垝鍗曞彿
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
+ }
+
+ })
+ }
+ }
+ table.render(option_outTime);
+
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "璁惧鐐规浠诲姟";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
index 6afb790..0083303 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
@@ -426,36 +426,17 @@
});
//鎹骇鍝�
form.on('submit(btnNextProc)', function (data) {
- //for (var i = 0; i < option.data.length; i++) {
- // if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
- // layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
- // return;
- // }
- //}
- //淇濆瓨鍏抽敭浠�
- if (AllowLoadData(data)) {
- set_SaveBill(data);
- }
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_Key").val("");
+ option.data = [];
+ table.render(option);
-
+ //鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").css('background', '#FFFFFF')//浜у搧鐮佹枃鏈鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").focus();
- //閲嶆柊鑾峰彇鍗曟嵁鍙�
- //$.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNumPDA",
- // type: "GET",
- // data: { "HBillType": '3727' },
- // success: function (d) {
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
- // //閲嶆柊鍚敤淇濆瓨鎸夐挳
- // $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
- // }
- //});
-
- //鍘嗗彶缁戝畾璁板綍鏌ヨ
- //get_Display();
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index d027989..66dc52b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -602,6 +602,10 @@
function dy_PL(HBarCode) {
var sWhere = "select Top 1 * from h_v_IF_BarCodeBillList with(nolock) where 鏉＄爜缂栧彿 = '" + HBarCode + "'"
+ if ($("#HProcName").val() == "鎵撳嵃69鐮佹爣绛�" ) {
+ sWhere = "exec h_p_IF_BarCodeBillList_XWPrint '" + HBarCode + "'"
+ }
+
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index c568122..7076da0 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -85,11 +85,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -220,11 +220,22 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <div class="layui-input-block" style="margin-left: 120px; width: 450px;">
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">浠诲姟褰㈡��</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <select name="HTaskType" id="HTaskType" lay-filter="HTaskType" style="width:120px;">
+ <option value="璁″垝" selected>璁″垝</option>
+ <option value="鍚庤ˉ">鍚庤ˉ</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
</div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
@@ -1201,6 +1212,7 @@
, "HDeleteManDate": tableMain[0]["HDeleteDate"] == null ? "" : Format(new Date(tableMain[0]["HDeleteDate"]), "yyyy-MM-dd")
, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
, "HBackRemark": tableMain[0]["HBackRemark"]
+ , "HTaskType": tableMain[0]["HTaskType"]
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
index 38ed6cc..ef13731 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillEdit.html"
@@ -807,10 +807,10 @@
if (OperationType == 1 || OperationType == 4) {
if ($("#HSourceBillType").val() == "3710") {
- for (var i = 0; i < option.data.length; i++) {
+ for (var i = 0; i < option.data.length; i++) {
+ var tableData = table.cache["mainTable"];
var HSourceBillData = "";
- var HSourceBillData = getPushSource_ICMOBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
- if (HSourceBillData != "none") {
+ var HSourceBillData = getPushSource_ICMOBillInit(tableData[i].HSourceInterID, tableData[i].HSourceEntryID); if (HSourceBillData != "none") {
if (HSourceBillData == null) {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
@@ -1091,7 +1091,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
@@ -1517,7 +1517,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=' +"Warehouse", 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1534,12 +1534,12 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
- })
- }
+ // , end: function () {
+ // obj.update({
+ // "HWHID": OptionData.HItemID
+ // , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
+ // })
+ //}
})
}
//杈呭姪璁￠噺鍗曚綅
@@ -1857,7 +1857,14 @@
$("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
$("#HKeeperID").val(obj[0].HItemID);
}
+
+ function GetGyCur(obj) //杩斿洖甯佸埆
+ {
+ $("#HCurName").val(obj.璐у竵鍚嶇О);
+ $("#HCurID").val(obj.HItemID);
+ $("#HExRate").val(obj.姹囩巼);
+ }
function GetHWHValue(obj) //杩斿洖浠撳簱
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
@@ -1880,8 +1887,9 @@
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
- function GetGyWarehouse(data) {
- OptionData = data
+ function GetGyWarehouse(data) {
+ option.data = data
+ //OptionData = data
}
//鍙屽嚮杩斿洖杈呭姪灞炴��
function GetGyProperty(data) {
--
Gitblit v1.9.1