From 72e09dba953f432cc60226fb75996f2f5d9e7cfc Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 30 四月 2024 17:34:35 +0800
Subject: [PATCH] 1.调拨申请单 增加审核,反审核,关闭,反关闭,作废,反作废,修复编辑数据不能回显,无法编辑,保存失败功能 2.发货通知单 新增编辑 页面 初始化 主管 部门 业务员,修复多条数据 反写 销售订单 失败 3.销售订单列表 增加字段名,用于选单号 赋值表头信息 4.销售出库单 保存时增加 选着源单 发货通知单 后,查询源单是否存在
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 102 ++++++
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 16
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 381 +++++++++++++++++-------
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 81 +++-
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillEdit.html | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 4
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html | 99 ++---
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 2
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 48 +-
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 49 +-
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 18
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 11
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 46 +-
14 files changed, 566 insertions(+), 295 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/Add_Edit_Kf_MoveStockBill.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/Add_Edit_Kf_MoveStockBill.html"
index aa8d089..091b397 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/Add_Edit_Kf_MoveStockBill.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/Add_Edit_Kf_MoveStockBill.html"
@@ -72,7 +72,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>
@@ -102,7 +102,7 @@
</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="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -113,7 +113,7 @@
</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;">
@@ -123,7 +123,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;">
@@ -136,7 +136,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="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;">
@@ -146,7 +146,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="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;">
@@ -156,7 +156,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;">
@@ -172,7 +172,7 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
- <option value="璋冩嫧鐢宠鍗�" selected="selected">璋冩嫧鐢宠鍗�</option>
+ <option value="1243" selected="selected">璋冩嫧鐢宠鍗�</option>
<option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
</select>
@@ -861,23 +861,31 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- if ($("#HDeptName").val() == 0) {
- layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
- if ($("#HWHName").val() == 0) {
- layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HSCWHID").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: "娓╅Θ鎻愮ず" });
+ 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: "娓╅Θ鎻愮ず" });
+ 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;
+ }
+
var num = [];
@@ -1160,6 +1168,7 @@
})
}
//#endregion
+
//#endregion
//琛屽唴蹇嵎閿瓫閫�
@@ -1495,13 +1504,7 @@
function getSupType() {
var type = $("#HSourceBillType").val();
switch (type) {
- case '1102':
- return { url: "../../閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html", name: "閲囪喘璁㈠崟" };
- break;
- case '1103':
- return { url: "../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html", name: "鏀舵枡閫氱煡鍗�" };
- break;
- case '璋冩嫧鐢宠鍗�':
+ case '1243':
return { url: "../../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html", name: "璋冩嫧鐢宠鍗�" };
break;
}
@@ -1510,7 +1513,7 @@
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
- if ($("#HSourceBillType").val() == "璋冩嫧鐢宠鍗�") {
+ if ($("#HSourceBillType").val() == "1243") {
var url = getSupType().url;
url = encodeURI(url);
@@ -1568,49 +1571,31 @@
for (var i = 0; i < checkStatus.data.length; i++) {
ProcessNumber.push(checkStatus.data[i]);
}
+ $("#HEmpID").val(checkStatus.data[0]["HEmpID"]);
+ $("#HEmpName").val(checkStatus.data[0]["涓氬姟鍛�"]);
+ $("#HSecManagerID").val(checkStatus.data[0]["HSecManagerID"]);
+ $("#HSecManagerName").val(checkStatus.data[0]["楠屾敹鍛�"]);
+ $("#HKeeperID").val(checkStatus.data[0]["HKeeperID"]);
+ $("#HKeeperName").val(checkStatus.data[0]["淇濈鍛�"]);
+ $("#HManagerID").val(checkStatus.data[0]["HMangerID"]);
+ $("#HMangerName").val(checkStatus.data[0]["涓荤"]);
+ $("#HWHID").val(checkStatus.data[0]["HWHID"]);
+ $("#HWHName").val(checkStatus.data[0]["璋冨叆浠撳簱"]);
+ $("#HSCWHID").val(checkStatus.data[0]["HSCWHID"]);
+ $("#HSCWHName").val(checkStatus.data[0]["璋冨嚭浠撳簱"]);
//鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
var NowNum = 0;
NowNum = option.data.length;
- if (getSupType().name == "閲囪喘璁㈠崟") {
- var j = 0;
- for (var i = 0; i < checkStatus.data.length; i++) {
- option.data.push({
- "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
- "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅,
- "HQty": checkStatus.data[j].鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
- "HMoney": checkStatus.data[j].閲戦,
- "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
- })
- j++;
- }
- table.render(option);
- layer.close(index);
- }
- else if (getSupType().name == "鏀舵枡閫氱煡鍗�") {
- var j = 0;
- for (var i = 0; i < ProcessNumber.length; i++) {
- option.data.push({
- "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
- " ": 0, "鐗╂枡杈呭姪灞炴��": "", "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": "", "HQty": checkStatus.data[j].鏁伴噺, "HRemark": "",
- "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
- "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
- "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
- "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
- })
- j++;
- }
- table.render(option);
- layer.close(index);//鍏抽棴寮圭獥
- }
- else if (getSupType().name == "璋冩嫧鐢宠鍗�") {
+ if ($("#HSourceBillType").val() == "1243") {
var j = 0;
for (var i = 0; i < ProcessNumber.length; i++) {
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
"HPropertyID": checkStatus.data[j].HPropertyID, "杈呭姪灞炴��": checkStatus.data[j].杈呭姪灞炴��, "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺, "HQty": checkStatus.data[j].瀹炴敹鏁伴噺, "HRemark": checkStatus.data[j].琛ㄤ綋澶囨敞,
"HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "璋冨叆浠撳簱": checkStatus.data[j].璋冨叆浠撳簱, "HSCWHID": checkStatus.data[j].HSCWHID, "璋冨嚭浠撳簱": checkStatus.data[j].璋冨嚭浠撳簱,
+ "HSPID":"0", "浠撲綅鍚嶇О":"",
"HPOOrderInterID": checkStatus.data[j].HPOOrderInterID, "HPOOrderEntryID": checkStatus.data[j].HPOOrderEntryID, "HPOOrderBillNo": checkStatus.data[j].閲囪喘璁㈠崟鍙�,
"HSeOrderInterID": checkStatus.data[j].HSeOrderInterID, "HSeOrderEntryID": checkStatus.data[j].HSeOrderEntryID, "HSeOrderBillNo": checkStatus.data[j].閿�鍞鍗曞彿,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillSubType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
@@ -1808,7 +1793,7 @@
}
//鍙屽嚮杩斿洖浠撲綅
- function GetStockPlaceValue(data) {
+ function GetGyStockPlace(data) {
OptionData = data
}
//鍙屽嚮杩斿洖璋冨叆浠撳簱
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 a903de0..0dbd8a8 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"
@@ -385,7 +385,7 @@
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HSecUnitRate": "0",
"HSecUnitID": "0", "杈呭姪璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
"HOutPrice": "0", "HOutMoney": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "",
- "HBASEUNITID": "0", "鍩烘湰璁￠噺鍗曚綅": "", "HEXTAUXUNITID": "", "杈呭崟浣�": "", "HRemark": ""
+ "HBASEUNITID": "0", "鍩烘湰璁￠噺鍗曚綅": "", "HEXTAUXUNITID": "0", "杈呭崟浣�": "", "HRemark": ""
};
switch (obj.event) {
case 'btn-AddLine':
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_MoveStockRequestBillList.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_MoveStockRequestBillList.html"
index 3796584..50fb08f 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_MoveStockRequestBillList.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_MoveStockRequestBillList.html"
@@ -117,12 +117,16 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Faudit" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Close" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeClose" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Drop" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeDrop" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -183,6 +187,33 @@
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn-Drop':
+ set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn-DeDrop':
+ set_DropBill(2);
+ break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
break;
@@ -222,6 +253,12 @@
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+ //#endregion
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -405,37 +442,239 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (data[0].鐘舵�� == "鍒涘缓") {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ暟鎹笉鏄垱寤虹姸鎬�,涓嶈兘鍒犻櫎锛�');
+ }
+
})
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Warehouse = $("#Warehouse").val();//浠撳簱
+ var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDeptID) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ }
+ if (MaterialCode) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
+ }
+ if (MaterialName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ }
+ if (SpecificationModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ }
+ if (Warehouse) {
+ sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+ }
+ if (Hmaker) {
+ sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HDeptID").val();//閮ㄩ棬
+ $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ $("#MaterialName").val();//鐗╂枡鍚嶇О
+ $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ $("#Warehouse").val();//浠撳簱
+ $("#Hmaker").val();//鍒跺崟浜�
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1243 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -553,94 +792,6 @@
})
}
-
- // 蹇�熻繃婊�
- function get_FastQuery() {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HDeptID = $("#HDeptID").val();//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
- var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
- var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- var Warehouse = $("#Warehouse").val();//浠撳簱
- var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
- }
- if (HDeptID) {
- sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
- }
- if (MaterialCode) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
- }
- if (MaterialName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
- }
- if (SpecificationModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
- }
- if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
- }
- if (Warehouse) {
- sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
- }
- if (Hmaker) {
- sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- }
- // 閲嶇疆杩囨护鏉′欢
- function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HBillNo").val("");//鍗曟嵁鍙�
- $("#HDeptID").val();//閮ㄩ棬
- $("#MaterialCode").val();//鐗╂枡浠ｇ爜
- $("#MaterialName").val();//鐗╂枡鍚嶇О
- $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- $("#Warehouse").val();//浠撳簱
- $("#Hmaker").val();//鍒跺崟浜�
- sWhere = "";
- get_Display(sWhere);
- }
- //閲嶆柊鍚屾鎸夐挳
- function set_ResCnz() {
- var HBillno2 = $('#HBillno2').val();
- $.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
- type: "GET",
- data: { "HBillNo": HBillno2, "HBillType": 1243 },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
index a52fdef..8ef2069 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
@@ -167,15 +167,15 @@
//#endregion
- //#region 鍙屽嚮杩斿洖鏁版嵁
- table.on('rowDouble(mainTable)', function (obj) {
- var data = [];
- data.push(obj.data);
- parent.GetStockPlaceValue(data);
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- });
- //#endregion
+ ////#region 鍙屽嚮杩斿洖鏁版嵁
+ //table.on('rowDouble(mainTable)', function (obj) {
+ // var data = [];
+ // data.push(obj.data);
+ // parent.GetStockPlaceValue(data);
+ // var index = parent.layer.getFrameIndex(window.name);
+ // parent.layer.close(index);
+ //});
+ ////#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index e0fe612..81b9bc3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -1521,7 +1521,7 @@
$("#HWHID").val(obj[0].HItemID);
}
- function GetStockPlaceValue(obj) { //浠撲綅
+ function GetGyStockPlace(obj) { //浠撲綅
$("#HSPName").val(obj[0].浠撲綅鍚嶇О);
$("#HSPID").val(obj[0].HMainID);
}
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 78c4e2f..de75887 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"
@@ -1782,7 +1782,7 @@
}
, end: function () {
obj.update({
- "HMaterID" :OptionData.HMaterID
+ "HMaterID": OptionData.HItemID
,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
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..7891a13 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>
@@ -413,6 +413,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ get_DeptHManage();
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -701,7 +703,8 @@
, "璁￠噺鍗曚綅": checkStatus.data[i].璁￠噺鍗曚綅
,"HWHID": "0"
, "鍙戣揣浠撳簱": ""
- , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ , "HQty": checkStatus.data[i].鏁伴噺,
+ "HPrice": "0", "HMoney": "0", "HRemark": ""
, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
, "HSourceBillType": checkStatus.data[i].HBillType
@@ -709,9 +712,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);//鍏抽棴寮圭獥
}
@@ -881,8 +899,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 +927,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++) {
@@ -945,6 +997,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) {
@@ -1279,7 +1358,6 @@
})
}
//#endregion
-
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
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/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/Xs_SeOutStockBillList.html"
index 935da93..d266f93 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/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/Xs_SeOutStockBillList.html"
@@ -264,6 +264,8 @@
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
, { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
, { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 125, sort: true }
@@ -302,6 +304,7 @@
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125, sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', sort: true }
+ , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', sort: true }
, { field: '鍗曚环', title: '鍗曚环', sort: true }
, { field: '閲戦', title: '閲戦', sort: true }
, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
@@ -422,28 +425,33 @@
var HSourceEntryID = data[0].婧愬崟瀛愬唴鐮�;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"]},
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (data[0].鐘舵��=="鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
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..66e5a06 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>
@@ -1309,7 +1309,7 @@
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
- HOrgIDBar = 0;
+ HOrgIDBar = sessionStorage["OrganizationID"];
//瀛愯〃 璧嬪��
var rowdata = [];
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_ReceivableBillList.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_ReceivableBillList.html"
index 5cac824..f951f22 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_ReceivableBillList.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_ReceivableBillList.html"
@@ -506,31 +506,36 @@
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/Xs_ReceivableBill/delete',
- type: "GET",
- data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
+ if (data[0].鍗曟嵁鐘舵��=="鍒涘缓") {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Xs_ReceivableBill/delete',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
layer.close(wait);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ暟鎹笉鏄垱寤虹姸鎬�,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
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 f82cbef..c926121 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"
@@ -544,17 +544,19 @@
//, { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125, sort: true }
//, { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125, sort: true }
//, { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170, sort: true }
- //, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
+ , { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
//, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
- //, { field: '甯佸埆', title: '甯佸埆', sort: true }
- //, { field: '姹囩巼', title: '姹囩巼', sort: true }
- //, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
+ , { field: '甯佸埆', title: '甯佸埆', hide: true, sort: true }
+ , { field: '姹囩巼', title: '姹囩巼', hide: true, sort: true }
+ , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
//, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
- //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, hide: true,sort: true }
//, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
- //, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
+ , { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
//, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
- //, { field: '涓荤', title: '涓荤', sort: true }
+ , { field: '涓荤', title: '涓荤', hide: true, sort: true }
+ , { field: '涓讳粨搴搃d', title: '涓讳粨搴搃d', hide: true, sort: true }
+ , { field: '涓讳粨搴�', title: '涓讳粨搴�', hide: true, sort: true }
//, { field: '鎽樿', title: '鎽樿', sort: true }
//, { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
//, { field: '绋庨', title: '绋庨', sort: true }
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 60b0219..0d5194f 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"
@@ -78,13 +78,12 @@
<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>-->
<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
- <option style="color:blue;" value="1402">鍙戣揣閫氱煡鍗�</option>
+ <!--鍔ㄦ�佽幏鍙栨簮鍗�-->
</select>
+ <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -561,7 +560,7 @@
Organ();
//鍔ㄦ�佽幏鍙栨簮鍗�
- //HBillType
+ HBillType();
//#region 椤甸潰鍒濆鍖栧悗锛屾牴鎹鎴疯幏鍙栧鎴蜂綑棰�
getCustomerBalance($("#HSupID").val());
@@ -596,27 +595,53 @@
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
if (OperationType == 1 || OperationType == 4) {
- //#region 鍒ゆ柇婧愬崟鐘舵��
- for (var i = 0; i < option.data.length; i++) {
- var HSourceBillData = "";
- var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
- if (HSourceBillData != "none") {
- if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i+1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
- } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
- var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
- layer.alert(err, { icon: 5 });
- return;
- } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ if ($("#BillType").val() == "1401") {
+ //#region 鍒ゆ柇婧愬崟鐘舵�� 閿�鍞鍗�
+ for (var i = 0; i < option.data.length; i++) {
+ var HSourceBillData = "";
+ var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData == null) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ return;
+ }
+ } else {
return;
}
- } else {
- return;
}
+ //#endregion
}
+ else if ($("#BillType").val() == "1402") {
+ //#region 鍒ゆ柇婧愬崟鐘舵�� 鍙戣揣閫氱煡鍗�
+ for (var i = 0; i < option.data.length; i++) {
+ var HSourceBillData = "";
+ var HSourceBillData = getPushSeOutStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData == null) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ return;
+ }
+ } else {
+ return;
+ }
+ }
//#endregion
+ }
+
}
@@ -877,7 +902,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = value * 1; //鏁伴噺
var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate !== undefined ? obj.data.HTaxRate * 0.01 : 0 //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -922,7 +947,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HPrice = value * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate !== undefined ? obj.data.HTaxRate * 0.01 : 0; //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -1162,6 +1187,7 @@
});
}
//#endregion
+
//#region 寮圭獥閫夋嫨鏂规硶
//#region 閫夋嫨閿�鍞儴闂�
function get_checkDept() {
@@ -2756,11 +2782,14 @@
var temp = getPushSeOutStockBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
if (temp != "none") {
dataArray.push(temp);
- if (temp.瀹℃牳浜� != "") {
+ if (temp.鐘舵�� != "宸插鏍�") {
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
return;
}
-
+ if (temp.琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
if (temp.鍏抽棴浜� != "") {
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
return;
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_SellOutBillList.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_SellOutBillList.html"
index 73616f3..f0bd441 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_SellOutBillList.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_SellOutBillList.html"
@@ -405,6 +405,7 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
, { field: '浠舵暟', title: '浠舵暟', totalRow: true, width: 200, sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
+ , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
, { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
, { field: '绋庣巼', title: '绋庣巼', width: 200, sort: true, totalRow: true }
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 200, sort: true, totalRow: true }
@@ -840,28 +841,33 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
+ if (data[0].鐘舵��=="鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index cd07329..e8dd74f 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -1816,8 +1816,15 @@
$("#HDeptID").val(checkStatus.data[0].HDeptID);
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
- $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
- $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ //涓よ竟鏄剧ず鐨勫瓧娈典笉涓�鏍锋墍浠ョ敤鍒ゆ柇鍘昏祴鍊�
+ if ($("#HSourceBillType").val() == "1102") { //閲囪喘璁㈠崟
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ } else if ($("#HSourceBillType").val() == "1103") { //鏀惰揣閫氱煡鍗�
+ $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+ $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ }
+
$("#HSupID").val(checkStatus.data[0].HSupID);
$("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
$("#HEmpID").val(checkStatus.data[0].HEmpID);
--
Gitblit v1.9.1