From c16480e0c647c6dde6de6806ccd1e84cbcf83f57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 六月 2023 16:10:40 +0800
Subject: [PATCH] #订单明细优化
---
src/main/java/com/zy/asrs/controller/OrderController.java | 2 +-
src/main/webapp/static/js/order/order.js | 9 ++++++++-
src/main/webapp/views/order/order.html | 11 ++++++-----
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index f605dde..e73b8de 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -181,7 +181,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if(orderDetl.getPayment() == null){
- orderDetl.setPayment(0);
+ orderDetl.setPayment(1);
}
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 1e87b29..caca7e0 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -146,6 +146,7 @@
})
}
+
// 宸ュ叿鏉＄偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
@@ -350,6 +351,7 @@
},
size: ''
};
+
if (!isExpAdd) {
$.ajax({
url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -420,7 +422,7 @@
}
}
data[obj.field] = obj.value;
- insTbSSXM.reload({data: xxDataList});
+ insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
});
$('#matAddBtnComment').click(function () {
@@ -502,7 +504,11 @@
}
});
+
+
}
+
+
// 鍒犻櫎鍗曟嵁
function doDel(orderId) {
@@ -583,4 +589,5 @@
});
+
});
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 99155f2..300ccae 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -252,16 +252,17 @@
<script type="text/html" id="payment">
<select id="select-primary" style="width: 100%" class="layui-border select-primary" lay-ignore >
- <option value="0"
- {{# if( d.payment === 0){ }}
- selected = "selected"
- {{# } }}
- >浠ｉ噰</option>
<option value="1"
{{# if( d.payment === 1){ }}
selected = "selected"
{{# } }}
>浠撳偍</option>
+ <option value="0"
+ {{# if( d.payment === 0){ }}
+ selected = "selected"
+ {{# } }}
+ >浠ｉ噰</option>
+
</select>
</script>
--
Gitblit v1.9.1