项目更新

src/main/java/cn/com/tenlion/aishop/service/goodslog/impl/GoodslogServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.tenlion.aishop.service.goodslog.impl;
 
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.bos.UserInfoBO;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.date.DateUtil;
@@ -55,7 +56,13 @@ public class GoodslogServiceImpl extends DefaultBaseService implements IGoodslog
         Map<String, Object> params = HashMapUtil.beanToMap(goodslogVO);
         params.put("goodslogId", goodslogId);
         if (StringUtils.isBlank(token)) {
-            setSaveInfo(params);
+            UserInfoBO userInfoBO = this.securityComponent.getCurrentUser();
+            String currentDate = DateUtil.getTime();
+            params.put("creator", userInfoBO == null ? "-1" : userInfoBO.getUserId());
+            params.put("gmtCreate", currentDate);
+            params.put("modifier", userInfoBO == null ? "-1" : userInfoBO.getUserId());
+            params.put("gmtModified", currentDate);
+            params.put("isDelete", 0);
         } else {
             setAppSaveInfo(token, params);
         }

src/main/resources/templates/correction/list-system.html

@@ -157,7 +157,7 @@
                     area: ['60%', '85%'],
                     shadeClose: false,
                     anim: 2,
-                    content: top.restAjax.path('route/correction/show-system?correctionId={correctionId}', [data.correctionId]),
+                    content: top.restAjax.path('route/correction/show-system?correctionId={correctionId}&orderId={orderId}', [data.correctionId, data.orderId]),
                     end: function() {
                         reloadTable();
                     }

src/main/resources/templates/order/list-sell.html

@@ -164,6 +164,7 @@
                         {field: 'cz', width: 300, title: '操作', align:'center',fixed: 'right',
                             templet: function(row) {
                                 var rowData = '<div class="layui-btn-group">';
+                                rowData += '    <button type="button" class="layui-btn layui-btn-xs " lay-event="viewEvent">订单详情</button>';
                                 if(row.orderStatus == '3') {
                                     rowData += '    <button type="button" class="layui-btn layui-btn-xs " lay-event="correctionEvent">资料补充</button>';
                                 }
@@ -283,6 +284,19 @@
                 });
             }else if(layEvent === 'downEvent') {
                 window.open("route/file/download/false/" + data.producePhoto);
+            }else  if(layEvent === 'viewEvent') {
+                top.layer.open({
+                    type: 2,
+                    title: "<b style='color: red'>" + data.goodsDTO.goodsName + " " + data.goodsDTO.goodsVersion + " </b>订单详情",
+                    closeBtn: 0,
+                    area: ['80%', '80%'],
+                    shadeClose: false,
+                    anim: 2,
+                    content: top.restAjax.path('route/order/update?orderId={orderId}', [data.orderId]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
             }
         });
 

src/main/resources/templates/order/update-buy.html

@@ -358,11 +358,13 @@
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
         var orderId = top.restAjax.params(window.location.href).orderId;
+
         $(".layui-card").height(window.innerHeight-97);
         $("#gouTong").height(window.innerHeight-180);
         $("#gouTong").width(window.innerWidth-90);
         $("#gouTong").attr("src", "route/correction/list-system?orderId=" + orderId);
 
+
         $("#jieGuo").height(window.innerHeight-180);
         $("#producePhotoImage").height(window.innerHeight-240);
         $("#producePhotoImage").width(window.innerHeight-340);
@@ -456,7 +458,6 @@
         function initData() {
             var loadLayerIndex;
             top.restAjax.get(top.restAjax.path('api/order/get/{orderId}', [orderId]), {}, null, function(code, data) {
-                alert(123)
                 var dataFormData = {};
                 for(var i in data) {
                     dataFormData[i] = data[i] +'';