From 516b7093c79f622f8514ff35d7df4bd57b947051 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 九月 2024 18:58:04 +0800
Subject: [PATCH] 物料后端分页，采购销售选择源单控制
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 9 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 28 ++++
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 12 +
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 12 +
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 13 +
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 12 +
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 12 ++
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 9 +
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 5
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 11 +
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 175 +++++++++++++++++++----------
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 10 +
12 files changed, 235 insertions(+), 73 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 969dc0f..67bd40f 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"
@@ -175,6 +175,7 @@
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
+ <div id="page"></div>
</div>
</div>
</div>
@@ -206,11 +207,12 @@
var Organization = sessionStorage["Organization"];
var HModName = "Gy_Material";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];
+ var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag","閫夋嫨"];
var ins; //鐢ㄤ簬瀵煎嚭excel
var HMaterTypeID = 0; //鐗╂枡鍒嗙被鑺傜偣id
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//鑾峰彇鍙傛暟
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
@@ -328,12 +330,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if ($("#HProject").val() == "0") {
get_FastQuery();
- }
- else {
- get_FastQuery(2);
- }
});
//#endregion
@@ -445,28 +442,9 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 500
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- //, cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- // , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- // , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- // , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- // , { field: 'HUnitID', title: 'HUnitID', hide: true }
- // , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- // , { field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅鍚嶇О' }
- // , { field: 'HMinPickQty', title: 'HMinPickQty', hide: true }
- // , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- // , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
- // , { field: 'HEndFlag', title: 'HEndFlag', hide: true }
- // , { field: 'HStopFlag', title: 'HStopFlag', hide: true }
- // , { field: 'HParentID', title: 'HParentID', hide: true }
- // , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
- //]]
+ , height: 'full-80'
+ , page: false
+ , limit: 50
, done: function (res, curr, count) {
var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
@@ -484,6 +462,29 @@
}
}
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ console.log(obj)
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//#endregion
@@ -512,7 +513,7 @@
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count != 0) {
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -538,18 +539,9 @@
}
}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
+
+ option.cols = [col];
+ option.data = data1.data;
ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -572,7 +564,69 @@
}
//#endregion
+ //#region 鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Material/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.count != 0) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#region 蹇�熻繃婊�
@@ -590,40 +644,39 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
}
if (HNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + HNumber + "%''";
}
if (HName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ sWhere += " and 鐗╂枡鍚嶇О like ''%" + HName + "%''";
}
if (HModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + HModel + "%''";
}
if (HOrgName) {
- sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
+ sWhere += " and 缁勭粐鍚嶇О like ''%" + HOrgName + "%''";
}
- if (number==2) {
- if (HProject) {
- sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
- }
+ if (HProject) {
+ sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
}
+
if (GetDataCols != "") {
sWhere += GetDataCols;
}
@@ -631,7 +684,7 @@
sWhere += sql;
}
addSWhereByOpenType();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
GetDataCols = "";
}
@@ -1015,10 +1068,10 @@
sql = "";
HMaterTypeID = 0;
} else {
- sql = " and HMaterTypeID='" + data.id + "' ";
+ sql = " and HMaterTypeID=''" + data.id + "'' ";
HMaterTypeID = data.id;
}
- get_Display(sql);
+ get_FastQuery()
}
});
}
@@ -1334,7 +1387,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (openType == 2) {
- sWhere += " and 绂佺敤鏍囪 = '' ";
+ sWhere += " and 绂佺敤鏍囪 = '''' ";
Organ(HOrgID);
}
}
@@ -1369,7 +1422,7 @@
$("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
}
}
- get_FastQuery(2);
+ get_FastQuery();
form.render("select");
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
@@ -1377,7 +1430,7 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
//鏌ヨ
- get_FastQuery(2);
+ get_FastQuery();
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index 693361d..196c051 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -980,6 +980,18 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
+
+ }
+ var HSupID = checkStatus.data[0]["HSupID"];;//鍒ゆ柇渚涘簲鍟�
+ //if (HSupID == 0 || HSupID == '') {
+ // HSupID = checkStatus.data[0]["HSupID"];
+ //}
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
}
setPayableBill(checkStatus);
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 6fe6045..16ecad9 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"
@@ -1239,7 +1239,17 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ }
if ($("#BillType").val() == "1102") {
setInitByPOOrderBill(checkStatus);
}
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 3851e84..3c8652d 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"
@@ -2164,10 +2164,19 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
//layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
ProcessNumber.push(checkStatus.data[i]);
}
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/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/Cg_POInStockBillList.html"
index ee92f1c..00bb0c1 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/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/Cg_POInStockBillList.html"
@@ -780,6 +780,7 @@
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
var HEmpName = data[0].涓氬姟鍛�;
+ var HSupName = data[0].渚涘簲鍟�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -810,6 +811,10 @@
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
return;
}
+ if (data[i].渚涘簲鍟� != HSupName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ return;
+ }
}
var datajson = {
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_POOrderBillList.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_POOrderBillList.html"
index 5a1214b..5d22abc 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_POOrderBillList.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_POOrderBillList.html"
@@ -1054,6 +1054,7 @@
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
var HEmpName = data[0].涓氬姟鍛�;
+ var HSupName = data[0].渚涘簲鍟�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -1080,6 +1081,10 @@
}
if (data[i].涓氬姟鍛� != HEmpName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+ return;
+ }
+ if (data[i].渚涘簲鍟� != HSupName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
return;
}
}
@@ -1117,6 +1122,7 @@
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
var HEmpName = data[0].涓氬姟鍛�;
+ var HSupName = data[0].渚涘簲鍟�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -1143,6 +1149,10 @@
}
if (data[i].涓氬姟鍛� != HEmpName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+ return;
+ }
+ if (data[i].渚涘簲鍟� != HSupName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
return;
}
}
@@ -1179,6 +1189,7 @@
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
var HEmpName = data[0].涓氬姟鍛�;
+ var HSupName = data[0].渚涘簲鍟�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -1203,10 +1214,14 @@
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
return;
}
- //if (data[i].涓氬姟鍛� != HEmpName) {
- // layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
- // return;
- //}
+ if (data[i].涓氬姟鍛� != HEmpName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+ return;
+ }
+ if (data[i].渚涘簲鍟� != HSupName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ return;
+ }
}
var datajson = {
@@ -1242,6 +1257,7 @@
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
var HEmpName = data[0].涓氬姟鍛�;
+ var HSupName = data[0].渚涘簲鍟�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -1270,6 +1286,10 @@
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
return;
}
+ if (data[i].渚涘簲鍟� != HSupName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ return;
+ }
}
var datajson = {
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 bf7d053..421daad 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"
@@ -805,9 +805,18 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
//鑾峰彇閿�鍞鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);
+ return;
+ }
ProcessNumber.push(checkStatus.data[i]);
}
for (var i = 0; i < ProcessNumber.length; i++) {
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 91a3cfc..2e3b4c8 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"
@@ -1590,7 +1590,17 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);
+ return;
+ }
+ }
if ($("#BillType").val() == "1401") {
setInitBySeOrderBill(checkStatus);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index e9c1f25..defdbba 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -1161,6 +1161,17 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);
+ return;
+ }
+ }
setReceivableBill(checkStatus);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
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 6b3375a..f8ce23d 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"
@@ -1874,7 +1874,17 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);
+ return;
+ }
+ }
if ($("#BillType").val() == "1401") {
setInitBySeOrderBill(checkStatus);
} else if ($("#BillType").val() == "1402") {
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 1c5bec6..7d3373e 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"
@@ -2256,10 +2256,18 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
-
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
ProcessNumber.push(checkStatus.data[i]);
}
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/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/Kf_POStockInBillList.html"
index a8c6e55..328117f 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/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/Kf_POStockInBillList.html"
@@ -937,6 +937,7 @@
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
var HEmpName = data[0].涓氬姟鍛�;
+ var HSupName = data[0].渚涘簲鍟�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -961,10 +962,14 @@
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
return;
}
- //if (data[i].涓氬姟鍛� != HEmpName) {
- // layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
- // return;
- //}
+ if (data[i].涓氬姟鍛� != HEmpName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+ return;
+ }
+ if (data[i].渚涘簲鍟� != HSupName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ return;
+ }
}
var datajson = {
--
Gitblit v1.9.1