From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败
---
src/main/webapp/static/js/basDevp/basDevp.js | 134 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index c970277..8ddbec1 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -81,6 +81,8 @@
,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
,{field: 'inQty', align: 'center',title: '鍏ュ簱鏆傚瓨'}
,{field: 'area$', align: 'center',title: '缁戝畾搴撳尯'}
+ ,{field: 'inFirstCrnCsv', align: 'center',title: '绗竴浼樺厛姹�'}
+ ,{field: 'inSecondCrnCsv', align: 'center',title: '绗簩浼樺厛姹�'}
// ,{field: 'row1', align: 'center',title: ''}
// ,{field: 'ioTime$', align: 'center',title: ''}
// ,{field: 'area', align: 'center',title: ''}
@@ -464,18 +466,18 @@
devNo: $('#devNo').val(),
decDesc: $('#decDesc').val(),
devMk: $('#devMk').val(),
- inEnable: $('#inEnable').val(),
- outEnable: $('#outEnable').val(),
- autoing: $('#autoing').val(),
- loading: $('#loading').val(),
- canining: $('#canining').val(),
- canouting: $('#canouting').val(),
+ inEnable: checkboxYn('#inEnable'),
+ outEnable: checkboxYn('#outEnable'),
+ autoing: checkboxYn('#autoing'),
+ loading: checkboxYn('#loading'),
+ canining: checkboxYn('#canining'),
+ canouting: checkboxYn('#canouting'),
fronting: $('#fronting').val(),
rearing: $('#rearing').val(),
uping: $('#uping').val(),
downing: $('#downing').val(),
- inreq1: $('#inreq1').val(),
- inreq2: $('#inreq2').val(),
+ inreq1: checkboxYn('#inreq1'),
+ inreq2: checkboxYn('#inreq2'),
wrkNo: $('#wrkNo').val(),
wrkNo1: $('#wrkNo1').val(),
ctnType: $('#ctnType').val(),
@@ -483,7 +485,11 @@
inQty: $('#inQty').val(),
row1: $('#row1').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
- area: $('#area').val(),
+ area: getAreaSubmitValue(),
+ inFirstCrnCsv: $('#inFirstCrnCsv').val(),
+ inSecondCrnCsv: $('#inSecondCrnCsv').val(),
+ inFirstCrnCurrentNo: $('#inFirstCrnCurrentNo').val(),
+ inSecondCrnCurrentNo: $('#inSecondCrnCurrentNo').val(),
inOk: $('#inOk').val(),
outOk: $('#outOk').val(),
modiUser: $('#modiUser').val(),
@@ -527,6 +533,9 @@
} else {
$(el).val('N');
}
+ });
+ form.on('checkbox(areaCheckbox)', function () {
+ $('#area').val(getAreaSubmitValue());
});
// 鎼滅储鏍忔悳绱簨浠�
@@ -596,25 +605,36 @@
function setFormVal(el, data, showImg) {
for (var val in data) {
var find = el.find(":input[id='" + val + "']");
+ var currentVal = data[val];
+ if (val === 'area') {
+ setAreaValues(currentVal);
+ if (find[0] != null) {
+ find.val(normalizeAreaValues(currentVal).join(','));
+ }
+ continue;
+ }
if (find[0]!=null){
if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
+ if (currentVal==='Y'){
+ find.prop('checked', true).attr("checked","checked");
find.val('Y');
} else {
- find.remove("checked");
+ find.prop('checked', false).removeAttr("checked");
find.val('N');
}
continue;
+ } else if (find[0].type === 'select-multiple') {
+ find.val(currentVal || []);
+ continue;
}
}
- find.val(data[val]);
+ find.val(currentVal);
if (showImg){
var next = find.next();
if (next.get(0)){
if (next.get(0).localName === "img") {
find.hide();
- next.attr("src", data[val]);
+ next.attr("src", currentVal);
next.show();
}
}
@@ -622,11 +642,89 @@
}
}
+function normalizeAreaValue(value) {
+ if (value === undefined || value === null) {
+ return value;
+ }
+ var normalized = String(value).replace(/\s+/g, '').toUpperCase();
+ if (normalized === '1' || normalized === 'A' || normalized === 'A鍖�' || normalized === 'A搴�' || normalized === 'A搴撳尯') {
+ return 'A';
+ }
+ if (normalized === '2' || normalized === 'B' || normalized === 'B鍖�' || normalized === 'B搴�' || normalized === 'B搴撳尯') {
+ return 'B';
+ }
+ if (normalized === '3' || normalized === 'C' || normalized === 'C鍖�' || normalized === 'C搴�' || normalized === 'C搴撳尯') {
+ return 'C';
+ }
+ return value;
+}
+
+function normalizeAreaValues(value) {
+ if (value === undefined || value === null || value === '') {
+ return [];
+ }
+ var values = Object.prototype.toString.call(value) === '[object Array]'
+ ? value
+ : String(value).replace(/[锛岋紱銆乚/g, ',').split(/[,;]+/);
+ var result = [];
+ for (var i = 0; i < values.length; i++) {
+ var normalized = normalizeAreaValue(values[i]);
+ if (normalized === undefined || normalized === null || normalized === '') {
+ continue;
+ }
+ if (result.indexOf(normalized) < 0) {
+ result.push(normalized);
+ }
+ }
+ return result;
+}
+
+function setAreaValues(value) {
+ var values = normalizeAreaValues(value);
+ $('#area').val(values.join(','));
+ $('#areaBox input[type="checkbox"][name="areaOption"]').each(function () {
+ var checked = values.indexOf(this.value) >= 0;
+ $(this).prop('checked', checked);
+ if (checked) {
+ $(this).attr('checked', 'checked');
+ } else {
+ $(this).removeAttr('checked');
+ }
+ });
+}
+
+function getAreaValues() {
+ var values = [];
+ $('#areaBox input[type="checkbox"][name="areaOption"]').each(function () {
+ if (this.checked && values.indexOf(this.value) < 0) {
+ values.push(this.value);
+ }
+ });
+ return values;
+}
+
+function getAreaSubmitValue() {
+ var values = getAreaValues();
+ $('#area').val(values.join(','));
+ return values.join(',');
+}
+
function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
+ $(':input', el).each(function () {
+ if (this.type === 'checkbox' || this.type === 'radio') {
+ $(this).prop('checked', false).removeAttr('checked').val('N');
+ return;
+ }
+ if (this.tagName === 'SELECT' && this.multiple) {
+ $(this).val([]).find('option').prop('selected', false);
+ return;
+ }
+ $(this).val('');
+ });
+}
+
+function checkboxYn(selector) {
+ return $(selector).is(':checked') ? 'Y' : 'N';
}
function detailScreen(index) {
--
Gitblit v1.9.1