From 6b977a9a914c23e50be602dade8afcf062629aa3 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 06 三月 2024 09:18:03 +0800
Subject: [PATCH] 发货通知单选单号
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 82 ++++++++++++++++++++++++++-
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 8 +-
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 1
WebTM/views/销售管理/其他应付单/YF_PayMentOtherBillMain.html | 28 +++++---
5 files changed, 103 insertions(+), 20 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 922b73b..f9bb972 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 149f389..bf1bf10 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -344,6 +344,7 @@
if (linterid == null || linterid == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HInterID").val("0");
$("#HBillNo").val("");
$.ajax({
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
index ebabfe7..7e4a398 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
@@ -97,7 +97,7 @@
<div class="layui-inline">
<label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" step="background-color: #efefef4d;" readonly>
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
</div>
</div>
</div>
@@ -130,7 +130,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓嶅惈绋庨噾棰�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off" >
+ <input type="text" class="layui-input" name="HMoney" id="HMoney" style="background-color: #efefef4d;" value="0" autocomplete="off" readonly >
</div>
</div>
<div class="layui-inline">
@@ -405,10 +405,14 @@
var HTaxRate = $("#HTaxRate").val() * 1; //绋庣巼
var HRelSumMoney = HMoney * (1 + HTaxRate); //鎬婚噾棰�
- $("#HSumMoney").val(HRelSumMoney);
+ //$("#HSumMoney").val(HRelSumMoney);
});
//#endregion
+
+
+
+
//#region 绋庣巼澶辩劍浜嬩欢
var oldHTaxRate = ""; //淇敼鍓嶇殑鍊�
@@ -428,22 +432,24 @@
//杈撳叆鐨勭◣鐜囷紝
var HTaxRate = newHTaxRate * 1; //绋庣巼
- var HMoney = $("#HMoney").val() * 1; //绋庣巼
- var HSumMoney= HMoney * (1 + HTaxRate); //鎬婚噾棰�
-
- $("#HSumMoney").val(HSumMoney);
+ var HSumMoney = $("#HSumMoney").val() * 1; //鍗曟嵁閲戦
+ var HMoney = HSumMoney / (1 + (HTaxRate * 0.01)); //涓嶅惈绋庨噾棰�
+
+ $("#HMoney").val(HMoney);
});
//#endregion
- //#region 鎬婚噾棰濆け鐒︿簨浠�
+ ///涓嶅惈绋庨噾棰�= 鍚◣閲戦/锛�100+绋庣巼锛�/100
+
+ //#region 鍗曟嵁閲戦澶辩劍浜嬩欢
var oldHSumMoney = ""; //淇敼鍓嶇殑鍊�
var newHSumMoney = ""; //淇敼鍚庣殑鍊�
$("#HSumMoney").on('focus', function (data) {
- oldHSumMoney = $("#HSumMoney").val() * 1; //涓嶅惈绋庨噾棰濇枃鏈鑾峰彇鐒︾偣鏃惰幏鍙栦慨鏀瑰墠鐨勫��
+ oldHSumMoney = $("#HSumMoney").val() * 1; //鍗曟嵁閲戦鏂囨湰妗嗚幏鍙栫劍鐐规椂鑾峰彇淇敼鍓嶇殑鍊�
}).on('blur', function (data) {
- newHSumMoney = $("#HSumMoney").val(); //涓嶅惈绋庨噾棰濇枃鏈澶辩劍鏃惰幏鍙栦慨鏀瑰悗鐨勫��
+ newHSumMoney = $("#HSumMoney").val(); //鍗曟嵁閲戦鏂囨湰妗嗗け鐒︽椂鑾峰彇淇敼鍚庣殑鍊�
if (newHSumMoney!=0) {
//鍒ゆ柇杈撳叆鐨勯噾棰濇槸鍚﹀悎娉�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
@@ -456,7 +462,7 @@
//杈撳叆鐨勬�婚噾棰濆悎娉曪紝閲嶇畻涓嶅惈绋庨噾棰�
var HSumMoney = newHSumMoney * 1; //涓嶅惈绋庨噾棰�
var HTaxRate = $("#HTaxRate").val() * 1; //绋庣巼
- var HMoney = HSumMoney / (1 + HTaxRate); //涓嶅惈绋庨噾棰�
+ var HMoney = HSumMoney / (100 + HTaxRate)/100; //涓嶅惈绋庨噾棰�
$("#HMoney").val(HMoney);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 7df4467..734f3f0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -97,7 +97,7 @@
<div class="layui-inline">
<label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" step="background-color: #efefef4d;" readonly>
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
</div>
</div>
</div>
@@ -403,7 +403,7 @@
//杈撳叆鐨勪笉鍚◣閲戦鍚堟硶锛岄噸
var HMoney = newHMoney * 1; //绠楁�婚噾棰� //涓嶅惈绋庨噾棰�
var HTaxRate = $("#HTaxRate").val() * 1; //绋庣巼
- var HRelSumMoney = HMoney * (1 + HTaxRate); //鎬婚噾棰�
+ var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01) ); //鎬婚噾棰�
$("#HSumMoney").val(HRelSumMoney);
@@ -429,7 +429,7 @@
//杈撳叆鐨勭◣鐜囷紝
var HTaxRate = newHTaxRate * 1; //绋庣巼
var HMoney = $("#HMoney").val() * 1; //绋庣巼
- var HSumMoney= HMoney * (1 + HTaxRate); //鎬婚噾棰�
+ var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�
$("#HSumMoney").val(HSumMoney);
@@ -456,7 +456,7 @@
//杈撳叆鐨勬�婚噾棰濆悎娉曪紝閲嶇畻涓嶅惈绋庨噾棰�
var HSumMoney = newHSumMoney * 1; //涓嶅惈绋庨噾棰�
var HTaxRate = $("#HTaxRate").val() * 1; //绋庣巼
- var HMoney = HSumMoney / (1 + HTaxRate); //涓嶅惈绋庨噾棰�
+ var HMoney = HSumMoney / (1 + (HTaxRate * 0.01)); //涓嶅惈绋庨噾棰�
$("#HMoney").val(HMoney);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index b96e7c9..d86564a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -65,7 +65,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
- <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -157,6 +157,16 @@
<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 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; background-color: #efefef4d;" readonly>
+
+ <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>
@@ -396,7 +406,8 @@
var rowdata = [{
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
- "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
}];
// 鍒濆鍖栫晫
@@ -409,7 +420,8 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
- "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
case 'btn-AddLine':
@@ -588,6 +600,62 @@
}
});
//#endregion
+
+ //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+ form.on('submit(XDHList)', function () {
+
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '閿�鍞鍗曞垪琛�' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+ //鑾峰彇閿�鍞鍗曚唬鐮�
+ var ProcessNumber = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ ProcessNumber.push(checkStatus.data[i]);
+ }
+ for (var i = 0; i < ProcessNumber.length; i++) {
+ option.data.push({
+ "HMaterID": checkStatus.data[i].HMaterID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[i].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[i].璁￠噺鍗曚綅
+ ,"HWHID": "0"
+ , "鍙戣揣浠撳簱": ""
+ , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+
+ , "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
+ , "HSourceBillType": checkStatus.data[i].HBillType
+ , "HSourceInterID": checkStatus.data[i].hmainid
+ , "HSourceEntryID": checkStatus.data[i].hsubid
+ })
+ }
+ table.render(option);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+
+ });
+ });
+ //#endregion
+
+
//#endregion
@@ -613,6 +681,10 @@
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
+ , { type: '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
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
@@ -697,6 +769,10 @@
{
"HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HUnitID": subdata[i].HUnitID, "璁￠噺鍗曚綅": subdata[i].璁￠噺鍗曚綅,
"HWHID": subdata[i].HWHID, "鍙戣揣浠撳簱": subdata[i].鍙戣揣浠撳簱, "HQty": subdata[i].鏁伴噺, "HPrice": subdata[i].鍗曚环, "HMoney": subdata[i].閲戦, "HRemark": subdata[i].琛ㄤ綋澶囨敞
+ , "HSourceBillNo": subdata[i].婧愬崟鍗曞彿, //婧愬崟鍙�
+ "HSourceBillType": subdata[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
+ "HSourceInterID": subdata[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
+ "HSourceEntryID": subdata[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
}
)
}
--
Gitblit v1.9.1