From 3d38632730ae4d3e787050def49d4bc5094e95ef Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:06:52 +0800
Subject: [PATCH] 打印模板点击行选择；条码编辑模块添加列合计，保存时特殊字符转换；添康合并生成条码；送货单列表跳转查看条码明细；送货单添加审核、反审核功能；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
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 d64c4fd..fbb4c4c 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
@@ -298,9 +298,10 @@
, toolbar: '#toolbarDemo'
, limit: 500
, height: 500
+ , totalRow: true
, loading: false
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
, { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
@@ -314,12 +315,12 @@
, { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
, { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true }
, { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { 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: 'HWBQty', title: '澶栫鏁�', width: 100 }
+ , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135, totalRow: true}
+ , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty", totalRow: true}
+ , { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text', event: "inputHMinQty", totalRow: true}
+ , { field: 'HBQty', title: '鍐呯鏁�', width: 100, totalRow: true}
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty", totalRow: true}
+ , { field: 'HWBQty', title: '澶栫鏁�', width: 100, totalRow: true}
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
@@ -506,6 +507,16 @@
var newArray = [];
var index = -1;
//debugger;
+
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
@@ -693,7 +704,7 @@
sessionStorage["linterid"] = rows.toString();
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -1010,6 +1021,7 @@
}
else
{
+ //鍚堝苟鏁伴噺鐢熸垚鏉＄爜
layer.load(3)
$.ajax({
type: "GET",
@@ -1028,8 +1040,8 @@
, "HMaterShortNumber": "", "HSubjoin": "", "HMaterName": data[i].HMaterName
, "HMaterModel": data[i].HMaterModel, "HUnitName": data[i].HUnitName, "HUnitNumber": data[i].HUnitNumber
, "HUnitID": data[i].HUnitID, "HDDQty": data[i].HDDQty, "HMrbQty": 0, "HBarcodeCount": data[i].HBarcodeCount
- , "HNotBarcodeCount": data[i].HNotBarcodeCount, "HQty": data[i].HQty, "HMinQty": data[i].HMinQty, "HBQty": data[i].HBQty
- , "HWXQty": data[i].HWXQty, "HWBQty": data[i].HWBQty, "HPrice": data[i].HPrice, "HMoney": data[i].HMoney, "HMTONO": ""
+ , "HNotBarcodeCount": data[i].HNotBarcodeCount, "HQty": data[i].HQty, "HMinQty": data[i].HQty, "HBQty": data[i].HBQty
+ , "HWXQty": data[i].HQty, "HWBQty": data[i].HWBQty, "HPrice": data[i].HPrice, "HMoney": data[i].HMoney, "HMTONO": ""
, "HBatchNo": data[i].HBatchNo, "HBatchManager": data[i].HBatchManager, "HISKFPERIOD": data[i].HISKFPERIOD
, "HEXPUNIT": data[i].HEXPUNIT, "HKFDate": data[i].HKFDate, "HKFPeriod": data[i].HKFPeriod, "HKFDQDate": data[i].HKFDQDate
, "HSupMaterNumber": data[i].HSupMaterNumber, "HSupBatchNo": data[i].HSupBatchNo, "HPOOrderInterID": data[i].HPOOrderInterID
@@ -1341,24 +1353,42 @@
});
}
else if (obj.event == 'inputHQty') {
+ //$(obj.tr).find(".layui-table-edit").keyup(function () {
+ // var $input = $(this), val = $input.val();
+ // if (!val) val = "0";
+ // $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ //});
+
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
}
else if (obj.event == 'inputHMinQty') {
+ //$(obj.tr).find(".layui-table-edit").keyup(function () {
+ // var $input = $(this), val = $input.val();
+ // if (!val) val = "0";
+ // $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ //});
+
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
}
else if (obj.event == 'inputHWXQty') {
+ //$(obj.tr).find(".layui-table-edit").keyup(function () {
+ // var $input = $(this), val = $input.val();
+ // if (!val) val = "0";
+ // $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ //});
+
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
}
});
--
Gitblit v1.9.1