From de7931bdf73d57ca79eeb0cd48ea3a0ea5453e0e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 09:45:21 +0800
Subject: [PATCH] 新增制程陷阱测试趋势图、PPM绩效趋势图报表模块
---
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 480 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 367 insertions(+), 113 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 1582188..702f0b4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -106,7 +106,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撶鍛�</label>
+ <label class="layui-form-label">浠撶鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
+ <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -128,7 +128,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -138,7 +138,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -150,7 +150,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹</label>
+ <label class="layui-form-label">楠屾敹<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -160,7 +160,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -170,7 +170,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -272,6 +272,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
</div>
</script>
@@ -311,7 +313,7 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
//鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
- window.OptionData = {};
+ window.OptionData = [];
//#endregion
@@ -373,6 +375,12 @@
"HOrderPrice": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "", "HBatchNo": "", "HRemark": ""
};
switch (obj.event) {
+ //搴撳瓨鏌ヨ
+ case 'get_Inventory': get_Inventory();
+ break;
+ //鍑哄叆搴撹褰曟煡璇�
+ case 'get_InOutSum': get_InOutSum();
+ break;
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
@@ -479,7 +487,55 @@
//#endregion
-
+ //#region 搴撳瓨鏌ヨ
+ function get_Inventory() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+ var HMaterID = data[0].HMaterID.toString();
+ //寮圭獥鏂规硶
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+ , btn: ['鍙栨秷']
+ , btn1: function (index, layero) {
+ layer.close(index);
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+ }
+ }
+ //#endregion
+ //#region 鍑哄叆搴撹褰曟煡璇�
+ function get_InOutSum() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+ var HMaterID = data[0].HMaterID.toString();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+ , btn: ['鍙栨秷']
+ , btn1: function (index, layero) {
+ layer.close(index);
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+ }
+ }
+ //#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -552,6 +608,109 @@
table.render(option);
}
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ /* table.render(option);*/
+ break;
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1;
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1;
+ var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ table.render(option);
+ default:
+ }
+ });
+ //#endregion
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -564,70 +723,70 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
/*, "HSSDate": formatDate(data.缁撶畻鏃ユ湡)*/
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.浠撶鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HWHID": data.HWHID
- , "HWHName": data.璋冨叆浠撳簱
- , "HSCWHID": data.HSCWHID
- , "HSCWHName": data.璋冨嚭浠撳簱
- , "HManagerName": data.璐熻矗浜�
- , "HManagerID": data.HManagerID
- , "HSecManagerID": data.HSecManagerID
- , "HSecManagerName": data.楠屾敹
- , "HKeeperID": data.HKeeperID
- , "HKeeperName": data.淇濈鍛�
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSourceBillType": data.婧愬崟绫诲瀷
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HAddress": data[0].浜よ揣鍦扮偣
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].渚涘簲鍟�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].浠撶鍛�
+ , "HCurID": data[0].HCurID
+ , "HCurName": data[0].甯佸埆
+ , "HExRate": data[0].姹囩巼
+ , "HWHID": data[0].HWHID
+ , "HWHName": data[0].璋冨叆浠撳簱
+ , "HSCWHID": data[0].HSCWHID
+ , "HSCWHName": data[0].璋冨嚭浠撳簱
+ , "HManagerName": data[0].璐熻矗浜�
+ , "HManagerID": data[0].HManagerID
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HSecManagerName": data[0].楠屾敹
+ , "HKeeperID": data[0].HKeeperID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HPSStyleID": data[0].HPSStyleID
+ , "HPSStyleName": data[0].閲囪喘鏂瑰紡
+ , "HSourceBillType": data[0].婧愬崟绫诲瀷
+ , "HSSID": data[0].HSSID
+ , "HSSName": data[0].缁撶畻鏂瑰紡
+ , "HLinkMan": data[0].鑱旂郴浜�
+ , "HLinkPhone": data[0].鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HUpDater": data[0].淇敼浜�
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HDeleteMan": data[0].浣滃簾浜�
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQtyMust": data.搴旀敹鏁伴噺, "HQty": data.瀹炴敹鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HOrderPrice": data.閲囪喘閲戦, "HWHID": data.HWHID, "璋冨叆浠撳簱": data.璋冨叆浠撳簱, "HSCWHID": data.HSCWHID, "璋冨嚭浠撳簱": data.璋冨嚭浠撳簱, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data.鎵规,
- "HSourceBillNo": data.婧愬崟鍗曞彿, //婧愬崟鍙�
- "HSourceBillType": data.婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- "HSourceInterID": data.婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- "HSourceEntryID": data.婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID
+ , "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOrderPrice": data[i].閲囪喘閲戦, "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱, "HTaxRate": data[i].绋庣巼
+ , "HTaxMoney": data[i].閲戦 * data[i].绋庣巼, "HlineTotal": data[i].閲戦 + data[i].绋庨, "HlineTotalBB": (data[i].閲戦 + data[i].绋庨) * data[i].姹囩巼
+ , "HTaxPrice": data[i].鍚◣鍗曚环, "HDiscountRate": data[i].鎶樻墸鐜�, "HRelTaxPrice": data[i].瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data[i].浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data[i].鎵规,
+ "HSourceBillNo": data[i].婧愬崟鍗曞彿, //婧愬崟鍙�
+ "HSourceBillType": data[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
+ "HSourceInterID": data[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
+ "HSourceEntryID": data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
}
)
}
@@ -651,7 +810,30 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
-
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSecManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HKeeperID").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if ($("#HWHID").val() == 0) {
layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -670,24 +852,24 @@
}
}
- checkDuplicateData(num);
- const duplicateRows = checkDuplicateData(num);
- if (duplicateRows.length > 0) {
- let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+ //checkDuplicateData(num);
+ //const duplicateRows = checkDuplicateData(num);
+ //if (duplicateRows.length > 0) {
+ // let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
- for (let i = 0; i < duplicateRows.length; i++) {
- const { row1, row2 } = duplicateRows[i];
- message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+ // for (let i = 0; i < duplicateRows.length; i++) {
+ // const { row1, row2 } = duplicateRows[i];
+ // message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
- if (i !== duplicateRows.length - 1) {
- message += '锛�';
- }
- }
+ // if (i !== duplicateRows.length - 1) {
+ // message += '锛�';
+ // }
+ // }
- message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
- layer.alert(message);
- return;
- }
+ // message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+ // layer.alert(message);
+ // return;
+ //}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
@@ -758,15 +940,20 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
@@ -780,7 +967,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -797,11 +984,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -832,11 +1023,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSecUnitID": OptionData.HItemID
+ , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -867,11 +1062,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
@@ -902,11 +1102,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData != null && OptionData.length == undefined) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
@@ -956,7 +1161,29 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+ //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+
+ //鏈鏍� 宸插叧闂殑鍗曞瓙涓嶅厑璁镐笅鎺�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = getPushSource_ICStockInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
+ if (temp != "none") {
+ if (temp.鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ if (temp.琛岀姸鎬� != "") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ } else {
+ return;
+ }
+ }
+
//鑾峰彇鍒嗘寮忚皟鍏ュ崟閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -990,7 +1217,7 @@
, "HSecManagerName": data.楠屾敹
, "HKeeperID": data.HKeeperID
, "HKeeperName": data.淇濈鍛�
- , "HSourceBillType": data.鍗曟嵁绫诲瀷
+ //, "HSourceBillType": data.鍗曟嵁绫诲瀷
});
@@ -1271,6 +1498,33 @@
}
//#endregion
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐叆搴撳崟鏁版嵁
+ function getPushSource_ICStockInBillInit(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Kf_StepFoldInBill/loadKf_ICStockBillMain_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
//#endregion
@@ -1330,7 +1584,7 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
--
Gitblit v1.9.1