From fecf9a8163a5563bc87f60405309eb4750a38504 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 24 十二月 2025 18:15:24 +0800
Subject: [PATCH] 出入库订单历史-增加变更业务时间记录展示
---
src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java | 80 ++++++++
src/main/java/com/zy/asrs/entity/OrderPakinLog.java | 7
src/main/webapp/static/js/orderPakinLog/order.js | 141 +++++++++++++++
src/main/java/com/zy/asrs/entity/OrderPakoutLog.java | 7
src/main/webapp/views/orderPakinLog/order.html | 28 +++
src/main/java/com/zy/asrs/entity/result/StockQtyDTO.java | 28 +++
src/main/java/com/zy/asrs/controller/OrderPakinLogController.java | 72 +++++++
src/main/webapp/static/js/orderPakoutLog/order.js | 141 +++++++++++++++
src/main/webapp/views/orderPakoutLog/order.html | 28 +++
9 files changed, 520 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinLogController.java b/src/main/java/com/zy/asrs/controller/OrderPakinLogController.java
index 06604a5..41f9780 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinLogController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
@@ -28,6 +29,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private OrderTimeChangeLogService orderTimeChangeLogService;
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
@@ -44,7 +47,31 @@
} else {
wrapper.orderBy("create_time", false);
}
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderPakinLog> page = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ // 鎵归噺鏌ヨ鍝簺璁㈠崟鏈夊彉鏇磋褰�
+ if (page.getRecords() != null && !page.getRecords().isEmpty()) {
+ java.util.List<Long> orderIds = new java.util.ArrayList<>();
+ for (OrderPakinLog order : page.getRecords()) {
+ orderIds.add(order.getId());
+ }
+ if (!orderIds.isEmpty()) {
+ EntityWrapper<OrderTimeChangeLog> logWrapper = new EntityWrapper<>();
+ logWrapper.in("order_id", orderIds);
+ logWrapper.eq("order_type", 1); // 1:鍏ュ簱
+ java.util.List<OrderTimeChangeLog> changeLogs = orderTimeChangeLogService.selectList(logWrapper);
+ java.util.Set<Long> orderIdsWithLog = new java.util.HashSet<>();
+ if (changeLogs != null) {
+ for (OrderTimeChangeLog log : changeLogs) {
+ orderIdsWithLog.add(log.getOrderId());
+ }
+ }
+ // 璁剧疆鏄惁鏈夊彉鏇磋褰曟爣璇�
+ for (OrderPakinLog order : page.getRecords()) {
+ order.setHasChangeLog(orderIdsWithLog.contains(order.getId()));
+ }
+ }
+ }
+ return R.ok(page);
}
@RequestMapping(value = "/order/detl/all/auth")
@@ -135,6 +162,49 @@
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @PostMapping(value = "/order/update/orderTime/auth")
+ @ManagerAuth(memo = "淇敼鍘嗗彶鍗曟嵁涓氬姟鏃堕棿")
+ public R updateOrderTime(@RequestParam Long id, @RequestParam String orderTime, @RequestParam(required = false) String memo) {
+ if (Cools.isEmpty(id) || Cools.isEmpty(orderTime)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ OrderPakinLog order = orderService.selectById(id);
+ if (order == null) {
+ return R.error("鍗曟嵁涓嶅瓨鍦�");
+ }
+ // 妫�鏌ユ槸鍚﹀凡缁戝畾鏈堢粨鍗曟嵁锛屽鏋滃凡缁戝畾鍒欑姝慨鏀�
+ if (order.getMonthlySettleId() != null && order.getMonthlySettleId() > 0) {
+ return R.error("璇ュ崟鎹凡缁戝畾鏈堢粨鍗曟嵁锛屼笉鑳戒慨鏀逛笟鍔℃椂闂�");
+ }
+ // 鑾峰彇鍘熶笟鍔℃椂闂达紙鍦ㄤ慨鏀瑰墠鑾峰彇锛�
+ String oldOrderTime = order.getOrderTime();
+ // 妫�鏌ユ柊鏃ф椂闂存槸鍚︾浉鍚�
+ if (oldOrderTime != null && oldOrderTime.equals(orderTime)) {
+ return R.error("鏂颁笟鍔℃椂闂翠笌鍘熶笟鍔℃椂闂寸浉鍚岋紝鏃犻渶淇敼");
+ }
+ // 鏇存柊涓氬姟鏃堕棿
+ order.setOrderTime(orderTime);
+ order.setUpdateBy(getUserId());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼涓氬姟鏃堕棿澶辫触");
+ }
+ // 淇濆瓨鍙樻洿璁板綍锛堝彧鏈夋椂闂翠笉鍚屾椂鎵嶄繚瀛橈級
+ if (oldOrderTime != null && !oldOrderTime.equals(orderTime)) {
+ OrderTimeChangeLog changeLog = new OrderTimeChangeLog();
+ changeLog.setOrderId(order.getId());
+ changeLog.setOrderNo(order.getOrderNo());
+ changeLog.setOrderType(1); // 1:鍏ュ簱
+ changeLog.setOldOrderTime(oldOrderTime);
+ changeLog.setNewOrderTime(orderTime);
+ changeLog.setMemo(memo);
+ changeLog.setCreateBy(getUserId());
+ changeLog.setCreateTime(new Date());
+ orderTimeChangeLogService.insert(changeLog);
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java
index d34c648..8738156 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
@@ -28,14 +29,16 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private OrderTimeChangeLogService orderTimeChangeLogService;
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
public R head(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String orderByField,
- @RequestParam(required = false) String orderByType,
- @RequestParam Map<String, Object> param) {
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderPakoutLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
@@ -44,7 +47,31 @@
} else {
wrapper.orderBy("create_time", false);
}
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderPakoutLog> page = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ // 鎵归噺鏌ヨ鍝簺璁㈠崟鏈夊彉鏇磋褰�
+ if (page.getRecords() != null && !page.getRecords().isEmpty()) {
+ java.util.List<Long> orderIds = new java.util.ArrayList<>();
+ for (OrderPakoutLog order : page.getRecords()) {
+ orderIds.add(order.getId());
+ }
+ if (!orderIds.isEmpty()) {
+ EntityWrapper<OrderTimeChangeLog> logWrapper = new EntityWrapper<>();
+ logWrapper.in("order_id", orderIds);
+ logWrapper.eq("order_type", 2); // 2:鍑哄簱
+ java.util.List<OrderTimeChangeLog> changeLogs = orderTimeChangeLogService.selectList(logWrapper);
+ java.util.Set<Long> orderIdsWithLog = new java.util.HashSet<>();
+ if (changeLogs != null) {
+ for (OrderTimeChangeLog log : changeLogs) {
+ orderIdsWithLog.add(log.getOrderId());
+ }
+ }
+ // 璁剧疆鏄惁鏈夊彉鏇磋褰曟爣璇�
+ for (OrderPakoutLog order : page.getRecords()) {
+ order.setHasChangeLog(orderIdsWithLog.contains(order.getId()));
+ }
+ }
+ }
+ return R.ok(page);
}
@RequestMapping(value = "/order/detl/all/auth")
@@ -140,6 +167,49 @@
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @PostMapping(value = "/order/update/orderTime/auth")
+ @ManagerAuth(memo = "淇敼鍘嗗彶鍗曟嵁涓氬姟鏃堕棿")
+ public R updateOrderTime(@RequestParam Long id, @RequestParam String orderTime, @RequestParam(required = false) String memo) {
+ if (Cools.isEmpty(id) || Cools.isEmpty(orderTime)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ OrderPakoutLog order = orderService.selectById(id);
+ if (order == null) {
+ return R.error("鍗曟嵁涓嶅瓨鍦�");
+ }
+ // 妫�鏌ユ槸鍚﹀凡缁戝畾鏈堢粨鍗曟嵁锛屽鏋滃凡缁戝畾鍒欑姝慨鏀�
+ if (order.getMonthlySettleId() != null && order.getMonthlySettleId() > 0) {
+ return R.error("璇ュ崟鎹凡缁戝畾鏈堢粨鍗曟嵁锛屼笉鑳戒慨鏀逛笟鍔℃椂闂�");
+ }
+ // 鑾峰彇鍘熶笟鍔℃椂闂达紙鍦ㄤ慨鏀瑰墠鑾峰彇锛�
+ String oldOrderTime = order.getOrderTime();
+ // 妫�鏌ユ柊鏃ф椂闂存槸鍚︾浉鍚�
+ if (oldOrderTime != null && oldOrderTime.equals(orderTime)) {
+ return R.error("鏂颁笟鍔℃椂闂翠笌鍘熶笟鍔℃椂闂寸浉鍚岋紝鏃犻渶淇敼");
+ }
+ // 鏇存柊涓氬姟鏃堕棿
+ order.setOrderTime(orderTime);
+ order.setUpdateBy(getUserId());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼涓氬姟鏃堕棿澶辫触");
+ }
+ // 淇濆瓨鍙樻洿璁板綍锛堝彧鏈夋椂闂翠笉鍚屾椂鎵嶄繚瀛橈級
+ if (oldOrderTime != null && !oldOrderTime.equals(orderTime)) {
+ OrderTimeChangeLog changeLog = new OrderTimeChangeLog();
+ changeLog.setOrderId(order.getId());
+ changeLog.setOrderNo(order.getOrderNo());
+ changeLog.setOrderType(2); // 2:鍑哄簱
+ changeLog.setOldOrderTime(oldOrderTime);
+ changeLog.setNewOrderTime(orderTime);
+ changeLog.setMemo(memo);
+ changeLog.setCreateBy(getUserId());
+ changeLog.setCreateTime(new Date());
+ orderTimeChangeLogService.insert(changeLog);
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
index 18968a9..3938078 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -290,6 +290,13 @@
@TableField("monthly_settle_no")
private String monthlySettleNo;
+ /**
+ * 鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰曪紙涓存椂瀛楁锛屼笉鏄犲皠鍒版暟鎹簱锛�
+ */
+ @ApiModelProperty(value = "鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰�")
+ @TableField(exist = false)
+ private Boolean hasChangeLog;
+
public OrderPakinLog() {
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
index 851d163..26891c5 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
@@ -290,6 +290,13 @@
@TableField("monthly_settle_no")
private String monthlySettleNo;
+ /**
+ * 鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰曪紙涓存椂瀛楁锛屼笉鏄犲皠鍒版暟鎹簱锛�
+ */
+ @ApiModelProperty(value = "鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰�")
+ @TableField(exist = false)
+ private Boolean hasChangeLog;
+
public OrderPakoutLog() {
}
diff --git a/src/main/java/com/zy/asrs/entity/result/StockQtyDTO.java b/src/main/java/com/zy/asrs/entity/result/StockQtyDTO.java
new file mode 100644
index 0000000..e8c009e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/StockQtyDTO.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 搴撳瓨鏁伴噺DTO锛堢敤浜庢壒閲忔煡璇級
+ */
+@Data
+public class StockQtyDTO {
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ private String matnr;
+
+ /**
+ * 鎵规
+ */
+ private String batch;
+
+ /**
+ * 搴撳瓨鏁伴噺
+ */
+ private BigDecimal stockQty;
+}
+
diff --git a/src/main/webapp/static/js/orderPakinLog/order.js b/src/main/webapp/static/js/orderPakinLog/order.js
index 0bc0366..99a13a3 100644
--- a/src/main/webapp/static/js/orderPakinLog/order.js
+++ b/src/main/webapp/static/js/orderPakinLog/order.js
@@ -1,7 +1,7 @@
var insTbCount = 0;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['layer', 'form', 'table', 'util', 'admin', 'laydate'], function () {
+}).use(['layer', 'form', 'table', 'util', 'admin', 'laydate', 'element'], function () {
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
@@ -10,6 +10,7 @@
var admin = layui.admin;
var layDate = layui.laydate;
var laytpl = layui.laytpl;
+ var element = layui.element;
// 娓叉煋鎼滅储妯℃澘
$.ajax({
@@ -50,7 +51,8 @@
{ align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160 },
{ 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 }
+ { field: 'memo', align: 'center', title: '澶囨敞', hide: true },
+ { align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180 }
]],
request: {
pageName: 'curr',
@@ -92,6 +94,25 @@
var offset = $a.offset();
var top = offset.top;
var left = offset.left;
+ var hasChangeLog = data.hasChangeLog || false;
+ var tabContent = '<div class="layui-tab layui-tab-brief" lay-filter="orderDetailTab">' +
+ '<ul class="layui-tab-title">' +
+ '<li class="layui-this">鍗曟嵁鏄庣粏</li>';
+ if (hasChangeLog) {
+ tabContent += '<li>涓氬姟鏃堕棿鍙樻洿璁板綍</li>';
+ }
+ tabContent += '</ul>' +
+ '<div class="layui-tab-content" style="padding: 10px 0;">' +
+ '<div class="layui-tab-item layui-show">' +
+ '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>' +
+ '</div>';
+ if (hasChangeLog) {
+ tabContent += '<div class="layui-tab-item">' +
+ '<table id="changeLogTable" lay-filter="changeLogTable"></table>' +
+ '</div>';
+ }
+ tabContent += '</div></div>';
+
layer.open({
type: 1,
title: false,
@@ -100,8 +121,9 @@
shade: .01,
shadeClose: true,
fixed: false,
- content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+ content: tabContent,
success: function (layero) {
+ // 娓叉煋鍗曟嵁鏄庣粏琛ㄦ牸
table.render({
elem: '#lookSSXMTable',
method: 'POST',
@@ -142,8 +164,54 @@
},
size: ''
});
+
+ // 鏍囩鍒囨崲浜嬩欢
+ var changeLogTableRendered = false;
+ element.on('tab(orderDetailTab)', function(elem){
+ if (hasChangeLog && elem.index === 1 && !changeLogTableRendered) {
+ // 鍒囨崲鍒板彉鏇磋褰曟爣绛炬椂鎵嶆煡璇紙鍙煡璇竴娆★級
+ changeLogTableRendered = true;
+ table.render({
+ elem: '#changeLogTable',
+ method: 'POST',
+ headers: { token: localStorage.getItem('token') },
+ url: baseUrl + '/orderTimeChangeLog/list/byOrderId/auth',
+ where: {
+ orderId: data.id
+ },
+ page: false,
+ cellMinWidth: 100,
+ cols: [[
+ { type: 'numbers' },
+ { field: 'oldOrderTime', title: '鍘熶笟鍔℃椂闂�', width: 180 },
+ { field: 'newOrderTime', title: '鏂颁笟鍔℃椂闂�', width: 180 },
+ { field: 'memo', title: '澶囨敞', minWidth: 200 },
+ { field: 'createByName', title: '鎿嶄綔浜�', width: 120 },
+ { field: 'createTime$', title: '鍙樻洿鏃堕棿', width: 180 }
+ ]],
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data ? res.data.length : 0,
+ 'data': res.data || []
+ }
+ },
+ response: {
+ statusCode: 200
+ }
+ });
+ }
+ });
}
});
+ } else if (layEvent === 'editOrderTime') {
+ // 妫�鏌ユ槸鍚﹀凡鏈堢粨
+ if (data.monthlySettleId && data.monthlySettleId > 0) {
+ layer.msg('璇ュ崟鎹凡鏈堢粨锛屼笉鑳戒慨鏀逛笟鍔℃椂闂�', { icon: 2 });
+ return;
+ }
+ showEditOrderTimeDialog(data);
}
});
@@ -210,6 +278,73 @@
})
}
+ // 鏄剧ず淇敼涓氬姟鏃堕棿寮圭獥
+ function showEditOrderTimeDialog(data) {
+ admin.open({
+ type: 1,
+ title: '淇敼涓氬姟鏃堕棿',
+ content: $('#editOrderTimeDialog').html(),
+ area: '400px',
+ success: function (layero, dIndex) {
+ // 鍥炴樉鏁版嵁
+ form.val('editOrderTimeForm', {
+ id: data.id,
+ orderTime: data.orderTime
+ });
+ // 鍒濆鍖栦笟鍔℃椂闂存棩鏈熼�夋嫨鍣紙鏀寔閫夋嫨鏃跺垎绉掞級
+ layDate.render({
+ elem: '#orderTimeEdit',
+ type: 'datetime',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ value: data.orderTime || '',
+ btns: ['clear', 'confirm'],
+ ready: function(date){
+ // 纭繚鏃跺垎绉掗�夋嫨鍣ㄦ樉绀�
+ var layero = this.elem.next();
+ if(layero.length > 0) {
+ layero.find('.laydate-time-list').show();
+ }
+ }
+ });
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editOrderTimeSubmit)', function (formData) {
+ // 鍓嶇鏍￠獙锛氭鏌ユ柊鏃ф椂闂存槸鍚︾浉鍚�
+ var oldOrderTime = data.orderTime;
+ var newOrderTime = formData.field.orderTime;
+ if (oldOrderTime && oldOrderTime === newOrderTime) {
+ layer.msg('鏂颁笟鍔℃椂闂翠笌鍘熶笟鍔℃椂闂寸浉鍚岋紝鏃犻渶淇敼', { icon: 2 });
+ return false;
+ }
+ layer.load(2);
+ $.ajax({
+ url: baseUrl + "/order/pakinLog/order/update/orderTime/auth",
+ headers: { 'token': localStorage.getItem('token') },
+ data: {
+ id: formData.field.id,
+ orderTime: formData.field.orderTime,
+ memo: formData.field.memo || ''
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200) {
+ layer.close(dIndex);
+ insTb.reload({ page: { curr: 1 } });
+ layer.msg(res.msg, { icon: 1 });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, { icon: 2 });
+ }
+ }
+ });
+ return false;
+ });
+ }
+ });
+ }
+
+
layDate.render({
elem: '.layui-laydate-range'
, type: 'datetime'
diff --git a/src/main/webapp/static/js/orderPakoutLog/order.js b/src/main/webapp/static/js/orderPakoutLog/order.js
index 6571042..a77432c 100644
--- a/src/main/webapp/static/js/orderPakoutLog/order.js
+++ b/src/main/webapp/static/js/orderPakoutLog/order.js
@@ -1,7 +1,7 @@
var insTbCount = 0;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['layer', 'form', 'table', 'util', 'admin', 'laydate'], function () {
+}).use(['layer', 'form', 'table', 'util', 'admin', 'laydate', 'element'], function () {
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
@@ -10,6 +10,7 @@
var admin = layui.admin;
var layDate = layui.laydate;
var laytpl = layui.laytpl;
+ var element = layui.element;
// 娓叉煋鎼滅储妯℃澘
$.ajax({
@@ -50,7 +51,8 @@
{ align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160 },
{ 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 }
+ { field: 'memo', align: 'center', title: '澶囨敞', hide: true },
+ { align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 120 }
]],
request: {
pageName: 'curr',
@@ -92,6 +94,25 @@
var offset = $a.offset();
var top = offset.top;
var left = offset.left;
+ var hasChangeLog = data.hasChangeLog || false;
+ var tabContent = '<div class="layui-tab layui-tab-brief" lay-filter="orderDetailTab">' +
+ '<ul class="layui-tab-title">' +
+ '<li class="layui-this">鍗曟嵁鏄庣粏</li>';
+ if (hasChangeLog) {
+ tabContent += '<li>涓氬姟鏃堕棿鍙樻洿璁板綍</li>';
+ }
+ tabContent += '</ul>' +
+ '<div class="layui-tab-content" style="padding: 10px 0;">' +
+ '<div class="layui-tab-item layui-show">' +
+ '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>' +
+ '</div>';
+ if (hasChangeLog) {
+ tabContent += '<div class="layui-tab-item">' +
+ '<table id="changeLogTable" lay-filter="changeLogTable"></table>' +
+ '</div>';
+ }
+ tabContent += '</div></div>';
+
layer.open({
type: 1,
title: false,
@@ -100,8 +121,9 @@
shade: .01,
shadeClose: true,
fixed: false,
- content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+ content: tabContent,
success: function (layero) {
+ // 娓叉煋鍗曟嵁鏄庣粏琛ㄦ牸
table.render({
elem: '#lookSSXMTable',
method: 'POST',
@@ -142,8 +164,54 @@
},
size: ''
});
+
+ // 鏍囩鍒囨崲浜嬩欢
+ var changeLogTableRendered = false;
+ element.on('tab(orderDetailTab)', function(elem){
+ if (hasChangeLog && elem.index === 1 && !changeLogTableRendered) {
+ // 鍒囨崲鍒板彉鏇磋褰曟爣绛炬椂鎵嶆煡璇紙鍙煡璇竴娆★級
+ changeLogTableRendered = true;
+ table.render({
+ elem: '#changeLogTable',
+ method: 'POST',
+ headers: { token: localStorage.getItem('token') },
+ url: baseUrl + '/orderTimeChangeLog/list/byOrderId/auth',
+ where: {
+ orderId: data.id
+ },
+ page: false,
+ cellMinWidth: 100,
+ cols: [[
+ { type: 'numbers' },
+ { field: 'oldOrderTime', title: '鍘熶笟鍔℃椂闂�', width: 180 },
+ { field: 'newOrderTime', title: '鏂颁笟鍔℃椂闂�', width: 180 },
+ { field: 'memo', title: '澶囨敞', minWidth: 200 },
+ { field: 'createByName', title: '鎿嶄綔浜�', width: 120 },
+ { field: 'createTime$', title: '鍙樻洿鏃堕棿', width: 180 }
+ ]],
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data ? res.data.length : 0,
+ 'data': res.data || []
+ }
+ },
+ response: {
+ statusCode: 200
+ }
+ });
+ }
+ });
}
});
+ } else if (layEvent === 'editOrderTime') {
+ // 妫�鏌ユ槸鍚﹀凡鏈堢粨
+ if (data.monthlySettleId && data.monthlySettleId > 0) {
+ layer.msg('璇ュ崟鎹凡鏈堢粨锛屼笉鑳戒慨鏀逛笟鍔℃椂闂�', { icon: 2 });
+ return;
+ }
+ showEditOrderTimeDialog(data);
}
});
@@ -210,6 +278,73 @@
})
}
+ // 鏄剧ず淇敼涓氬姟鏃堕棿寮圭獥
+ function showEditOrderTimeDialog(data) {
+ admin.open({
+ type: 1,
+ title: '淇敼涓氬姟鏃堕棿',
+ content: $('#editOrderTimeDialog').html(),
+ area: '400px',
+ success: function (layero, dIndex) {
+ // 鍥炴樉鏁版嵁
+ form.val('editOrderTimeForm', {
+ id: data.id,
+ orderTime: data.orderTime
+ });
+ // 鍒濆鍖栦笟鍔℃椂闂存棩鏈熼�夋嫨鍣紙鏀寔閫夋嫨鏃跺垎绉掞級
+ layDate.render({
+ elem: '#orderTimeEdit',
+ type: 'datetime',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ value: data.orderTime || '',
+ btns: ['clear', 'confirm'],
+ ready: function(date){
+ // 纭繚鏃跺垎绉掗�夋嫨鍣ㄦ樉绀�
+ var layero = this.elem.next();
+ if(layero.length > 0) {
+ layero.find('.laydate-time-list').show();
+ }
+ }
+ });
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editOrderTimeSubmit)', function (formData) {
+ // 鍓嶇鏍￠獙锛氭鏌ユ柊鏃ф椂闂存槸鍚︾浉鍚�
+ var oldOrderTime = data.orderTime;
+ var newOrderTime = formData.field.orderTime;
+ if (oldOrderTime && oldOrderTime === newOrderTime) {
+ layer.msg('鏂颁笟鍔℃椂闂翠笌鍘熶笟鍔℃椂闂寸浉鍚岋紝鏃犻渶淇敼', { icon: 2 });
+ return false;
+ }
+ layer.load(2);
+ $.ajax({
+ url: baseUrl + "/order/pakoutLog/order/update/orderTime/auth",
+ headers: { 'token': localStorage.getItem('token') },
+ data: {
+ id: formData.field.id,
+ orderTime: formData.field.orderTime,
+ memo: formData.field.memo || ''
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200) {
+ layer.close(dIndex);
+ insTb.reload({ page: { curr: 1 } });
+ layer.msg(res.msg, { icon: 1 });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, { icon: 2 });
+ }
+ }
+ });
+ return false;
+ });
+ }
+ });
+ }
+
+
layDate.render({
elem: '.layui-laydate-range'
, type: 'datetime'
diff --git a/src/main/webapp/views/orderPakinLog/order.html b/src/main/webapp/views/orderPakinLog/order.html
index fe2d881..96b51a1 100644
--- a/src/main/webapp/views/orderPakinLog/order.html
+++ b/src/main/webapp/views/orderPakinLog/order.html
@@ -89,6 +89,12 @@
</a>
</span>
</script>
+ <!-- 鎿嶄綔鍒� -->
+ <script type="text/html" id="operate">
+ {{# if(!d.monthlySettleId || d.monthlySettleId == 0){ }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="editOrderTime">淇敼涓氬姟鏃堕棿</a>
+ {{# } }}
+</script>
<script type="text/html" id="orderNoTpl">
{{d.orderNo}}
{{# if(d.settle > 1 && d.settle !== 3){ }}
@@ -227,6 +233,28 @@
<option value="{{docId}}">{{docName}}</option>
{{/each}}
</script>
+ <!-- 淇敼涓氬姟鏃堕棿寮圭獥 -->
+ <script type="text/html" id="editOrderTimeDialog">
+ <form id="editOrderTimeForm" lay-filter="editOrderTimeForm" class="layui-form model-form">
+ <input name="id" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓氬姟鏃堕棿锛�</label>
+ <div class="layui-input-block">
+ <input id="orderTimeEdit" name="orderTime" placeholder="閫夋嫨涓氬姟鏃堕棿" type="text" class="layui-input" autocomplete="off" lay-verType="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙樻洿澶囨敞锛�</label>
+ <div class="layui-input-block">
+ <textarea name="memo" placeholder="璇疯緭鍏ュ彉鏇村娉紙鍙�夛級" class="layui-textarea" rows="3"></textarea>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="editOrderTimeSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
</body>
</html>
diff --git a/src/main/webapp/views/orderPakoutLog/order.html b/src/main/webapp/views/orderPakoutLog/order.html
index 9825a74..9df2682 100644
--- a/src/main/webapp/views/orderPakoutLog/order.html
+++ b/src/main/webapp/views/orderPakoutLog/order.html
@@ -89,6 +89,12 @@
</a>
</span>
</script>
+ <!-- 鎿嶄綔鍒� -->
+ <script type="text/html" id="operate">
+ {{# if(!d.monthlySettleId || d.monthlySettleId == 0){ }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="editOrderTime">淇敼涓氬姟鏃堕棿</a>
+ {{# } }}
+</script>
<script type="text/html" id="orderNoTpl">
{{d.orderNo}}
{{# if(d.settle > 1 && d.settle !== 3){ }}
@@ -227,6 +233,28 @@
<option value="{{docId}}">{{docName}}</option>
{{/each}}
</script>
+ <!-- 淇敼涓氬姟鏃堕棿寮圭獥 -->
+ <script type="text/html" id="editOrderTimeDialog">
+ <form id="editOrderTimeForm" lay-filter="editOrderTimeForm" class="layui-form model-form">
+ <input name="id" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓氬姟鏃堕棿锛�</label>
+ <div class="layui-input-block">
+ <input id="orderTimeEdit" name="orderTime" placeholder="閫夋嫨涓氬姟鏃堕棿" type="text" class="layui-input" autocomplete="off" lay-verType="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙樻洿澶囨敞锛�</label>
+ <div class="layui-input-block">
+ <textarea name="memo" placeholder="璇疯緭鍏ュ彉鏇村娉紙鍙�夛級" class="layui-textarea" rows="3"></textarea>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="editOrderTimeSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
</body>
</html>
--
Gitblit v1.9.1