[DEv] fixed some filed not see ok

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java

@@ -152,7 +152,7 @@ public class ApprovalService {
                 taskService.complete(task.getId(), map);
 
                 pa.setId(uuid);
-                pa.setApprovalBy("Admin");
+                pa.setApprovalBy(authUserHelper.getCurrentUserId() == null ? "Admin" : authUserHelper.getCurrentUserId());
                 pa.setApprovalTime(new Date());
                 pa.setApprovalResualt(comment);
                 periodApproveMapper.updateByPrimaryKeySelective(pa);

atms-web/src/main/webapp/app/framework/app-approve/app-approve.ctrl.js

@@ -586,9 +586,20 @@
                           { caption: '期间', width: '7%', dataField: "period"},
                           { caption: '提审人', width: '10%', dataField: "createBy"},
                           { caption: '审批人', width: '10%', dataField: "approvalBy"},
-                          { caption: '审批状态', width: '10%', dataField: "status"},
+                          { caption: '审批状态', width: '10%',
+                            calculateCellValue: function(data) {
+                               if(data.status=='disagreed'){
+                                 return '驳回';
+                               }else if(data.status == 'agreed'){
+                                 return  '通过';
+                               }else if(data.status == 'committed'){
+                                 return '审核中';
+                               }
+                            }
+                          },
                           { caption: '审批意见', width: '15%', dataField: "approvalResult"},
-                          { caption: '创建时间', width: '7.5%', dataField: "createTime"}
+                          { caption: '提审时间', width: '7.5%', dataField: "createTime"},
+                          { caption: '审批时间', width: '7.5%', dataField: "approvalTime"}
                          ],
                           onRowClick: function (e) {
                              $scope.goToService(e.data);