From 90f155cfa6f7cb94c5b9dca64a4c4cbd100d7681 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 四月 2024 17:48:55 +0800
Subject: [PATCH] 采购流程的测试并完善功能； 采购订单-》收料通知单-》采购入库单-》应付单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 79 ++++++++++++++++++--------
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 2
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 81 +++++++++++++++++----------
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 2
5 files changed, 110 insertions(+), 56 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 1582188..045b568 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -990,7 +990,7 @@
, "HSecManagerName": data.楠屾敹
, "HKeeperID": data.HKeeperID
, "HKeeperName": data.淇濈鍛�
- , "HSourceBillType": data.鍗曟嵁绫诲瀷
+ //, "HSourceBillType": data.鍗曟嵁绫诲瀷
});
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 380504e..5c6541a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -77,10 +77,13 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+ <select name="BillType" id="BillType" lay-verify="BillType">
+ <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
+ </select>
+ <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
<option style="color:blue;" selected="selected" value="1102">閲囪喘璁㈠崟</option>
<option style="color:blue;" value="1201">閲囪喘鍏ュ簱鍗�</option>
- </select>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -108,9 +111,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閲囪喘鍛�</label>
+ <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>
@@ -180,7 +183,7 @@
<div class="layui-inline">
<label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block">
- <input type="date" class="layui-input" lay-verify="HPayDate" name="HPayDate" id="HPayDate" style="width:190px;">
+ <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
</div>
</div>
</div>
@@ -379,6 +382,12 @@
//鍒濆鍖栧瓙琛�
set_InitGrid();
+ //鍒濆鍖栫粍缁�
+ Organ();
+
+ //鍒濆鍖� 鑾峰彇婧愬崟绫诲瀷
+ HSourceBillType();
+
//#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
if (OperationType == 1) { //鏃犳簮鍗曟柊澧�
/* $("#HItemID").val(0);*/
@@ -411,8 +420,9 @@
DisPlay_HideColumn();
- //鍒濆鍖栫粍缁�
- Organ();
+
+
+
//#endregion
@@ -508,7 +518,7 @@
});
//#endregion
- //#region 閫夋嫨閲囪喘鍛樻寜閽�
+ //#region 閫夋嫨涓氬姟鍛樻寜閽�
form.on('submit(HEmpList)', function () {
get_checkEmp();
});
@@ -711,10 +721,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
- HOrgIDBar = sessionStorage["OrganizationID"];
- }
- $("#HOrgID").val(HOrgIDBar);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -781,13 +788,13 @@
}
//#endregion
- //#region 閫夋嫨閲囪喘鍛�
+ //#region 閫夋嫨涓氬姟鍛�
function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '閲囪喘鍛樺垪琛�'//鏍囬
+ , title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
})
@@ -867,6 +874,30 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇婧愬崟绫诲瀷
+ function HSourceBillType() {
+ var HName = '搴斾粯鍗�';
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ data: { "HName": HName, "Num": 2 }, //0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+ url: GetWEBURL() + "/Web/GetHSourceBillType",
+ success: function (result) {
+ var HSourceBillTypes = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HSourceBillTypes += '<option style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
+ }
+ $("#BillType").append(HSourceBillTypes);
+ form.render('select');
+ }
+ }
})
}
//#endregion
@@ -1024,7 +1055,7 @@
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
- //#endregion
+
switch (field) {
case "HQty": //鏁伴噺
@@ -1183,7 +1214,7 @@
default:
}
});
- //#endregion
+ //#endregion
//#endregion
//#endregion
@@ -1227,7 +1258,7 @@
, "HSSName": data.缁撶畻鏂瑰紡
, "HPSStyleID": data.HPSStyleID
, "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HPayDate": formatDate(data.浠樻鏃ユ湡)
+ , "HReceiveDate": formatDate(data.浠樻鏃ユ湡)
, "HRemark": data.琛ㄥご澶囨敞
, "HExplanation": data.鎽樿
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
@@ -1346,7 +1377,7 @@
, "HMangerID": dataArray[0].HManagerID
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
- , "HEmpName": dataArray[0].閲囪喘鍛�
+ , "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
, "HCurID": dataArray[0].HCurID
@@ -1427,7 +1458,7 @@
, "HManagerID": dataArray[0].hmanagerid
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
- , "HEmpName": dataArray[0].閲囪喘鍛�
+ , "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
, "HCurID": dataArray[0].HCurID
@@ -1442,7 +1473,7 @@
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
- "HMaterID": dataArray[i].hmaterid
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
@@ -2134,7 +2165,7 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
@@ -2154,13 +2185,13 @@
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
- "HMaterID": dataArray[i].hmaterid
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
+ , "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 47a5695..1a98a71 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1114,7 +1114,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
index 72d9d68..61f79f5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
@@ -710,15 +710,19 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -749,11 +753,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -784,12 +792,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
- })
- }
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSecUnitID": OptionData.HItemID
+ , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
+ })
+ OptionData = [];
+ }
+
+ }
})
}
//璋冨叆浠撳簱
@@ -819,11 +831,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -854,11 +870,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index 5e8e3d7..10465de 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -266,6 +266,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true, hide: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 195, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 195, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 110, sort: true }
//, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125, sort: true }
--
Gitblit v1.9.1