From ce37e4c4e4b74b138bbc12417b7f220f73c6083f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 20:23:00 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据
---
src/main/webapp/static/js/basDevp/basDevp.js | 291 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 215 insertions(+), 76 deletions(-)
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index 956b112..d1535e1 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -75,18 +75,21 @@
html += ">";
return html;
}}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', edit: true, style:'color: blue;font-weight: bold'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', edit:true, style:'color: blue;font-weight: bold'}
// ,{field: 'wrkNo1', align: 'center',title: ''}
- ,{field: 'ctnType', align: 'center',title: '瀹瑰櫒绫诲瀷'}
+ ,{field: 'locType1$', align: 'center',title: '楂樹綆'}
,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
- // ,{field: 'inQty', 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: ''}
// ,{field: 'inOk', align: 'center',title: ''}
// ,{field: 'outOk', align: 'center',title: ''}
- // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'text-decoration: underline;cursor:pointer'}
- // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'stdQty', align: 'center',title: ''}
@@ -136,7 +139,6 @@
tableReload();
return;
}
- console.log(obj);
$.ajax({
url: baseUrl+"/basDevp/update/auth",
headers: {'token': localStorage.getItem('token')},
@@ -147,7 +149,7 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
- tableReload();
+ $(".layui-laypage-btn")[0].click();
layer.msg(res.msg);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
@@ -196,9 +198,31 @@
success: function(layero, index){
layer.getChildFrame('#autoing,#loading,#canining,#canouting,#inreq1,#inreq2,#wrkNo,#barcode,#ctnType,#grossWt', index).parent().parent().hide();
layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
+ clearFormVal(layer.getChildFrame('#detail', index));
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
}
+ });
+ break;
+ case 'init':
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺垵濮嬪寲绔欑偣', formType: 1, shadeClose: true}, function(pass, idx){
+ http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
+ if (res.data) {
+ layer.open({
+ type: 1,
+ title: '鍒濆鍖栫珯鐐�',
+ area: ["400px"],
+ maxmin: true,
+ shadeClose: true,
+ content: $("#resetLocDiv"),
+ success: function (layero, index) {
+
+ }
+ })
+ } else {
+ layer.msg("鍙ｄ护閿欒");
+ }
+ layer.close(idx);
+ })
});
break;
case 'refreshData':
@@ -276,6 +300,28 @@
}
});
+ // 鍒濆鍖栦繚瀛�
+ form.on('submit(initDo)', function (data) {
+ $.ajax({
+ url: baseUrl+"/basDevp/init/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(basDevp)', function(obj){
var data = obj.data;
@@ -325,36 +371,36 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '淇敼璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#password,#createTime\\$,#status', index).parent().parent().hide();
- layer.getChildFrame('#data-detail-submit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- parent.location.href = "/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '淇敼璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#password,#createTime\\$,#status', index).parent().parent().hide();
+ layer.getChildFrame('#data-detail-submit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
}
break;
case 'appeUser':
@@ -362,35 +408,35 @@
if (param === undefined) {
layer.msg("鏃犳暟鎹�");
} else {
- layer.open({
- type: 2,
- title: '鍒涜鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: baseUrl+"/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- parent.location.href = "/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
+ layer.open({
+ type: 2,
+ title: '鍒涜鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
}
break;
@@ -439,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(),
@@ -451,7 +501,7 @@
maxWt: $('#maxWt').val(),
grossWt: $('#grossWt').val(),
cartPos: $('#cartPos').val(),
-
+ locType1:$('#locType1').val()
};
$.ajax({
url: baseUrl+"/basDevp/"+name+"/auth",
@@ -483,6 +533,9 @@
} else {
$(el).val('N');
}
+ });
+ form.on('checkbox(areaCheckbox)', function () {
+ $('#area').val(getAreaSubmitValue());
});
// 鎼滅储鏍忔悳绱簨浠�
@@ -552,9 +605,17 @@
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'){
+ if (currentVal==='Y'){
find.attr("checked","checked");
find.val('Y');
} else {
@@ -562,15 +623,18 @@
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();
}
}
@@ -578,11 +642,85 @@
}
}
+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');
+ return;
+ }
+ if (this.tagName === 'SELECT' && this.multiple) {
+ $(this).val([]).find('option').prop('selected', false);
+ return;
+ }
+ $(this).val('');
+ });
}
function detailScreen(index) {
@@ -602,3 +740,4 @@
$("#search").click();
}
});
+
--
Gitblit v1.9.1