From ddc81e566922a0a4796462a73d7cdd2f5a650350 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 22 九月 2024 16:56:41 +0800
Subject: [PATCH] 采购销售模块bug修复
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 82 +++++++------
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 4
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 8
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 139 ++++++++++++++++++----
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 10
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 70 ++++++-----
7 files changed, 205 insertions(+), 110 deletions(-)
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_Material.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_Material.html"
index ab0e607..a7d8ff9 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_Material.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_Material.html"
@@ -172,11 +172,11 @@
</div>
</div>
</div>
- <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+ <div >
+ <table class="" id="mainTable" lay-filter="mainTable" ></table>
</div>
- <div id="page"></div>
+ <div id="page" style="position:relative;bottom:0;"></div>
</div>
</div>
</div>
@@ -457,7 +457,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-80'
+ , height: 'full-150'
, page: false
, limit: 50
, done: function (res, curr, count) {
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 c376574..14bc4e7 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"
@@ -102,14 +102,14 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width:625px">
+ <div class="layui-inline" >
<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="background-color: #efefef4d; width: 505px" readonly>
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 150px" readonly>
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 150px;">
<!--<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>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -132,25 +132,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
-
- <div class="layui-inline">
- <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="background-color: #efefef4d; float: left; width: 150px;" readonly>
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">閲囪喘鏂瑰紡</label>
<div class="layui-input-inline">
@@ -161,8 +142,8 @@
</button>
</div>
</div>
-
</div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
@@ -185,6 +166,13 @@
<div class="layui-input-inline">
<input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+
</div>
</div>
</div>
@@ -239,6 +227,24 @@
<label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block">
<input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="background-color: #efefef4d; float: left; width: 150px;" readonly>
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" 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-inline">
+ <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" style="background-color: #efefef4d;" readonly>
</div>
</div>
</div>
@@ -649,6 +655,7 @@
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
, "HProjectID": dataArray[0].HProjectID
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃Entry 璧嬪��
@@ -749,6 +756,7 @@
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
, "HProjectID": dataArray[0].HProjectID
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
, "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
});
//瀛愯〃Entry 璧嬪��
@@ -1800,6 +1808,7 @@
, "HProjectID": data.HProjectID == null ? 0 : data.HProjectID
, "HProjectName": data.椤圭洰鍚嶇О
+ , "HProjectNumber": data.椤圭洰浠ｇ爜
, "HInvoiceBillNo": data.鍙戠エ缂栧彿
, "HMaker": data.鍒跺崟浜�
@@ -1939,6 +1948,7 @@
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
, "HProjectID": dataArray[0].HProjectID
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
@@ -2020,6 +2030,7 @@
, "HPSStyleSName": dataArray[0].閲囪喘鏂瑰紡
, "HProjectID": dataArray[0].HProjectID
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
, "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
});
@@ -2883,6 +2894,7 @@
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
, "HProjectID": dataArray[0].HProjectID
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃Entry 璧嬪��
@@ -2985,6 +2997,12 @@
return;
}
}
+ if (dataArray[0].婧愬崟绫诲瀷 == "1102") {
+ getPushSource_POOrderBillCur(dataArray[0].婧愬崟涓诲唴鐮�, dataArray[0].婧愬崟瀛愬唴鐮�);
+ } else {
+ getPushSource_POInStockBillCur(dataArray[0].婧愬崟涓诲唴鐮�, dataArray[0].婧愬崟瀛愬唴鐮�);
+ }
+
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMainSourceInterID": "0"
@@ -3000,15 +3018,16 @@
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
+ //, "HCurID": dataArray[0].HCurID
+ //, "HCurName": dataArray[0].甯佸埆
+ //, "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
, "HProjectID": dataArray[0].HProjectID
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
, "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
});
@@ -3197,7 +3216,69 @@
}
//#endregion
-
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曞竵鍒眹鐜�
+ function getPushSource_POOrderBillCur(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Cg_POOrderBill/loadCg_POOrderBill_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HCurID": res.HCurID
+ , "HCurName": res.甯佸埆
+ , "HExRate": res.姹囩巼
+ });
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曞竵鍒眹鐜�
+ function getPushSource_POInStockBillCur(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Cg_POInStockBill/loadCg_POInStockBill_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HCurID": res.HCurID
+ , "HCurName": res.甯佸埆
+ , "HExRate": res.姹囩巼
+ });
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index df2cfdc..0d2f742 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -2179,6 +2179,8 @@
$("#HProjectName").val(data[0].椤圭洰鍚嶇О);
$("#HProjectNumber").val(data[0].椤圭洰浠ｇ爜);
$("#HProjectID").val(data[0].HInterID);
+ $("#HLinkMan").val(data[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(data[0].鑱旂郴浜虹數璇�);
}
//鍙屽嚮杩斿洖浠撳簱
function GetHWHValue(data) {
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 15d3de8..33528ee 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"
@@ -1086,7 +1086,7 @@
}
var rowData = option.data[i]; //option.data[i]鍏冪礌鏄竴涓湁鏁堢殑瀵硅薄灏嗗叾璧嬪�肩粰rowData鍙橀噺
for (var col of Object.keys(rowData)) { //閬嶅巻rowData瀵硅薄鐨勬墍鏈夐敭 Object.keys(rowData)杩斿洖涓�涓寘鍚玶owData鎵�鏈夎嚜韬睘鎬ч敭鐨勬暟缁�
- if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID" || col == "HPrice" || col=="HMoney")) { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
+ if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID")) { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�"); //鎻愮ず绗嚑琛屼笉鑳戒负0 濡傛灉鎵惧埌鍊间负"0"鐨勫睘鎬э紝骞朵笖璇ュ睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"锛屽垯閫氳繃layer.msg鏄剧ず涓�涓鍛婃秷鎭紝鎸囧嚭鍝釜琛屽拰鍝釜鍒楃殑鍊间笉鑳戒负0
return;
}
@@ -1194,39 +1194,7 @@
});
}
}
- //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
- function getCustomerByCusID(HCusID) {
- $.ajax({
- url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
- async: false,
- type: "GET",
- data: {
- "HCusID": HCusID
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
-
- $("#HCurID").val(data.HCurID);
- $("#HCurName").val(data.HCurName);
- $("#HExRate").val(data.HExRate);
- $("#HSSID").val(data.HSSID);
- $("#HSSName").val(data.HSSName);
- //璁剧疆榛樿璐у竵淇℃伅
- if (data.HCurID == 0) {
- $("#HCurID").val(1);
- $("#HCurName").val("浜烘皯甯�");
- $("#HExRate").val(1);
- }
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
- //#endregion
+
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1288,6 +1256,7 @@
, "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
, "HUnitID": OptionData.HUnitID
, "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HQty": 1
})
OptionData = [];
}
@@ -1433,6 +1402,7 @@
, "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
, "HUnitID": OptionData.HUnitID
, "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HQty": 1
})
OptionData = [];
}
@@ -1834,8 +1804,11 @@
$("#HProjectID").val(checkStatus.data[0].HInterID);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HCusID").val(checkStatus.data[0].HCusID == null ? 0 : checkStatus.data[0].HCusID)
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛)
$("#HLinkMan").val(checkStatus.data[0].鑱旂郴浜�);
- $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴鐢佃瘽);
+ $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴浜虹數璇�);
+ getCustomerByCusID($("#HCusID").val());
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
@@ -1906,6 +1879,39 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HSSID").val(data.HSSID);
+ $("#HSSName").val(data.HSSName);
+ //璁剧疆榛樿璐у竵淇℃伅
+ if (data.HCurID == 0) {
+ $("#HCurID").val(1);
+ $("#HCurName").val("浜烘皯甯�");
+ $("#HExRate").val(1);
+ }
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!" + 鏈煡璇㈠埌瀹㈡埛淇℃伅, { icon: 5 });
+ }
+ });
+ }
+ //#endregion
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
@@ -1937,7 +1943,11 @@
$("#HProjectID").val(obj[0].HInterID);
$("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
$("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
-
+ $("#HCusID").val(obj[0].HCusID == null ? 0 : obj[0].HCusID)
+ $("#HCusName").val(obj[0].瀹㈡埛)
+ $("#HLinkMan").val(obj[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(obj[0].鑱旂郴浜虹數璇�);
+ getCustomerByCusID($("#HCusID").val());
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
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 927fd4b..96a1a0c 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"
@@ -536,9 +536,9 @@
}
//#endregion
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
//#endregion
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 19e5aa5..42dfea8 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"
@@ -578,10 +578,10 @@
//#endregion
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
- //var HModuleType = "1205";
- ////閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- //var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
- //$("h1").html('<b>' + HPageTitle + '</b>');
+ var HModuleType = "1205";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
//#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
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 45514fb..4885901 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"
@@ -81,19 +81,18 @@
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
+ <div class="layui-col-xs4 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;">
+ <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;">
<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>
+ <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -104,8 +103,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
@@ -126,6 +123,9 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-inline">
@@ -136,8 +136,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -156,30 +154,19 @@
</button>
</div>
<!--<label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+ </div>-->
</div>
+ </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="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;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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 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;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -200,6 +187,20 @@
<input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
</div>
</div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <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;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
</div>
<!--<div class="layui-row">
@@ -2378,14 +2379,15 @@
//琛屽唴鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
+ var rowIndex = $(obj.tr).attr("data-index");//鑾峰彇琛岀储寮�
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
+ obj.del();//鍋囧垹闄�
+ table.cache["mainTable"].splice(rowIndex, 1); //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
layer.close(index);
@@ -2469,9 +2471,9 @@
res = result.data;
//layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- }, error: function () {
+ }, error: function (err) {
res = "none";
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ layer.alert("鍙戠敓閿欒!"+err, { icon: 5 });
}
});
return res;
@@ -2520,9 +2522,9 @@
res = result.data;
//layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- }, error: function () {
+ }, error: function (err) {
res = "none";
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ layer.alert("鍙戠敓閿欒!" + err, { icon: 5 });
}
});
return res;
--
Gitblit v1.9.1