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/basCrnp/basCrnp.js | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/static/js/basCrnp/basCrnp.js b/src/main/webapp/static/js/basCrnp/basCrnp.js
index a13b8d8..4b7ab89 100644
--- a/src/main/webapp/static/js/basCrnp/basCrnp.js
+++ b/src/main/webapp/static/js/basCrnp/basCrnp.js
@@ -10,10 +10,10 @@
tableIns = table.render({
elem: '#basCrnp',
headers: {token: localStorage.getItem('token')},
- url: '/basCrnp/list/auth',
+ url: baseUrl+'/basCrnp/list/auth',
page: true,
limit: 16,
- skin: 'line',
+ limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
@@ -34,15 +34,17 @@
},width:80}
,{field: 'crnSts$', align: 'center',title: '鐘舵��'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'bay', align: 'center',title: '鍒�', sort: true, width: 70}
+ ,{field: 'level', align: 'center',title: '灞�', sort: true, width: 70}
,{field: 'crnErr$', align: 'center',title: '寮傚父鐮�'}
- ,{field: 'frmLocno$', align: 'center',title: '婧愬簱浣�',sort: true, event: 'frmLocno', style: 'cursor:pointer'}
- ,{field: 'toLocno$', align: 'center',title: '鐩爣搴撲綅', sort: true, event: 'toLocno', style: 'cursor:pointer'}
- ,{field: 'frmSta$', align: 'center',title: '婧愮珯', sort: true, event: 'frmSta', style: 'cursor:pointer'}
- ,{field: 'toSta$', align: 'center',title: '鐩爣绔�', sort: true, event: 'toSta', style: 'cursor:pointer'}
+ ,{field: 'frmLocno$', align: 'center',title: '婧愬簱浣�',sort: true}
+ ,{field: 'toLocno$', align: 'center',title: '鐩爣搴撲綅', sort: true}
+ ,{field: 'frmSta$', align: 'center',title: '婧愮珯', sort: true}
+ ,{field: 'toSta$', align: 'center',title: '鐩爣绔�', sort: true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
// ,{field: 'appeTime$', 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: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'hpMk', align: 'center',title: ''}
// ,{field: 'retrieveMk', align: 'center',title: ''}
// ,{field: 'ctlHp', align: 'center',title: ''}
@@ -70,7 +72,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -100,7 +102,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -117,11 +119,11 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnp_detail.html',
success: function(layero, index){
- layer.getChildFrame('#crnSts,#wrkNo,#crnErr,#frmLocno,#frmSta,#toSta,#toLocno', index).parent().parent().hide();
+ layer.getChildFrame('#crnSts,#wrkNo,#bay,#level,#crnErr,#frmLocno,#frmSta,#toSta,#toLocno', index).parent().parent().hide();
layer.getChildFrame('#data-detail-submit-edit', index).hide();
clearFormVal(layer.getChildFrame('#detail', index));
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
@@ -143,7 +145,7 @@
} else {
layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: "/basCrnp/delete/auth",
+ url: baseUrl+"/basCrnp/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
@@ -153,7 +155,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -163,7 +165,7 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -181,7 +183,7 @@
'fields': fields
};
$.ajax({
- url: "/basCrnp/export/auth",
+ url: baseUrl+"/basCrnp/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -192,7 +194,7 @@
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
} else if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -232,11 +234,11 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnp_detail.html',
success: function(layero, index){
- layer.getChildFrame('#crnSts,#wrkNo,#crnErr,#frmLocno,#frmSta,#toSta,#toLocno', index).parent().parent().hide();
+ layer.getChildFrame('#crnSts,#wrkNo,#bay,#level,#crnErr,#frmLocno,#frmSta,#toSta,#toLocno', index).parent().parent().hide();
layer.getChildFrame('#data-detail-submit-save', index).hide();
setFormVal(layer.getChildFrame('#detail', index), data, false);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
@@ -261,7 +263,7 @@
content: '../basCrnStatus/basCrnStatus_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basCrnStatus/"+ param +"/auth",
+ url: baseUrl+"/basCrnStatus/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -297,7 +299,7 @@
content: '../basCrnError/basCrnError_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basCrnError/"+ param +"/auth",
+ url: baseUrl+"/basCrnError/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -333,7 +335,7 @@
content: '../locMast/locMast_detail.html',
success: function(layero, index){
$.ajax({
- url: "/locMast/"+ param +"/auth",
+ url: baseUrl+"/locMast/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -369,7 +371,7 @@
content: '../locMast/locMast_detail.html',
success: function(layero, index){
$.ajax({
- url: "/locMast/"+ param +"/auth",
+ url: baseUrl+"/locMast/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -406,7 +408,7 @@
content: '../basDevp/basDevp_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basDevp/"+ param +"/auth",
+ url: baseUrl+"/basDevp/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -442,7 +444,7 @@
content: '../basDevp/basDevp_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basDevp/"+ param +"/auth",
+ url: baseUrl+"/basDevp/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -479,7 +481,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -515,7 +517,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -566,6 +568,8 @@
outEnable: $('#outEnable').val(),
crnSts: $('#crnSts').val(),
wrkNo: $('#wrkNo').val(),
+ bay: $('#bay').val(),
+ level: $('#level').val(),
crnErr: $('#crnErr').val(),
frmLocno: $('#frmLocno').val(),
frmSta: $('#frmSta').val(),
@@ -585,7 +589,7 @@
};
$.ajax({
- url: "/basCrnp/"+name+"/auth",
+ url: baseUrl+"/basCrnp/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
@@ -597,7 +601,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -659,7 +663,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
--
Gitblit v1.9.1