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_Kf_POStockInBillList.html | 157 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 113 insertions(+), 44 deletions(-)
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 bd92cde..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"
@@ -66,7 +66,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<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" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
@@ -74,7 +74,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>
@@ -89,28 +89,18 @@
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-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;">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline" style="width:750px">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-col-xs4 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="float:left;width:150px;">
- <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>
- </button>
- </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;">
@@ -119,11 +109,10 @@
</button>
</div>
</div>
-
</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;">
@@ -133,7 +122,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;">
@@ -143,17 +132,16 @@
</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;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <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;">
+ <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>
</button>
</div>
</div>
</div>
-
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
@@ -178,7 +166,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;">
@@ -192,9 +180,13 @@
</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 class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
+ <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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -228,6 +220,12 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
+ <label class="layui-form-label">鍙戠エ缂栧彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
</div>
</div>
</div>
@@ -1014,9 +1012,9 @@
}
//#endregion
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
@@ -1051,7 +1049,7 @@
if ($("#HSourceBillType").val() == "1102") {
- //鑾峰彇
+ //鑾峰彇 閿�鍞鍗�
var data = getUrlVars_JSON().data;
var dataArray = [];
for (var i = 0; i < data.length; i++) {
@@ -1071,8 +1069,8 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].HManagerID
- , "HMangerName": dataArray[0].璐熻矗浜�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
, "HWHID": dataArray[0].HWHID
, "HWHName": dataArray[0].浠撳簱
, "HEmpID": dataArray[0].HEmpID
@@ -1090,6 +1088,11 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
+ , "HInnerBillNo": dataArray[0].鍐呴儴鍗曟嵁鍙�
});
//瀛愯〃 璧嬪��
@@ -1146,7 +1149,7 @@
table.render(option);
}
else if ($("#HSourceBillType").val() == "1103") {
- //鑾峰彇
+ //鑾峰彇 鏀舵枡閫氱煡鍗�
var data = getUrlVars_JSON().data;
var dataArray = [];
for (var i = 0; i < data.length; i++) {
@@ -1166,8 +1169,8 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HManagerID": dataArray[0].hmanagerid
- , "HMangerName": dataArray[0].涓荤
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
@@ -1177,8 +1180,11 @@
, "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
- , "HPSStyleID": dataArray[0].HPSStyleID
- , "HPSStyleSName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
+ , "HInnerBillNo": dataArray[0].鍐呴儴鍗曟嵁鍙�
});
//瀛愯〃 璧嬪��
@@ -1793,7 +1799,7 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1808,7 +1814,26 @@
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
$("#HProjectID").val(checkStatus.data[0].HProjectID);
- if (getSupType().name == "閲囪喘璁㈠崟") {
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").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);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ if ($("#HSourceBillType").val() == "1102") {
var j = 0;
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1825,7 +1850,7 @@
}
table.render(option);
layer.close(index);
- } else if (getSupType().name == "鏀舵枡閫氱煡鍗�") {
+ } else if ($("#HSourceBillType").val() == "1103") {
var j = 0;
for (var i = 0; i < ProcessNumber.length; i++) {
@@ -1946,7 +1971,7 @@
//#endregion
- //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曟暟鎹�
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曟暟鎹�
function getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
var res = "none";
$.ajax({
@@ -1974,7 +1999,7 @@
//#endregion
- //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
function getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID) {
var res = "none";
$.ajax({
@@ -2000,6 +2025,50 @@
return res;
}
//#endregion
+
+ //#region 淇濆瓨鏂规硶鏍￠獙
+ function AllowLoadData(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 ($("#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 ($("#HSecManagerID").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;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HPSStyleID").val() == 0) {
+ layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSSID").val() == 0) {
+ layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ return true;
+ }
+
+ //endregion
+
//#endregion
--
Gitblit v1.9.1