From 8a24a82d61360eb005df8f91fbf40754dfda48db Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 21 五月 2024 11:27:32 +0800
Subject: [PATCH] 销售调价单和销售退货单在未审核的情况下也允许打印
---
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 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 4c36e12..eff8284 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"
@@ -103,7 +103,7 @@
<div class="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="background-color:#efefef4d;" readonly>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<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>
@@ -169,7 +169,7 @@
</div>
</div>
<div class="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="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -346,7 +346,7 @@
var allVal;
var HModName = "Xs_ReceivableBill";
-
+ window.OptionData = [];
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
@@ -1309,7 +1309,7 @@
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
- HOrgIDBar = 0;
+ HOrgIDBar = sessionStorage["OrganizationID"];
//瀛愯〃 璧嬪��
var rowdata = [];
@@ -1758,7 +1758,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1772,13 +1772,27 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
, "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1792,7 +1806,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1804,10 +1818,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -2425,6 +2449,15 @@
$("#HSSName").val(obj[0].HName);
$("#HSSID").val(obj[0].HItemID);
}
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
+ {
+ OptionData = obj;
+ }
+
+ function GetAuxiliaryUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ OptionData = obj[0];
+ }
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
function dealDoubleToFixed(data, num) {
--
Gitblit v1.9.1