From d8282bc83c48030c3338ce014a88574d1bbfe895 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:50:59 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/js/order/order.js | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ed11081..0eca922 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,8 +101,11 @@
showWrkTrace(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
+ } else if (layEvent === 'exportData') {
+ doExport(obj);
} else if (layEvent === 'complete') {
- doModify(data.id, 4);
+ console.log(data)
+ doModify(data.id, 4,);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -129,11 +132,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 +146,6 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
]],
request: {
pageName: 'curr',
@@ -236,12 +239,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},
@@ -437,22 +440,49 @@
});
}
- // 淇敼璁㈠崟鐘舵��
- function doModify(orderId, settle) {
- layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
+ // 瀵煎嚭鍗曟嵁
+ function doExport(obj) {
+ layer.confirm('纭畾瀵煎嚭Excel鍚楋紵', {
shade: .1,
- skin: 'layui-layer-admin'
}, 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,memo) {
+ layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧?',{
+ title: '纭畾瑕佹墜鍔ㄥ畬缁撳悧?',
+ content: $('#modi').html(),
+ },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')},
data: {
id: orderId,
- settle: settle
+ settle: settle,
+ memo: $('#memo').val()
},
method: 'POST',
success: function (res) {
@@ -471,7 +501,7 @@
}
}
})
- });
+ })
}
// 浠诲姟杩芥函
--
Gitblit v1.9.1