From e9f4a368fd3845a38eb54d3d18d77e96e5767b61 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:47:22 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 27e4712..5335546 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -50,7 +50,7 @@
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 280}
]],
request: {
pageName: 'curr',
@@ -101,6 +101,8 @@
showWrkTrace(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
+ } else if (layEvent === 'exportData') {
+ doExport(obj);
} else if (layEvent === 'complete') {
doModify(data.id, 4);
} else if (layEvent === 'look') {
@@ -129,11 +131,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '搴忓垪鐮�'},
- {field: 'anfme', title: '鏁伴噺'},
- {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
+ // {field: 'batch', title: '鎵瑰彿'},
+ {field: 'specs', title: '瑙勬牸', width: 180},
+ {field: 'anfme', title: '鏁伴噺', width: 70},
+ {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold', width: 90}
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -142,7 +145,6 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
]],
request: {
pageName: 'curr',
@@ -236,12 +238,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '搴忓垪鐮�', edit: true},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 110},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'specs', title: '瑙勬牸', width: 180},
+ {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 100},
+ {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 100},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
@@ -335,14 +337,23 @@
let item = selectList[i];
// 鏌ヨ鐗╂枡璇︽儏
$.ajax({
- url: baseUrl+"/mat/covert/"+item.value+"/auth",
+ url: baseUrl+"/mat/covert/"+btoa(item.value)+"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
success: function (res) {
if (res.code === 200){
- xxDataList.push(res.data);
- insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ var bige=true;
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].matnr === res.data.matnr && xxDataList[j].batch === res.data.batch) {
+ bige=false;
+ break;
+ }
+ }
+ if (bige){
+ xxDataList.push(res.data);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -428,6 +439,34 @@
});
}
+ // 瀵煎嚭鍗曟嵁
+ function doExport(obj) {
+ layer.confirm('纭畾瀵煎嚭Excel鍚楋紵', {
+ shade: .1,
+ }, function (i) {
+ var titles=['璁㈠崟鍙�','鍟嗗搧缂栧彿','鍟嗗搧鍚嶇О','瑙勬牸','璁㈠崟鏁伴噺','浣滀笟鏁伴噺'];
+ $.ajax({
+ url: baseUrl+"/order/exportOrder/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ orderId: obj.data.id
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200){
+ var tableName = '璁㈠崟 ' + res.data[0][0]
+ table.exportFile(titles,res.data,'xls',tableName);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
// 淇敼璁㈠崟鐘舵��
function doModify(orderId, settle) {
layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
@@ -436,8 +475,6 @@
}, function (i) {
layer.close(i);
layer.load(2);
- console.log(orderId);
- console.log(settle);
$.ajax({
url: baseUrl+"/order/update/auth",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1