From b9f7560cbe0e562a40e9515a0559a3e951f0fee6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:16:01 +0800
Subject: [PATCH] 问题修改
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 59 +++++++++++++++++++++--------------------------------------
1 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 3b3f5ec..c9f20f8 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -168,21 +168,25 @@
{ field: 'Id', title: '鍏ュ簱鍗曟槑缁咺D', width: 120, align: 'center', fixed: 'left', hide: true, "disabled": true },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', minWidth: 100, align: 'center', fixed: 'left', "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', minWidth: 180, align: 'center', fixed: 'left', "disabled": true },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', edit: 'text', minWidth: 130, fixed: 'left', "disabled": true },
- { field: 'SupplierLot', title: '渚涜揣鎵规', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
+ { field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', edit: 'text', minWidth: 130, fixed: 'left', "disabled": true },
+ { field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 80, edit: 'number', event: 'dataNumber', fixed: 'left', "disabled": true },
{ field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 70 },
{ field: 'Standard', title: '瑙勬牸', width: 160, align: 'center' },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', edit: 'text', width: 160 },
{ field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
- { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
- { field: 'Money', title: '閲戦', align: 'center', width: 100 },
- { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
- { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', templet: '#table-content-list', "disabled": true }
+ { field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+ { field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+ { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', edit: 'text', width: 140 },
+
+ // { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
+ // { field: 'Money', title: '閲戦', align: 'center', width: 100 },
+ // { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
+ // { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 170, align: 'center', templet: '#table-content-list', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -519,29 +523,6 @@
}
})
- // var IsBaleValue = "";
- // form.on('switch(IsBaleDemo)', function (obj) {
- // layer.tips(this.value + ' ' + this.name + '锛�' + obj.elem.checked, obj.othis);
- // if (obj.elem.checked) {
- // IsBaleValue = "1";
- // } else {
- // IsBaleValue = "0";
- // }
- // });
-
- // table.on('row(LAY-app-content-list)', function (obj) {
- // if (IsBaleValue != "") {
- // for (var j in arr) {
- // if (obj.data.SkuNo == arr[j].SkuNo) {
- // arr[j].IsBale = IsBaleValue;
- // IsBaleValue = ""
- // break;
- // }
- // }
- // }
-
- // })
-
// 鍒犻櫎鍏ュ簱鍗曟槑缁�
table.on('tool(LAY-app-content-list)', function (obj) {
if (obj.event == 'del') {
@@ -595,7 +576,7 @@
if (value == '') {
return '';
} else {
- var ver = /^[0-9]+$/;
+ var ver =/^\\d+\\.\\d{1,4}$/; // /^[0-9]+$/;
if (!ver.test(value)) {
return '鍙兘杈撳叆姝ｆ暣鏁�';
}
@@ -665,7 +646,7 @@
}
else if (TypeNum == 1) {
if (res.data[i].Type == 1) {
- $("#CustomerNamep").html("渚涘簲鍟�");
+ $("#CustomerNamep").html("鐢熶骇鍟�");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
res.data[i].CustomerName + '</option>');
}
@@ -782,7 +763,7 @@
// 鎻愪氦鑾峰彇鍏ュ簱鍗曚俊鎭�
function getAsnOrderInfo() {
var DataList = [];
- var reg = /^([0]|[0-9][0-9]*)$/;
+ var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;///^[+-]?\d+\.\d{0,4}$/i; ///^([0]|[0-9][0-9]*)$/;
console.log(arr);
for (var i in arr) {
console.log(arr[i].LotNo);
@@ -822,7 +803,7 @@
}
if (!reg.test(arr[i].Qty)) {
- layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+ layer.msg("鍏ュ簱鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
@@ -836,12 +817,14 @@
Standard: arr[i].Standard,
LotNo: arr[i].LotNo,
LotText: arr[i].LotText,
- Qty: parseInt(arr[i].Qty),
+ Qty:parseFloat(arr[i].Qty),
PackagNo: arr[i].PackagNo,
Price: arr[i].Price,
IsBale: arr[i].IsBale,
IsBelt: arr[i].IsBelt,
SupplierLot: arr[i].SupplierLot,
+ Lot1: arr[i].Lot1,
+ Lot2: arr[i].Lot2,
UDF1: arr[i].UDF1,
UDF2: arr[i].UDF2,
UDF3: arr[i].UDF3,
--
Gitblit v1.8.0