From 59db56126675dc926c2c203b4077ba13bcb38e63 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 29 四月 2024 17:34:56 +0800
Subject: [PATCH] 仓库管理流程优化
---
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillEdit.html | 244 +++++++++++++++++++++++++++++++++---------------
1 files changed, 166 insertions(+), 78 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html"
index c52074b..a903de0 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html"
@@ -69,7 +69,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="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -83,7 +83,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="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -93,7 +93,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="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;">
@@ -103,7 +103,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="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -115,7 +115,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="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;">
@@ -125,7 +125,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="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -135,7 +135,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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -147,7 +147,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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -157,7 +157,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="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;">
@@ -339,6 +339,27 @@
$("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡
}
});
+ //椤甸潰鍒濆鍖栧姞杞�
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+
+ //鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鐨勯儴闂� 鑾峰彇 涓荤
+ 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) {
+ $("#HMangerID").val(result.data[0].HEmpID);
+ $("#HMangerName").val(result.data[0].璐熻矗浜�);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
} else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);
RoadBillMain(linterid);
@@ -548,62 +569,61 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cg_POOrderBill/cx",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/cx",
type: "GET",
data: {
"HInterID": linterid
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HSSDate": formatDate(data.缁撶畻鏃ユ湡)
- //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.涓氬姟鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HManagerName": data.涓荤
- , "HManagerID": data.HManagerID
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HChecker": data.瀹℃牳浜�
- , "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].寰�鏉ュ崟浣�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].涓氬姟鍛�
+ , "HMangerName": data[0].涓荤
+ , "HMangerID": data[0].HMangerID
+ , "HSecManagerName": data[0].楠屾敹鍛�
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HKeeperID": data[0].HKeeperID
+
+ , "HWHID": data[0].涓昏皟鍏ヤ粨搴揑D
+ , "HWHName": data[0].涓昏皟鍏ヤ粨搴�
+ , "HSCWHID": data[0].涓昏皟鍑轰粨搴揑D
+ , "HSCWHName": data[0].涓昏皟鍑轰粨搴�
+
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd")
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿,
+ "HUnitID": data[i].HUnitID, "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HSecUnitRate": data[i].鎹㈢畻鐜�,
+ "HSecUnitID": data[i].HSecUnitID, "杈呭姪璁￠噺鍗曚綅": data[i].杈呭姪璁￠噺鍗曚綅
+ , "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOutPrice": data[i].璋冨嚭鍗曚环, "HOutMoney": data[i].璋冨嚭閲戦
+ , "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱,
+ "HBASEUNITID": data[i].HBASEUNITID, "鍩烘湰璁￠噺鍗曚綅": data[i].鍩烘湰璁￠噺鍗曚綅,
+ "HEXTAUXUNITID": data[i].HEXTAUXUNITID, "杈呭崟浣�": data[i].杈呭崟浣�
}
)
}
@@ -626,6 +646,43 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+
+ if (OperationType == undefined) {
+ OperationType = 1;
+ }
+
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSCWHID").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 ($("#HSecManagerID").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 ($("#HKeeperID ").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { 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++) {
@@ -704,7 +761,7 @@
}
, end: function () {
obj.update({
- "HMaterID" :OptionData.HMaterID
+ "HMaterID": OptionData.HItemID
,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
@@ -722,7 +779,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -739,11 +796,14 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
}
})
}
@@ -757,7 +817,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -774,11 +834,14 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HSecUnitID": OptionData[0].HItemID
+ , "杈呭姪璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
}
})
}
@@ -862,7 +925,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -879,11 +942,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HBASEUNITID": OptionData.HItemID
- , "鍩烘湰璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HBASEUNITID": OptionData[0].HItemID
+ , "鍩烘湰璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -897,7 +964,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) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -914,11 +981,14 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HEXTAUXUNITID": OptionData.HItemID
- , "杈呭崟浣�": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HEXTAUXUNITID": OptionData[0].HItemID
+ , "杈呭崟浣�": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1168,12 +1238,30 @@
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
$("#HWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0) {
+ option.data[i]["HWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨叆浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHSCWHValue(obj) //杩斿洖璋冨嚭浠撳簱
{
$("#HSCWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HSCWHID").val(obj[0].HItemID);
+ $("#HSCWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HSCWHID"] == 0) {
+ option.data[i]["HSCWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨嚭浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
@@ -1199,7 +1287,7 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
--
Gitblit v1.9.1