From 7f55a1f12d5c4e00d95668a31a542ca848850ea2 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 16 十二月 2022 09:13:23 +0800
Subject: [PATCH] 111
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 3 -
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 14 +++---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 8 +++-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 82 ++++++++++++++++++++++++++++++----------
WebSRM/layuiAdmin.std-v1.2.1/src/img/1.jpg | 0
WebSRM/layuiAdmin.std-v1.2.1/src/img/11.jpg | 0
6 files changed, 75 insertions(+), 32 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/img/1.jpg b/WebSRM/layuiAdmin.std-v1.2.1/src/img/1.jpg
index 551ad50..9b39f8d 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/img/1.jpg
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/img/1.jpg
Binary files differ
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/img/11.jpg b/WebSRM/layuiAdmin.std-v1.2.1/src/img/11.jpg
new file mode 100644
index 0000000..551ad50
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/img/11.jpg
Binary files differ
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 08a5162..ec2c82d 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -398,6 +398,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍖呰鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (_sSubStr[i].HQty > _sSubStr[i].HNotBarcodeCount) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈鐢熸垚鏉＄爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
layer.load(3)
$.ajax(
@@ -585,10 +589,10 @@
, { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
, { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
, { field: 'HNotBarcodeCount', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty"}
+ , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
, { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text', event: "inputHMinQty" }
, { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
- , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty"}
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty" }
, { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 5e11577..2218116 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -225,7 +225,7 @@
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 135 }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 135 }
//, { field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
- //, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
@@ -573,12 +573,12 @@
layer.msg("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
}
- for (var i = 0; i < data.length; i++) {
- if (data[i].鍗曟嵁鐘舵�� != "瀹℃牳") {
- layer.msg("閫変腑琛屾湭瀹℃牳", { icon: 5 });
- return;
- }
- }
+ //for (var i = 0; i < data.length; i++) {
+ // if (data[i].鍗曟嵁鐘舵�� != "瀹℃牳") {
+ // layer.msg("閫変腑琛屾湭瀹℃牳", { icon: 5 });
+ // return;
+ // }
+ //}
layer.open({
type: 2
, area: ['50%', '50%']
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index eb230d5..c77ed01 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -217,6 +217,8 @@
laydate.render({
elem: '#HDate2'
});
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HParentID"];
var option = [];
var HModName = "SRM_POOrderBillList";
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -228,9 +230,9 @@
$("#HPURCHASEORGID").append(Organization);
form.render('select');
//鍒濆鍖栬〃鏍�
- set_InitGrid();
+ //set_InitGrid();
//鏄剧ず鍒楁暟鎹�
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(table, option)
}
@@ -248,12 +250,9 @@
//, { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100/*, fixed: true */}
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true/*, fixed: 'left' */ }
, { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
- , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
- , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
- , { field: 'FStockInQty', title: '绱鍏ュ簱鏁伴噺', width: 120 }
+ , { field: '鑷畾涔夋爣璇�', title: '鑷畾涔夋爣璇�', width: 120 }
+ , { field: '閫佽揣鍦扮偣', title: '閫佽揣鍦扮偣', width: 120 }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 120 }
- , { field: 'FMRBQTY', title: '绱閫�鏂欐暟閲�', width: 120 }
- , { field: 'FMRBQTY', title: '鍞竴鏍囪瘑', width: 120 }
, { field: '鍞竴ID', title: '鍞竴ID', width: 120 }
//, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
@@ -261,8 +260,8 @@
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', sort: true }
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', sort: true }
- , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', sort: true }
- , { field: '鏈叧鑱旀暟閲�', title: '鏈彂璐ф暟閲�', sort: true }
+ , { field: '宸插彂璐ф暟閲�', title: '宸插彂璐ф暟閲�', sort: true }
+ , { field: '鏈彂璐ф暟閲�', title: '鏈彂璐ф暟閲�', sort: true }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
, { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 180, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true/*, fixed: 'left' */ }
@@ -289,7 +288,7 @@
, totalRow: true
, limit: 500
, height: 'full-50'
- , cols: [columns]
+ //, cols: [columns]
, limits: [500, 5000, 20000]
, done: function (res, curr, count) {
@@ -331,7 +330,6 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < dataCol.length; i++) {
var dataCols = dataCol[i].split('|');
@@ -339,6 +337,11 @@
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //闅愯棌id
//璁剧疆鍒楀
if (dataCols[3] > 0) {
option.cols[0][i + 1]["width"] = dataCols[3];
@@ -355,10 +358,7 @@
//} else {
// option.cols[0][i + 1]["width"] = "";
//}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
+
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -372,7 +372,6 @@
break;
}
}
-
//鍙栨秷鍐荤粨鍒�
for (var i = 1; i < option.cols[0].length - 1; i++) {
if (option.cols[0][i]["fixed"] != null) {
@@ -408,14 +407,55 @@
url: GetWEBURL() + "GetPOOrderBill",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
- success: function (result) {
- if (result.Message == "鑾峰彇鎴愬姛") {
- option.data = result.data;
- table.render(option);
+ success: function (data1) {
+ if (data1.Message == "鑾峰彇鎴愬姛") {
+ 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 if (data[i].name.indexOf('id') > -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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
layer.close(wait);
} else {
layer.close(wait);
- layer.alert(result.Message, { icon: 5 });
+ layer.alert(data1.Message, { icon: 5 });
}
},
error: function (result) {
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index f58e068..bd4085d 100644
--- "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -252,7 +252,7 @@
} else {
//榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
- cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 100 })
}
option.data = cols;
table.render(option);
@@ -292,7 +292,6 @@
//淇濆瓨HMaker
function set_AddNew(data) {
-
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
--
Gitblit v1.9.1