From 2ae420c05e704553910956fb95f22dc2da40de72 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 一月 2024 16:28:09 +0800
Subject: [PATCH] 销售出库单：选择源单，对源单记录进行过滤（已审核 未关闭的数据），允许选择多行 多源单（不同客户），保存时 判断 源单是否是审核未关闭状态
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 29 +++++
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 215 ++++++++++++++++++++----------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 8
3 files changed, 136 insertions(+), 116 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2d5b537..2f8bdf2 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5256,7 +5256,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>01/17/2024 12:44:48</publishTime>
+ <publishTime>01/17/2024 16:10:28</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -5277,7 +5277,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>01/17/2024 12:44:48</publishTime>
+ <publishTime>01/17/2024 16:10:28</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html">
<publishTime>12/11/2023 16:22:03</publishTime>
@@ -5439,10 +5439,10 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/17/2024 14:47:31</publishTime>
+ <publishTime>01/17/2024 16:22:35</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/17/2024 14:47:31</publishTime>
+ <publishTime>01/17/2024 16:22:35</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
<publishTime>01/16/2024 14:21:41</publishTime>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index ed3d4d7..a3f2a74 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -559,6 +559,8 @@
sWhere += " and 涓荤 like '%" + HMangerID + "%'";
}
+ sWhere += addSWhereByOpenType();
+
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -1219,6 +1221,33 @@
}
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and HOrgID = " + HOrgID;
+ }
+ return addSWhere;
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 5bc320c..0f2e216 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -526,7 +526,7 @@
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
- if (OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4) {
//#region 鍒ゆ柇婧愬崟鐘舵��
for (var i = 0; i < option.data.length; i++) {
var HSourceBillData = "";
@@ -1303,9 +1303,10 @@
//#region 閫夋嫨婧愬崟
function get_checkMainSource() {
+ var HOrgID = $("#HOrgID").val();
var url = "";
if ($("#BillType").val() == "1401") {
- url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html";
+ url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html?openType=2&HOrgID=" + HOrgID;
} else {
return layer.msg('褰撳墠涓嶆敮鎸佹敼婧愬崟閫夋嫨锛侊紒');
}
@@ -1326,8 +1327,7 @@
}
if ($("#BillType").val() == "1401") {
- setInitBySeOrderBill(checkStatus.data[0].hmainid);
- getCustomerBalance($("#HSupID").val());
+ setInitBySeOrderBill(checkStatus);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2332,116 +2332,107 @@
//#endregion
//#region 閫夋嫨婧愬崟-閿�鍞鍗�
- function setInitBySeOrderBill(HMainSourceInterID) {
- //鏌ヨ閿�鍞槸鍚﹀瓨鍦ㄥ苟鍒濆鍖栭〉闈�
- $.ajax({
- url: GetWEBURL() + "/Xs_SeOrderBill/loadXs_SeOrderBill_Edit",
- async: false,
- type: "GET",
- data: {
- "HInterID": HMainSourceInterID
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
-
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HDeptID": data.HDeptID
- , "HDeptName": data.閮ㄩ棬
- , "HEmpID": data.HEmpID
- , "HEmpName": data.涓氬姟鍛�
- , "HManagerID": data.HManagerID
- , "HManagerName": data.涓荤
- , "HMainSourceInterID": HMainSourceInterID
- , "HMainSourceEntryID": "0"
- , "HMainSourceBillNo": data.鍗曟嵁鍙�
- , "HMainSourceBillType": $("#BillType").val()
- , "HSupID": data.HCusID
- , "HSupName": data.瀹㈡埛
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HSellSID": data.HSellSID
- , "HSellSName": data.閿�鍞柟寮�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- });
-
- //瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < result.data.length; i++) {
- rowdata.push(
- {
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": dealDoubleToFixed(result.data[i].鏁伴噺, 1)
- , "HQty": dealDoubleToFixed(result.data[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(result.data[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(result.data[i].鍚◣鍗曚环, 3)
- , "HTaxRate": result.data[i].绋庣巼
- , "HMoney": dealDoubleToFixed(result.data[i].閲戦, 2)
- , "HTaxMoney": dealDoubleToFixed(result.data[i].浠风◣鍚堣, 2)
- , "HWHID": $("#HWHID").val()
- , "鍙戣揣浠撳簱": $("#HWHName").val()
- , "HRemark": ""
-
- , "HQty_Full": "0"
- , "HQty_Empty": "0"
- , "HQty_Back": "0"
- , "HCostPrice": "0"
- , "HCostMoney": "0"
- , "HSalePrice": "0"
-
- , "HSeOrderInterID": result.data[i].hmainid
- , "HSeOrderEntryID": result.data[i].hsubid
- , "HSeOrderBillNo": result.data[i].鍗曟嵁鍙�
-
- , "HSourceInterID": result.data[i].hmainid
- , "HSourceEntryID": result.data[i].hsubid
- , "HSourceBillNo": result.data[i].鍗曟嵁鍙�
- , "HSourceBillType": result.data[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HSPID': "0"
- , 'HSPName': ""
- , 'HSPGroupID': "0"
- , "HSPGroupName": ""
- , 'HSCWHID': "0"
- , 'HSCWHName': ""
- , 'HSCSPID': "0"
- , 'HSCSPName': ""
- , 'HBatchNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HPropertyID': "0"
- , 'HPropertyName': ""
- , 'HSecUnitID': "0"
- , 'HSecUnitName': ""
- , 'HSecUnitRate': "0"
-
-
- , 'HEngineNum': ""
- , 'HUnderPanNum': ""
- , 'HLeaveFactCard': ""
- }
- );
- }
- option.data = rowdata;
- table.render(option);
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ function setInitBySeOrderBill(checkStatus) {
+ var dataArray = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = getPushSourceBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
+ if (temp != "none") {
+ dataArray.push(temp);
+ } else {
+ return;
}
+ }
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
+ , "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ , "HMainSourceBillNo": ""
+ , "HMainSourceBillType": $("#BillType").val()
+ , "HSupID": dataArray[0].HCusID
+ , "HSupName": dataArray[0].瀹㈡埛
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴鐢佃瘽
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
});
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HTaxMoney": dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
+ , "HWHID": $("#HWHID").val()
+ , "鍙戣揣浠撳簱": $("#HWHName").val()
+ , "HRemark": ""
+
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+
+
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
}
//#endregion
--
Gitblit v1.9.1