From b6fdaf9d936cda0c3882012ee5ea3ab2dc822866 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 28 九月 2023 12:05:10 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 5335546..0eca922 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -104,7 +104,8 @@
} 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();
@@ -468,11 +469,11 @@
}
// 淇敼璁㈠崟鐘舵��
- function doModify(orderId, settle) {
- layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
- shade: .1,
- skin: 'layui-layer-admin'
- }, function (i) {
+ function doModify(orderId, settle,memo) {
+ layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧?',{
+ title: '纭畾瑕佹墜鍔ㄥ畬缁撳悧?',
+ content: $('#modi').html(),
+ },function (i) {
layer.close(i);
layer.load(2);
$.ajax({
@@ -480,7 +481,8 @@
headers: {'token': localStorage.getItem('token')},
data: {
id: orderId,
- settle: settle
+ settle: settle,
+ memo: $('#memo').val()
},
method: 'POST',
success: function (res) {
@@ -499,7 +501,7 @@
}
}
})
- });
+ })
}
// 浠诲姟杩芥函
--
Gitblit v1.9.1