From df0b697763217c84e9d42015d82a066a863f3e5a Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 09 十月 2024 13:42:55 +0800
Subject: [PATCH] 添加参数，强制刷新js文件
---
src/main/webapp/static/js/orderCheck/orderCheck.js | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 318 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index e78f013..d465eb5 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -87,6 +87,7 @@
showEditModel();
});
+
// 宸ュ叿鏉＄偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
@@ -101,7 +102,7 @@
btnPrint(data.id, data.orderNo, 4);
} else if (layEvent === 'manPrint') {
addPakOut(data.orderNo);
- }else if (layEvent === 'examine'){
+ }else if (layEvent === 'examine') {
examine(data);
}else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -113,7 +114,7 @@
type: 1,
title: false,
area: '900px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+ offset: [top + 'px', (left - 600 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
@@ -132,13 +133,14 @@
cols: [[ //宸ュ叿鏉℃槑缁�
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О'},
{field: 'locNo', title: '搴撲綅鍙�'},
+ {field: 'batch', title: '鎵规'},
{field: 'anfme', title: '鏁伴噺'},
- {field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
+ {field: 'realAnfme', title: '鐪熷疄鏁伴噺',style: 'color: blue;font-weight: bold', edit: true},
{field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
- {field: 'type$', title: '鐘舵��'},
- {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar3', minWidth: 80, width: 80, fixed: 'right'}
+ {field: 'type$', title: '鐘舵��'}
+
]],
request: {
pageName: 'curr',
@@ -167,8 +169,18 @@
});
}else if (layEvent === 'wrkTrace'){
showWrkTrace(data.id);
+ }else if (layEvent === 'printExcel'){
+ printExcel(data);
}
});
+ // //鍗曟嵁鏄庣粏琛� 瀹℃牳鎸夐挳
+ // table.on('tool(lookSSXMTable)', function (obj) {
+ // var data = obj.data;
+ // var layEvent = obj.event;
+ // if (layEvent === 'examine') {
+ // examine(data);
+ // }
+ // })
function showWrkTrace(orderId) {
console.log(orderId);
@@ -194,6 +206,10 @@
// 缁勮鏁版嵁
if (xxDataList.length <= 0) {
layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
+ return false;
+ }
+ if (data.field.orderNo == "" || data.field.orderNo == null) {
+ layer.tips('璇疯緭鍏ョ洏鐐瑰崟缂栧彿', '#orderNo', {tips: [1, '#ff4c4c']});
return false;
}
let nList = admin.util.deepClone(xxDataList);
@@ -226,6 +242,7 @@
layer.close(dIndex);
$(".layui-laypage-btn")[0].click();
layer.msg(res.msg, {icon: 1});
+ insTb.reload();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -252,8 +269,9 @@
{field: 'anfme', title: '搴撳瓨鏁伴噺'},
{field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
{field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
- {field: 'type$', title: '鐘舵��'},
- {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBarr', minWidth: 80, width: 80, fixed: 'right'}
+ {field: 'type$', title: '鐘舵��'}
+
+
]],
done: function (res) {
$(layero).find('.layui-table-view').css('margin', '0');
@@ -346,12 +364,17 @@
function showEditModel2(exp) {
var checkType = $("#checkType option:selected").val();
var tp = '';
- if (checkType == 'loc'){
+ if (checkType == 'locno'){
tp = 2;
}
if (checkType == 'matnr'){
tp = 3;
}
+ if (checkType == 'owner'){
+ tp = 4;
+ }
+
+
admin.open({
type: 1,
offset: '150px',
@@ -365,9 +388,25 @@
form.on('submit(matEditSubmit)', function (data) {
var prec = $("#selectPerc option:selected").val();
var selectList;
+ if (tp == 2){
+ prec = $("#selectPerc2 option:selected").val();
+ selectList = matXmSelect2.getValue();
+ console.log(selectList);
+ for (let i = 0; i<selectList.length; i++) {
+ selectList[i].children="";
+ }
+ }
if (tp == 3){
prec = $("#selectPerc3 option:selected").val();
selectList = matXmSelect.getValue();
+ console.log(selectList);
+ for (let i = 0; i<selectList.length; i++) {
+ selectList[i].children="";
+ }
+ }
+ if (tp == 4){
+ prec = $("#selectPerc4 option:selected").val();
+ selectList = matXmSelect3.getValue();
console.log(selectList);
for (let i = 0; i<selectList.length; i++) {
selectList[i].children="";
@@ -381,28 +420,79 @@
json.data = selectList;
console.log(json);
- $.ajax({
- url: baseUrl+"/orderCheck/create/auth",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- data: JSON.stringify(json),
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- for (var i =0;i<res.data.length;i++){
- xxDataList.push(res.data[i]);
- console.log(xxDataList);
- insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- }
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2})
+ if ( tp == 3 || tp == ''){
+ $.ajax({
+ url: baseUrl+"/orderCheck/create/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(json),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ xxDataList = []
+ if (res.code === 200){
+ for (var i =0;i<res.data.length;i++){
+ xxDataList.push(res.data[i]);
+ console.log(xxDataList);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
+
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
}
- }
- })
+ })
+ }else if (tp == 2){
+ $.ajax({
+ url: baseUrl+"/orderCheck/create/loc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(json),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for (var i =0;i<res.data.length;i++){
+ xxDataList.push(res.data[i]);
+ console.log(xxDataList);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
+
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }else if (tp == 4){
+ $.ajax({
+ url: baseUrl+"/orderCheck/create/owner/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify(json),
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for (var i =0;i<res.data.length;i++){
+ xxDataList.push(res.data[i]);
+ console.log(xxDataList);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
+
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+
layer.close(dIndex);
return false;
});
@@ -435,6 +525,62 @@
});
}
})
+
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect2 = xmSelect.render({
+ el: '#mat2',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/orderCheck/all/get/loc",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect3 = xmSelect.render({
+ el: '#mat4',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/orderCheck/all/get/owner",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+
+
+
// 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
$(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
@@ -590,6 +736,149 @@
})
}
+ // function examine(data){
+ // console.log(data)
+ // layer.confirm('璇风‘瀹氱湡瀹炴暟閲忎互鍙婂樊寮傛暟閲�!', {
+ // shade: .1,
+ // skin: 'layui-layer-admin'
+ // }, function (i) {
+ // $.ajax({
+ // url: baseUrl + "/orderCheck/mxamine",
+ // headers: {'token': localStorage.getItem('token')},
+ // contentType:'application/json;charset=UTF-8',
+ // data: JSON.stringify(data),
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // layer.msg(res.msg);
+ // }else {
+ // layer.msg(res.msg);
+ // }
+ // }
+ // });
+ //
+ //
+ // });
+ // }
+
+ // 椤甸潰淇敼
+ table.on('edit(lookSSXMTable)', function (obj) {
+ console.log(obj.data)
+ })
+
+ function printExcel(data){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+
+ // window.open("http://localhost:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo);
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ location.href = "http://10.114.97.100:8080/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ layer.closeAll('loading');
+ });
+ }
+
+
+ function examine(expTpe) {
+ admin.open({
+ type: 1,
+ title: '瀹℃牳鐩樼偣鍗�',
+ content: $('#editDialog2').html(),
+ area: '1300px',
+ success: function (layero, dIndex) {
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ var isExpAdd = !expTpe;
+ // 鍥炴樉鏁版嵁
+ form.val('editForm2', expTpe);
+ if (expTpe) {
+ $('#orderNo').attr("disabled", "disabled");
+ }
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(examine)', function (data) {
+ let nList = admin.util.deepClone(xxDataList);
+ layer.load(2);
+ console.log(data);
+ $.ajax({
+ url: baseUrl + "/orderCheck/examine",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ orderNo: data.field.orderNo,
+ list: nList
+ }),
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200) {
+ layer.close(dIndex);
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ // 鏄庣粏琛ㄦ牸
+ var xxDataList = [];
+ var tbOptions = {
+ elem: '#formSSXMTable2',
+ headers: {token: localStorage.getItem('token')},
+ data: xxDataList,
+ page: true,
+ height: '350px;',
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'locNo', title: '搴撲綅鍙�'},
+ {field: 'anfme', title: '搴撳瓨鏁伴噺'},
+ {field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
+ {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
+ {field: 'type$', title: '鐘舵��'}
+
+ ]],
+ done: function (res) {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ };
+
+
+ if (!isExpAdd) {
+
+ $.ajax({
+ url: baseUrl + "/orderCheck/detl/all/auth?orderNo=" + expTpe.orderNo,
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ console.log(res.data);
+ xxDataList = res.data;
+ tbOptions.data = xxDataList;
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+ var insTbSSXM = table.render(tbOptions);
+
+
+
+
+ }
+ });
+ }
--
Gitblit v1.9.1