From 7bb3ffb383e41f66ea9e89b8b0f8182726e77d1b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 27 一月 2026 15:14:07 +0800
Subject: [PATCH] 华舟 新增 器具保养规程 器具点检规程 设备点检规程 设备保养规程 的默认结果选择
---
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 925 +++++++++++++++++++++------------------------------------
1 files changed, 346 insertions(+), 579 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 278329b..07377b7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -45,6 +45,7 @@
<form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
@@ -66,7 +67,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁缂栧彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" >
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
</div>
</div>
@@ -83,9 +84,9 @@
<!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
</select>
<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
- <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
- </select>-->
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -102,7 +103,6 @@
</div>
</div>
<div class="layui-row">
-
<div class="layui-inline">
<label class="layui-form-label">閿�鍞儴闂�</label>
<div class="layui-input-inline">
@@ -129,18 +129,27 @@
<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <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">
<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
- <option value="鍘荤◣浠�" selected="selected">鍘荤◣浠�</option>
- <option value="缁撶畻浠�">缁撶畻浠�</option>
+ <option value="鍘荤◣浠�">鍘荤◣浠�</option>
+ <option value="缁撶畻浠�" selected="selected">缁撶畻浠�</option>
<option value="鍚◣浠�">鍚◣浠�</option>
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectName" id="HProjectName" class="layui-input" lay-filter="HProjectName" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float:left;width:150px;">
</div>
</div>
</div>
@@ -152,7 +161,7 @@
</div>
</div>
</div>
-
+
<!--闅愯棌瀛楁-->
<div class="layui-row" style="display:none;">
@@ -178,7 +187,7 @@
</div>
</div>
- <!--鍩烘湰淇℃伅-->
+ <!--鍏跺畠淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
@@ -391,12 +400,12 @@
window.OptionData = [];
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
-
+ var topScroll = 0;//璁板綍婊氬姩鏉＄殑浣嶇疆
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1426";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
$("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
@@ -469,6 +478,14 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 琛ㄥご鎿嶄綔鎸夐挳
+
+ //#region 鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ const url = new URL(location.href);
+ location.href = url.origin + url.pathname;
+ });
+ //#endregion
+
//#region 閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
@@ -647,113 +664,61 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+ , "HProjectName": (dataArray[0].椤圭洰鍚嶇О)
});
-
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].HNoTaxCost; //鎴愭湰浠�
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
- } else {
//瀛愯〃Entry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].鍗曚环; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
}
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -792,106 +757,60 @@
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HCusID": dataArray[0].HSupID
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].涓昏〃甯佸埆id
- , "HCurName": dataArray[0].涓昏〃甯佸埆
- , "HExRate": dataArray[0].涓昏〃姹囩巼
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
});
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
-
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
}
- else {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
-
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -917,6 +836,7 @@
}
table.render(option);
+ changeHPrice();
layer.close(ajaxLoad);
layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
} else {
@@ -1023,11 +943,13 @@
table.on('edit(mainTable)', function (obj) {
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var ref1 = /^-?\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"]; //閲戦绮惧害
+ topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//鑾峰彇婊氬姩鏉′綅缃�
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -1039,14 +961,23 @@
case "HQty": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
+ if (!ref1.test(temp)) {
//鎭㈠鏁版嵁鍒扮紪杈戝墠
obj.update({
HQty: oldText
});
table.render(option);
- layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
+ return;
+ } else if (temp * 1 == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
return;
}
@@ -1086,7 +1017,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- //table.render(option);
+ table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1140,7 +1071,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- //table.render(option);
+ table.render(option);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1194,7 +1125,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- //table.render(option);
+ table.render(option);
break;
case "HDiscountRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1238,6 +1169,7 @@
, HDiscountRate: HDiscountRate //鏇存柊HDiscountRate瀛楁锛屽叾鍊兼潵鑷彉閲廐DiscountRate
, HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
});
+ table.render(option);
break;
case "HTaxPrice": //鍚◣鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1289,7 +1221,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- //table.render(option)
+ table.render(option)
break;
case "HMoney": //閲戦
//鏁版嵁鏍煎紡鏍￠獙
@@ -1343,7 +1275,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- //table.render(option);
+ table.render(option);
break;
default:
}
@@ -1354,16 +1286,19 @@
// 鐩戝惉涓嬫媺妗嗛�夋嫨
form.on('select(HPriceType)', function (data) {
console.log(data.value); // 寰楀埌琚�変腑鐨勫��
- // 鎵ц鐩稿叧鎿嶄綔
+ changeHPrice();
+ });
+ //鏍规嵁涓嬫媺妗嗙殑鍊艰缃墿鏂欏崟浠风瓑淇℃伅
+ function changeHPrice() {
//#region 瀛愯〃 鏁版嵁妫�楠�
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HMaterID"] == "0") {
+ if (option.data[i]["HMaterID"] == "0" || option.data[i]["HMaterID"] == "" || option.data[i]["HMaterID"] == undefined) {
layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
return false;
} else {
var HPrice = option.data[i]["HPrice"];
var HMaterID = option.data[i]["HMaterID"];
- var HType = data.value.toString();
+ var HType = $("#HPriceType").val();
//鑾峰彇鐗╂枡瀵瑰簲鍗曚环绫诲瀷鐨勫崟浠�
$.ajax({
url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
@@ -1404,14 +1339,14 @@
option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
}
-
+
}
table.render(option);
//#endregion
- });
+ }
//#endregion
-
+
//#endregion
//#endregion
@@ -1746,7 +1681,7 @@
{
setInitBySellOutBill(checkStatus);
}
-
+ changeHPrice();
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1808,6 +1743,7 @@
}
}
getSeletMainInfo(sMainWhere);
+ changeHPrice();
layer.close(index);//鍏抽棴寮圭獥
}
});
@@ -1847,113 +1783,62 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
});
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].HNoTaxCost; //鎴愭湰浠�
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
- } else {
- //瀛愯〃Entry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].鍗曚环; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
}
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -1990,11 +1875,11 @@
return;
}
});
-
} else if ($("#BillType").val() == "1205") {
$.ajax({
url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
type: "GET",
+ async: false,
data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -2020,98 +1905,53 @@
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
});
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].宸插叧鑱旀暟閲� * 1; //鏁伴噺
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺*1 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
}
- else {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
-
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -2134,7 +1974,7 @@
set_InitGridHaveSource();
option.data = rowdataEntry;
haveSource = true;
- table.render(option);
+ table.render(option)
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -2203,6 +2043,9 @@
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
+ , done: function (res, curr, count) {
+ $(".layui-table-main").scrollTop(topScroll);
+ }
}
var rowdata = [{
@@ -2343,6 +2186,8 @@
, "HRemark": data.琛ㄥご澶囨敞
, "HExplanation": data.鎽樿
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HProjectID": (data.HProjectID == null ? 0 : data.HProjectID)
+ , "HProjectName": data.椤圭洰鍚嶇О
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
@@ -2545,7 +2390,7 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HMangerID": dataArray[0].HManagerID
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
@@ -2565,11 +2410,11 @@
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
- "HMaterID": dataArray[i].hmaterid
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
+ , "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
@@ -2693,6 +2538,7 @@
function AllowLoadData(data) {
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var ref1 = /^-?\d+(\.\d+)?$/; //鍒ゆ柇瀛楃涓叉槸鍚︿负鏁板瓧(鍖呭惈鏁存暟銆佹诞鐐规暟)锛屾鍒欒〃杈惧紡
var temp = "";
//#region 琛ㄥご鏁版嵁妫�楠�
@@ -2755,11 +2601,11 @@
//瀹炲彂鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺涓嶈兘涓�0锛�");
+ if (!ref1.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ } else if (temp * 1 == 0) {
+ layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
return false;
}
@@ -2790,26 +2636,26 @@
return false;
}
- //閲戦鏍煎紡鏍￠獙
- temp = option.data[i]["HMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
- //绋庨鏍煎紡鏍￠獙
- temp = option.data[i]["HTaxMoney"] + "";
+ ////閲戦鏍煎紡鏍￠獙
+ //temp = option.data[i]["HMoney"] + "";
//if (temp == "0") {
- // layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+ // layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
// return false;
- //} else
- if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
- return false;
- }
+ //} else if (!ref.test(temp)) {
+ // layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ // return false;
+ //}
+
+ ////绋庨鏍煎紡鏍￠獙
+ //temp = option.data[i]["HTaxMoney"] + "";
+ ////if (temp == "0") {
+ //// layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+ //// return false;
+ ////} else
+ //if (!ref.test(temp)) {
+ // layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ // return false;
+ //}
//鍙戣揣浠撳簱闈炵┖楠岃瘉
if (option.data[i]["HWHID"] == "0") {
@@ -3444,96 +3290,54 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
- //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
- } else {
- //瀛愯〃Entry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
}
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -3592,7 +3396,6 @@
return;
}
}
-
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMainSourceInterID": "0"
, "HMainSourceEntryID": "0"
@@ -3601,87 +3404,48 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HMangerID": dataArray[0].HManagerID
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HCusID": dataArray[0].hsupid
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].涓昏〃甯佸埆id
- , "HCurName": dataArray[0].涓昏〃甯佸埆
- , "HExRate": dataArray[0].涓昏〃姹囩巼
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectID": dataArray[0].HProjectID == null ? "0" : dataArray[0].HProjectID
});
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
+
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ try {
for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].鍏宠仈鏁伴噺;
rowdataEntry.push(
{
- "HMaterID": dataArray[i].hmaterid
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
+ , "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
- else {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, 'HDiscountRate': "1" //
, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
, "HRemark": ""
, "HSourceInterID": dataArray[i].hmainid
@@ -3703,7 +3467,10 @@
);
}
}
-
+ catch (error) {
+ layer.alert(error.Message, { icon: 5 });
+ }
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -3791,7 +3558,7 @@
async: false, //鏄惁寮�鍚紓姝�
type: "GET", //璇锋眰绫诲瀷
data: { //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
- "HMaterID": HMaterID // 灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+ "HMaterID": HMaterID // 灏咹MaterID浣滀负璇锋眰鍙傛暟鍙戦��
},
success: function (result) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
--
Gitblit v1.9.1