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/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 219 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 169 insertions(+), 50 deletions(-)
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 ef0f308..77102f9 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"
@@ -69,13 +69,13 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
+ <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;">
@@ -88,7 +88,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">瀹㈡埛</label>
+ <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -98,7 +98,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱</label>
+ <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -116,7 +116,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <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;">
@@ -126,7 +126,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">甯佸埆</label>
+ <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -136,7 +136,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姹囩巼</label>
+ <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">
</div>
@@ -152,7 +152,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">涓荤<label style="color:red"> * </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;">
@@ -304,7 +304,7 @@
<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>
+ <input model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -393,7 +393,7 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
- window.OptionData = {};
+ window.OptionData = [];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1402";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -413,6 +413,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ get_DeptHManage();
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -699,9 +701,11 @@
, "瑙勬牸鍨嬪彿": checkStatus.data[i].瑙勬牸鍨嬪彿
, "HUnitID": checkStatus.data[i].HUnitID
, "璁￠噺鍗曚綅": checkStatus.data[i].璁￠噺鍗曚綅
- ,"HWHID": "0"
- , "鍙戣揣浠撳簱": ""
- , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ , "HWHID": checkStatus.data[i].HWhID
+ , "鍙戣揣浠撳簱": checkStatus.data[i].瀛愪粨搴�
+ , "HQty": checkStatus.data[i].鏁伴噺,
+ "HPrice": checkStatus.data[i].鍗曚环,
+ "HMoney": checkStatus.data[i].閲戦, "HRemark": ""
, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
, "HSourceBillType": checkStatus.data[i].HBillType
@@ -709,9 +713,24 @@
, "HSourceEntryID": checkStatus.data[i].hsubid
})
}
- $("#HProjectID").val(checkStatus.data[0].HProjectID);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰缂栫爜);
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+
+ $("#HCusID").val(checkStatus.data[0].HCusID);
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].甯佸埆);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HWHID").val(checkStatus.data[0].涓讳粨搴搃d);
+ $("#HWHName").val(checkStatus.data[0].涓讳粨搴�);
+
table.render(option);
layer.close(index);//鍏抽棴寮圭獥
}
@@ -796,8 +815,8 @@
, "HEmpName": data.涓氬姟鍛�
, "HCusID": data.HCusID
, "HCusName": data.瀹㈡埛
- , "HWHID": data.HWHID
- , "HWHName": data.鍙戣揣浠撳簱
+ , "HWHID": data.涓讳粨搴揑D
+ , "HWHName": data.涓诲彂璐т粨搴�
, "HAddress": data.浜よ揣鍦板潃
, "HDeptName": data.閮ㄩ棬
, "HDeptID": data.HDeptID
@@ -881,8 +900,12 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
$("#HInterID").val(d.data[0].HInterID);
+ $("#HMakeDate").val(shijian);
+ $("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ get_DeptHManage();
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);
@@ -905,6 +928,36 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+
+ 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 ($("#HCusID").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 ($("#HCurID ").val() == 0) {
+ layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HExRate").val() == 0) {
+ layer.msg("姹囩巼涓嶈兘涓�0锛�", { 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;
+ }
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -946,6 +999,33 @@
}
//#endregion
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ function get_DeptHManage() {
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HEmpName").val(sessionStorage["HUserName"]);
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+
+ //鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鐨勯儴闂� 鑾峰彇 涓荤
+ if ($("#HDeptID").val() != 0) {
+ $.ajax({
+ url: GetWEBURL() + "Gy_Department/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ $("#HManagerID").val(result.data[0].HEmpID);
+ $("#HManagerName").val(result.data[0].璐熻矗浜�);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }
+
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -982,6 +1062,20 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
})
}
//璁￠噺鍗曚綅
@@ -994,7 +1088,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1010,6 +1104,16 @@
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1042,10 +1146,13 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (typeof (OptionData.HItemID) != "undefined") {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1081,7 +1188,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1203,7 +1310,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓荤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1221,7 +1328,7 @@
//椤圭洰浠ｇ爜
function get_checkSearchHProNumber() {
- var HOrgID = $("#HOrgID").val();
+ var HOrgID = sessionStorage["OrganizationID"];
//鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -1280,7 +1387,6 @@
}
//#endregion
-
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Add_Edit_Xs_SeOutStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
@@ -1295,29 +1401,29 @@
//浠ヤ笂鏄痩ayui妯″潡
});
// 鍩虹璧勬枡杩斿洖鏁版嵁
- //function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
- //{
- // $("#HEmpName").val(obj[0].HName);
- // $("#HEmpID").val(obj[0].HItemID);
- //}
+ function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
+ {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
- //function GetHSupValue(obj) //杩斿洖瀹㈡埛
- //{
- // $("#HCusName").val(obj[0].HName);
- // $("#HCusID").val(obj[0].HItemID);
- //}
+ function GetHCusNameValue(obj) //杩斿洖瀹㈡埛
+ {
+ $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+ $("#HCusID").val(obj[0].HItemID);
+ }
- //function GetHManagerValue(obj) //杩斿洖涓荤
- //{
- // $("#HManagerName").val(obj[0].HName);
- // $("#HManagerID").val(obj[0].HItemID);
- //}
+ function GetHManagerValue(obj) //杩斿洖涓荤
+ {
+ $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
- //function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
- //{
- // $("#HDeptName").val(obj[0].HName);
- // $("#HDeptID").val(obj[0].HItemID);
- //}
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
//椤圭洰浠ｇ爜
function GetProjectBillValue(obj) {
@@ -1329,11 +1435,6 @@
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
- }
-
- //鍙屽嚮杩斿洖浠撳簱
- function GetHWHSubValue(data) {
- OptionData = data[0]
}
function GetHWHValue(obj) //杩斿洖浠撳簱
@@ -1350,6 +1451,24 @@
}
layui.table.render(option);
}
+
+ //鍙屽嚮杩斿洖浠撳簱
+ function GetHWHSubValue(data) {
+ OptionData = data[0]
+ }
+
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
+ {
+ OptionData = obj;
+ }
+
+ function GetAuxiliaryUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ OptionData = obj[0];
+ }
+
+
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1