From 08cfde7440965bf14a78f1cd0f031b35b2ccce33 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 18 九月 2023 15:32:01 +0800 Subject: [PATCH] #组托显示操作人 --- src/main/java/com/zy/asrs/entity/WaitPakin.java | 11 +++++++++++ src/main/webapp/static/js/waitPakin/waitPakin.js | 1 + src/main/webapp/static/js/order/order.js | 2 +- src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 1 + src/main/webapp/static/js/orderCheck/orderCheck.js | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index c632dad..5739d03 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -8,6 +8,8 @@ import com.core.common.SpringUtils; import com.zy.asrs.service.LocOwnerService; import com.zy.common.utils.Synchro; +import com.zy.system.entity.User; +import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -179,6 +181,15 @@ @TableField("uuid") private String uuid; + public String getUserName$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.modiUser); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getUsername()); + } + return null; + } + public String getOwner$(){ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class); LocOwner locOwner = service.selectById(this.owner); diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index 0bd403c..108bf99 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -596,7 +596,7 @@ layer.closeAll(); layer.load(1, {shade: [0.1,'#fff']}); // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo; - location.href = "http://10.114.97.100:8080/stwms/order/printExport/auth?orderNo="+data.orderNo; + location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo; layer.closeAll('loading'); }); } diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js index fdc8cc0..6f40753 100644 --- a/src/main/webapp/static/js/orderCheck/orderCheck.js +++ b/src/main/webapp/static/js/orderCheck/orderCheck.js @@ -774,7 +774,7 @@ layer.closeAll(); layer.load(1, {shade: [0.1,'#fff']}); // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo; - location.href = "http://10.114.97.100:8080/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo; + location.href = baseUrl+"/orderCheck/printExport/auth?orderNo="+data.orderNo; layer.closeAll('loading'); }); } diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js index 4027f58..48592a7 100644 --- a/src/main/webapp/static/js/waitPakin/waitPakin.js +++ b/src/main/webapp/static/js/waitPakin/waitPakin.js @@ -3,6 +3,7 @@ var cols = [ {type: 'checkbox'} ]; cols.push.apply(cols, detlCols); cols.push({field: 'locNo', align: 'center',title: '搴撲綅鍙�'} + ,{field: 'userName$', align: 'center',title: '鎿嶄綔浜�'} ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'"; if(row.status === 'Y'){html += " checked ";} diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js index 274d542..9094121 100644 --- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js +++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js @@ -5,6 +5,7 @@ cols.push.apply(cols, detlCols); cols.push( {field: 'createBy$', align: 'center',title: '鎿嶄綔浜�', minWidth: 160, width: 160} + ,{field: 'userName$', align: 'center',title: '鎿嶄綔浜�'} ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'} ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'"; -- Gitblit v1.9.1