Browse Source

fix: 安全隐患

XuPengHui 2 years ago
parent
commit
a798151bd1

+ 7 - 2
src/main/resources/static/app/storage/controller/safeProduceDangerHandle.js

@@ -4,7 +4,7 @@ angular
4
   .module("app.storage")
4
   .module("app.storage")
5
   .controller(
5
   .controller(
6
     "safeProduceDangerHandle",
6
     "safeProduceDangerHandle",
7
-    function ($scope, $state, $rootScope, safeDangerHandleService) {
7
+    function ($scope, $state, $rootScope, safeDangerHandleService, $filter) {
8
       $scope.pageInfo = { pageNum: 1, pageSize: 10 };
8
       $scope.pageInfo = { pageNum: 1, pageSize: 10 };
9
       $scope.orgName = $rootScope.depotInfo.orgName;
9
       $scope.orgName = $rootScope.depotInfo.orgName;
10
       $scope.loadData = function () {
10
       $scope.loadData = function () {
@@ -86,7 +86,8 @@ angular
86
       $rootScope,
86
       $rootScope,
87
       safeDangerHandleService,
87
       safeDangerHandleService,
88
       StorehouseService,
88
       StorehouseService,
89
-      $stateParams
89
+      $stateParams,
90
+      $filter
90
     ) {
91
     ) {
91
       $scope.orgName = $rootScope.depotInfo.orgName;
92
       $scope.orgName = $rootScope.depotInfo.orgName;
92
       $scope.insertDanger = {
93
       $scope.insertDanger = {
@@ -129,6 +130,10 @@ angular
129
             .queryById($stateParams.id)
130
             .queryById($stateParams.id)
130
             .then(function (data) {
131
             .then(function (data) {
131
               $scope.insertDanger = data.data;
132
               $scope.insertDanger = data.data;
133
+              if($scope.insertDanger.solveTime) {
134
+                $scope.insertDanger.solveTime = $filter('date')($scope.insertDanger.solveTime, "yyyy-MM-dd");
135
+                $scope.insertDanger.solveTime = $scope.insertDanger.solveTime.slice(0, 10);
136
+              }
132
             });
137
             });
133
         }
138
         }
134
       };
139
       };

+ 15 - 12
src/main/resources/static/app/storage/views/safeproduce/safeDangerHandle-edit.html

@@ -51,7 +51,7 @@
51
                     </section>
51
                     </section>
52
                     <section class="form-group col col-3">
52
                     <section class="form-group col col-3">
53
                       <label class="label"
53
                       <label class="label"
54
-                        >整改时限<span style="color: red">*</span></label
54
+                        >整改时限</label
55
                       >
55
                       >
56
                       <label class="select">
56
                       <label class="select">
57
                         <input
57
                         <input
@@ -159,18 +159,16 @@
159
                   </div>
159
                   </div>
160
                   <div class="row">
160
                   <div class="row">
161
                     <section class="col col-12" style="width: 100%">
161
                     <section class="col col-12" style="width: 100%">
162
-                      <label class="label"
163
-                        >隐患整改验收信息<span style="color: red"
164
-                          >*</span
165
-                        ></label
166
-                      >
162
+                      <label class="label">隐患整改信息<span style="color: red"
163
+                        >*</span
164
+                      ></label>
167
                       <label class="input">
165
                       <label class="input">
168
                         <input
166
                         <input
167
+                          required
169
                           type="text"
168
                           type="text"
170
-                          ng-model="insertDanger.riskSolve"
169
+                          ng-model="insertDanger.solveCheckInfo"
171
                           ng-disabled="isNotEdit"
170
                           ng-disabled="isNotEdit"
172
-                          required
173
-                          name="riskSolve"
171
+                          name="solveCheckInfo"
174
                         />
172
                         />
175
                       </label>
173
                       </label>
176
                     </section>
174
                     </section>
@@ -193,13 +191,18 @@
193
                   </div>
191
                   </div>
194
                   <div class="row">
192
                   <div class="row">
195
                     <section class="col col-12" style="width: 100%">
193
                     <section class="col col-12" style="width: 100%">
196
-                      <label class="label">整改验收信息</label>
194
+                      <label class="label"
195
+                        >隐患整改验收信息<span style="color: red"
196
+                          >*</span
197
+                        ></label
198
+                      >
197
                       <label class="input">
199
                       <label class="input">
198
                         <input
200
                         <input
199
                           type="text"
201
                           type="text"
200
-                          ng-model="insertDanger.solveCheckInfo"
202
+                          ng-model="insertDanger.riskSolve"
201
                           ng-disabled="isNotEdit"
203
                           ng-disabled="isNotEdit"
202
-                          name="solveCheckInfo"
204
+                          required
205
+                          name="riskSolve"
203
                         />
206
                         />
204
                       </label>
207
                       </label>
205
                     </section>
208
                     </section>