From 361ef22b987b45d97b88198b5c5370affbdaa434 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 24 十月 2024 15:09:02 +0800
Subject: [PATCH] 班组职员清单复制
---
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 1047 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 791 insertions(+), 256 deletions(-)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index f01268e..4885901 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -59,7 +59,8 @@
<h1 style="text-align: center; padding: 10px 0;"><b>閲囪喘鍏ュ簱鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -81,25 +82,17 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
- </div>
- </div>
-
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:750px">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
+ <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;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -110,40 +103,39 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-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;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-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;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <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;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
</div>
<div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -155,37 +147,26 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
<!--<label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+ </div>-->
</div>
+ </div>
+ <div class="layui-row">
+
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-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;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
-
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <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;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -206,21 +187,50 @@
<input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
</div>
</div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
</div>
<!--<div class="layui-row">
- <div class="layui-col-xs7 layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
- </div>
- </div>
- </div>-->
+ <div class="layui-col-xs7 layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+ </div>
+ </div>
+ </div>-->
<div class="layui-row">
<div class="layui-col-xs7 layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
</div>
<div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
@@ -240,7 +250,6 @@
</div>
</div>
</div>
-
<!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
@@ -267,20 +276,6 @@
</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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
- </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="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
- </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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
@@ -298,18 +293,32 @@
<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
</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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
</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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
- </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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -363,7 +372,7 @@
var allVal;
//#endregion
-
+ var HModName = "Add_Edit_Kf_POStockInBillList"
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -458,7 +467,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "", "HQty": "", "HRemark": "",
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HRemark": "",
"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
"HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
@@ -498,10 +507,10 @@
//checkRefresh();
}
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
@@ -580,6 +589,116 @@
}
});
+ //#region 鍥炶溅閫夋嫨婧愬崟
+ $('#HSourceBillNo').on('keydown', function (event) {
+ var HSourceBillNo = $('#HSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+ if (event.keyCode == 13) {
+ var ajaxLoad = layer.load();
+ var url;
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HSourceBillNo == "") {
+ return;
+ }
+ if ($("#HSourceBillType").val() == "1102") {
+ //婧愬崟绫诲瀷鏄噰璐鍗�
+ url = "/Cg_POOrderBill/PushList";
+ } else if ($("#HSourceBillType").val() == "1103") {
+ //婧愬崟绫诲瀷鏄敹鏂欓�氱煡鍗�
+ url = "/Cg_POInStockBill/PushList";
+ }
+ $.ajax({
+ url: GetWEBURL() + url,
+ type: "GET",
+ data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var checkStatus = result;
+ if ($("#HSourceBillType").val() == "1102") {
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID);
+
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+
+ var j = 0;
+ for (var i = 0; i < result.data.length; i++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+ "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney,"HOrderPrice": checkStatus.data[j].閲戦,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+ })
+ j++;
+ }
+
+ } else if ($("#HSourceBillType").val() == "1103") {
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+ $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ var j = 0;
+ for (var i = 0; i < result.data.length; i++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HRemark": "",
+ "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+ })
+ j++;
+ }
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
+ } else {
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert(result.Message + "鍙戠敓閿欒!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+ });
+ //#endregion
//#endregion
@@ -587,7 +706,7 @@
function get_Inventory() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
var HMaterID = data[0].HMaterID.toString();
//寮圭獥鏂规硶
layer.open({
@@ -604,7 +723,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
}
}
//#endregion
@@ -612,7 +731,7 @@
function get_InOutSum() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
var HMaterID = data[0].HMaterID.toString();
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -628,17 +747,44 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
}
}
//#endregion
-
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇绮惧害
+ function getDecByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({ // 寮傛璇锋眰
+ url: GetWEBURL() + "Gy_Material/getDecByID", //璇锋眰鍦板潃
+ async: false, //鏄惁寮�鍚紓姝�
+ type: "GET", //璇锋眰绫诲瀷
+ data: { //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
+ "HMaterID": HMaterID // 灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+ },
+ success: function (result) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
+ if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
+ var data = result.data; //澹版槑data鍙橀噺锛屽苟灏嗗叾璧嬪�间负result瀵硅薄涓殑data灞炴��
+ resultData = data[0]; //灏哾ata鏁扮粍锛堟垨绫绘暟缁勫璞★級鐨勭涓�涓厓绱犺祴鍊肩粰鍙橀噺resultData
+ }
+ //else {
+ // layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); //result.msg瀵硅薄锛屾彁绀哄脊绐� 绫诲瀷涓�5锛� 鎸夐挳锛屽拰鎸夐挳鐨勫悕绉颁负閫�鍑� 鏃堕棿 涓�100绉掞紝浠ュ強鍋忕Щ閲忥紙`offset: 't'
+ //}
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 }); //鎻愮ず寮圭獥 鍙戠敓閿欒 锛岃绀烘爣蹇椾负5鐨�
+ }
+ });
+ return resultData;
+ }
+ //#endregion
//#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
table.on('edit(mainTable)', function (obj) {
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
var temp = "";
-
+ var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -670,12 +816,12 @@
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
- HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -684,10 +830,9 @@
, HMoney: HMoney
, HTaxRate: HTaxRate * 100
, HTaxPrice: HTaxPrice
- , HMoney: HMoney
, HlineTotal: HlineTotal
});
- /* table.render(option);*/
+ table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -697,7 +842,7 @@
obj.update({
HPrice: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -713,12 +858,12 @@
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
//璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
- HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -729,6 +874,7 @@
, HTaxPrice: HTaxPrice
, HlineTotal: HlineTotal
});
+ table.render(option)
break;
case "HMoney": //閲戦
//鏁版嵁鏍煎紡鏍￠獙
@@ -738,7 +884,7 @@
obj.update({
HMoney: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -747,18 +893,18 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HMoney = value * 1;
- var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
- var HTaxRate = value * 0.01; //绋庣巼
+ var HPrice = (HMoney / HQty); //鍗曚环=閲戦/鏁伴噺
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
- HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -770,8 +916,8 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- break;
table.render(option);
+ break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
@@ -800,12 +946,12 @@
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
//璁剧疆鏁版嵁灏忔暟浣嶆暟
- HQty = dealDoubleToFixed(HQty, 1);
- HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
- HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- HMoney = dealDoubleToFixed(HMoney, 2);
- HlineTotal = dealDoubleToFixed(HlineTotal, 2);
+
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -817,6 +963,45 @@
, HlineTotal: HlineTotal
});
//table.render(option);
+ break;
+ case "HTaxPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HTaxPrice / (1 + HTaxRate)).toFixed(4)); //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+
+
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ });
+ table.render(option)
break;
default:
}
@@ -904,10 +1089,10 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
- , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { type: 'numbers',field: '搴忓彿', title: '搴忓彿', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
- , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
@@ -920,7 +1105,7 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
, { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
, { field: 'HOrderPrice', title: '閲囪喘閲戦', width: 100, edit: 'text', totalRow: true}
- , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
@@ -935,6 +1120,8 @@
option.data = [];
table.render(option);
+ DisPlay_HideColumn();
+
}
//#region 鍔犺浇琛ㄥご
@@ -981,11 +1168,11 @@
, "HMaker": data.鍒跺崟浜�
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
});
//瀛愯〃 璧嬪��
@@ -1034,7 +1221,7 @@
}
});
- //#region 淇濆瓨鎸夐挳
+ //#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
//#region 鍒ゆ柇婧愬崟鐘舵��
if (OperationType == 1 || OperationType == 4) {
@@ -1046,8 +1233,11 @@
var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
if (HSourceBillData != "none") {
if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
+ if (option.data[i].HSourceInterID!=0) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
+
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
@@ -1069,8 +1259,10 @@
var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
if (HSourceBillData != "none") {
if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
+ if (option.data[i].HSourceInterID != 0) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
@@ -1257,6 +1449,8 @@
, "HCurID": dataArray[0].HCurID
, "HCurName": dataArray[0].甯佸埆
, "HExRate": dataArray[0].姹囩巼
+ , "HWHName": dataArray[0].涓昏〃浠撳簱
+ , "HWHID": dataArray[0].涓昏〃浠撳簱ID
, "HSSID": "0"
, "HSSName": ""
, "HProjectID": dataArray[0].HProjectID
@@ -1267,7 +1461,8 @@
});
//瀛愯〃 璧嬪��
- var rowdata = [];
+ var rowdata = [];
+
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
@@ -1277,9 +1472,11 @@
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 2)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- /*, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)*/
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 2)
+ , "HOrderPrice": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -1324,10 +1521,10 @@
//#endregion
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- if ($("#HEmpName").val() == 0) {
- layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HEmpName").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HDeptName").val() == 0) {
layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1341,14 +1538,14 @@
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 ($("#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 ($("#HSecManagerID").val() == 0) {
+ // layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
var num = [];
@@ -1393,10 +1590,15 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
-
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -1414,13 +1616,14 @@
////#endregion
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1436,13 +1639,14 @@
})
}
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1459,13 +1663,14 @@
}
//宸ョ▼椤圭洰
function get_btnHProjectID() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1482,13 +1687,14 @@
})
}
function get_checkWH() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '浠撳簱鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1515,13 +1721,14 @@
})
}
function get_checkSecManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '楠屾敹鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1537,13 +1744,14 @@
})
}
function get_checkKeeper() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '淇濈鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1559,13 +1767,14 @@
})
}
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1582,13 +1791,14 @@
}
function get_checkManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '璐熻矗浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1658,46 +1868,49 @@
//}
OptionData = checkStatus.data[0];
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "","HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
- "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
- "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
- "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
- "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
- "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
- };
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
+ "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
+ };
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.render(option);
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
- ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- //obj.update({
- // "HMaterID": checkStatus.data[0].HItemID
- // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- // , "HUnitID": checkStatus.data[0].HUnitID
- // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- //})
- //layer.close(index);//鍏抽棴寮圭獥
+ table.render(option);
}
- table.render(option);
+
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1706,19 +1919,57 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
});
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1727,7 +1978,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1754,6 +2005,7 @@
}
//鏀舵枡浠撳簱
if (obj.event == "HWHID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1762,7 +2014,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1827,6 +2079,139 @@
return false;
}
})
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ var TaxRate = getHTaxRateByHSupID();
+ //if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //}
+
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
+ "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ option.data[rowIndex + i].HTaxRate = TaxRate;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
+ }
+ table.render(option);
+ }
+
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+ var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else if (typeof (OptionData.HItemID) != "undefined"){
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ }
+ });
+ });
}
//琛屽唴浜嬩欢
@@ -1880,10 +2265,18 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
-
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
ProcessNumber.push(checkStatus.data[i]);
}
@@ -1918,13 +2311,17 @@
var j = 0;
for (var i = 0; i < checkStatus.data.length; i++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
"HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
"HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
- "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,"HMoney": checkStatus.data[j].閲戦,
+ "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
- "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": checkStatus.data[j].浠风◣鍚堣
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
})
j++;
}
@@ -1934,14 +2331,18 @@
var j = 0;
for (var i = 0; i < ProcessNumber.length; i++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
- "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HRemark": "",
- "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HOrderPrice": "0", "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HRemark": "",
+ "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
"HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
- "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": (checkStatus.data[j].閲戦 + (checkStatus.data[j].閲戦 * checkStatus.data[j].绋庣巼))
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
})
j++;
}
@@ -1978,14 +2379,15 @@
//琛屽唴鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
+ var rowIndex = $(obj.tr).attr("data-index");//鑾峰彇琛岀储寮�
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
+ obj.del();//鍋囧垹闄�
+ table.cache["mainTable"].splice(rowIndex, 1); //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
layer.close(index);
@@ -2069,15 +2471,38 @@
res = result.data;
//layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- }, error: function () {
+ }, error: function (err) {
res = "none";
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ layer.alert("鍙戠敓閿欒!"+err, { icon: 5 });
}
});
return res;
}
//#endregion
+ //#region 閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ function getHTaxRateByHSupID() {
+ var HTaxRate;
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ type: "GET",
+ async: false,
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�);
+ }
+ });
+ } else {
+ HTaxRate = 0;
+ }
+ return HTaxRate;
+ }
+ //#endregion
//#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
function getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID) {
@@ -2097,57 +2522,167 @@
res = result.data;
//layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- }, error: function () {
+ }, error: function (err) {
res = "none";
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ layer.alert("鍙戠敓閿欒!" + err, { icon: 5 });
}
});
return res;
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 淇濆瓨鏂规硶鏍￠獙
function AllowLoadData(data) {
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
var temp = "";
- if ($("#HWHID").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 ($("#HEmpID").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 ($("#HSecManagerID").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;
+ //}
+ //if ($("#HManagerID").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 ($("#HKeeperID").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 ($("#HDeptID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HSupID").val() == 0) {
layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HPSStyleID").val() == 0) {
- layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSSID").val() == 0) {
- layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HPSStyleID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HSSID").val() == 0) {
+ // layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//#region 瀛愯〃 鏁版嵁妫�楠�
for (var i = 0; i < option.data.length; i++) {
@@ -2178,8 +2713,8 @@
//鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HPrice"] + "";
if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
- return false;
+ //layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+ //return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
@@ -2188,8 +2723,8 @@
//鍚◣鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HTaxPrice"] + "";
if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
- return false;
+ //layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+ //return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
@@ -2205,8 +2740,8 @@
//閲戦鏍煎紡鏍￠獙
temp = option.data[i]["HMoney"] + "";
if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
- return false;
+ //layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
+ //return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
@@ -2293,8 +2828,8 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
--
Gitblit v1.9.1