From 1e2c97a4fbcaa58aa78ea162b8ee1ecad7089d38 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 18 三月 2025 15:27:25 +0800
Subject: [PATCH] 应付单收料通知单其它入库其它出库采购入库修改
---
WebTM/views/项目管理/基础建模/Gy_TaskClass.html | 2
WebTM/views/验收入库/其他入库/Add_Edit_Kf_OtherInBill.html | 32 +++++++++++++++
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 6 +-
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 9 ++--
WebTM/views/领料发货/其他出库/Add_Edit_Kf_OtherOutBill.html | 32 +++++++++++++++
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 4 +-
6 files changed, 73 insertions(+), 12 deletions(-)
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 9255801..86d5f62 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"
@@ -1774,9 +1774,9 @@
if (option.cols[0][i]["field"] == "HQty") {
option.cols[0][i]["edit"] = false;
}
- if (option.cols[0][i]["field"] == "HMoney") {
- option.cols[0][i]["edit"] = false;
- }
+ //if (option.cols[0][i]["field"] == "HMoney") {
+ // option.cols[0][i]["edit"] = false;
+ //}
}
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 6b13129..8dfc171 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1098,9 +1098,10 @@
//#region 鎵撳嵃
function get_PrintReport() {
- if (linterid == null || linterid == "") {
- linterid = $("#HInterID").val();
- }
+ //if (linterid == null || linterid == "") {
+ // linterid = $("#HInterID").val();
+ //}
+ var HInterID = $("#HInterID").val();
layer.open({
type: 2
, area: ['50%', '50%']
@@ -1108,7 +1109,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
, resize: false
})
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
index c9e40d7..dbdfd82 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
@@ -675,7 +675,7 @@
if (openType == "HTask") {
sWhere += " and LEN(浠诲姟绫诲埆浠ｇ爜) = 1 "
} else if (typeof (number) != "undefined") {
- sWhere += " and 浠诲姟绫诲埆浠ｇ爜 LIKE '" + number + "%'";
+ sWhere += " and 浠诲姟绫诲埆浠ｇ爜 LIKE '" + number + "%'" + "and 浠诲姟绫诲埆浠ｇ爜 <> '" + number + "'";
}
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
index 728c0b0..22611bb 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
@@ -50,6 +50,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -496,6 +497,11 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(1);
+ });
+ //#endregion
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
@@ -762,7 +768,7 @@
, { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
- , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
+ , { field: '鏀舵枡浠撳簱', title: '鍙戞枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
, { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
@@ -861,6 +867,30 @@
}
});
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var HInterID = $("#HInterID").val();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_OtherOutBill/CheckKf_OtherOutBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "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);
+ });
+ $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#region 淇濆瓨鏂规硶
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
index 9150c7f..541f019 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
@@ -50,6 +50,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -503,6 +504,12 @@
set_SaveBill(data);
});
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(1);
+ });
+ //#endregion
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
@@ -863,7 +870,30 @@
}
});
-
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var HInterID = $("#HInterID").val();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_OtherInBill/CheckKf_OtherInBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "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);
+ });
+ $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
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 5f0b40b..24d1044 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"
@@ -1125,8 +1125,8 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;'}
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, edit: 'text', totalRow: true}
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, event: "HUnitID" }//f7
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
, { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 150, edit: 'text', totalRow: true}
, { field: 'HPrice', title: '鍗曚环', width: 100 }
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true }
--
Gitblit v1.9.1