Преглед изворни кода

设备报废-时间格式化

hanqingsong пре 1 година
родитељ
комит
09bcbfeb84

+ 4 - 2
src/main/resources/static/app/business/device/controller/deviceOutCtrl.js

@@ -1,7 +1,7 @@
1 1
 "use strict";
2 2
 //器材信息
3 3
 angular.module('app.business')
4
-    .controller("deviceOutCtrl", function($scope, $http,$state,$rootScope,deviceInputService,$stateParams, APP_CONFIG) {
4
+    .controller("deviceOutCtrl", function($scope, $http,$state,$rootScope,deviceInputService,$stateParams, APP_CONFIG, $filter) {
5 5
     // 获取列表数据
6 6
      $scope.pageInfo = {pageNum : 1, pageSize : 10};
7 7
      $scope.search = {deviceTypeId:"5476"};
@@ -23,7 +23,9 @@ angular.module('app.business')
23 23
              method: 'POST',
24 24
              url: APP_CONFIG.deviceUrl + '/devicePutStorage/outUpdate',
25 25
              data: {
26
-                 sbbh: sbbh
26
+                 sbbh: sbbh,
27
+                 commitPeople: $rootScope.userInfo.realName,
28
+                 commitTime: $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss")
27 29
              }
28 30
          }).then(function successCallback(response) {
29 31
              if (response.data.status == "success") {

+ 4 - 0
src/main/resources/static/app/business/device/views/deviceOut-list.html

@@ -42,6 +42,8 @@
42 42
                             <th data-hide="phone,tablet">生产厂家</th>
43 43
                             <th data-hide="phone,tablet">单价</th>
44 44
                             <!-- <th data-hide="phone,tablet">存放地点</th> -->
45
+							<th data-class="expand">提交人</th>
46
+							<th data-class="expand">提交时间</th>
45 47
                             <th data-hide="phone,tablet"> 操作</th>
46 48
                         </tr>
47 49
                         </thead>
@@ -66,6 +68,8 @@
66 68
 								<td>{{device.sysm}}</td>
67 69
 								<td>{{device.sccj}}</td>
68 70
 								<td>{{device.cgjg}}</td>
71
+								<td>{{device.refresher}}</td>
72
+								<td>{{device.refreshTime}}</td>
69 73
 								<!-- <td>{{device.positionName}}</td> -->
70 74
 								<td>
71 75
 									<span ng-show="{{device.status == 1}}">