日常检查-01

src/main/resources/static/app/storage/controller/dailyListCtrl.js

@@ -126,6 +126,7 @@ angular.module('app.storage')
                 $scope.dailycheck = data.dailycheck;
                 $scope.dailycheck.houseId = data.dailycheck.houseId;
                 $scope.dailycheck.checkTime = $filter('date')($scope.dailycheck.checkTime, "yyyy-MM-dd");
+                $scope.dailycheck.commitTime = $filter('date')($scope.dailycheck.commitTime, "yyyy-MM-dd HH:mm:ss"); //提交时间
                 $scope.change(0);//点击仓房切换货位
             },function(data){
 
@@ -233,7 +234,8 @@ angular.module('app.storage')
         }else {
             //$scope.getBasicData();
             $scope.dailycheck.checkTime = getNowFormatDate();
-            $scope.dailycheck.checker = $rootScope.userInfo.realName; //检验人
+            $scope.dailycheck.cyry = $rootScope.userInfo.realName; //提交人
+            $scope.dailycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss"); //提交时间
             $scope.dailycheck.rainCheck = "正常";
             $scope.dailycheck.rcdoor = "正常";
             $scope.dailycheck.rcwindow = "正常";

src/main/resources/static/app/storage/views/safeproduce/safeproduce-dailyList-add.html

@@ -74,10 +74,10 @@
 									</div>
 									<div class="row">
 										<section class="col col-3">
-											<label>检查人:<span style="color: red;">*</span></label>
+											<label>检查人员:<span style="color: red;">*</span></label>
 											<label class="input" style="padding-top:5px;">
 												<input type="text" ng-model="dailycheck.checker" name="checker" ng-readonly="isNotEdit"
-													   placeholder="检查人" required>
+													   placeholder="检查人员" required>
 
 											</label>
 										</section>
@@ -88,12 +88,26 @@
 													   placeholder="保管员" required disabled>
 											</label>
 										</section>
-										<section class="col col-3">
+										<!--<section class="col col-3">
 											<label>参与人员:<span style="color: red;">*</span></label>
 											<label class="input" style="padding-top:5px;">
 												<input type="text" ng-model="dailycheck.cyry" name="cyry" ng-readonly="isNotEdit"
 													   placeholder="参与人员" required>
 											</label>
+										</section>-->
+										<section class="col col-3">
+											<label>提交人:<span style="color: red;">*</span></label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.cyry" name="cyry" ng-readonly="true"
+													   placeholder="提交人" required>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label>提交时间:<span style="color: red;">*</span></label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.commitTime" name="commitTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="true"
+													   placeholder="提交时间" required>
+											</label>
 										</section>
 									</div>
 									<div class="row">
@@ -142,7 +156,7 @@
 										</section>
 									</div>
 								</fieldset>
-								<header>虫害检查</header>
+								<!--<header>虫害检查</header>
 								<fieldset>
 									<div class="row">
 										<section class="col col-3">
@@ -174,8 +188,8 @@
 										</section>
 
 									</div>
-								</fieldset>
-								<header>其它检查</header>
+								</fieldset>-->
+								<header>检查内容</header>
 								<fieldset>
 									<div class="row">
 										<section class="col col-3">

src/main/resources/static/app/storage/views/safeproduce/safeproduce-dailyList-list.html

@@ -14,7 +14,7 @@
 					</header>
 					<div>
 						<div class="widget-body no-padding">
-							<div id="DataTables_Table_1_wrapper"class="dataTables_wrapper form-inline no-footer">
+							<div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
 								<div class="dt-toolbar">
 									<div ng-hide="isArchive" class="col-xs-3 col-sm-1">
 										<a class="btn btn-primary btn-sm" ng-click="addDailyList()"><span class="fa fa-plus"></span>&nbsp;新&nbsp;增</a>
@@ -60,7 +60,7 @@
 											<th data-class="expand" class="text-center">货位名称</th>
 											<th data-hide="expand" class="text-center">粮油品种</th>
 											<th data-hide="expand" class="text-center">检查日期</th>
-											<th data-hide="expand" class="text-center">检查人</th>
+											<th data-hide="expand" class="text-center">检查人员</th>
 											
 											<th data-hide="expand" class="text-center">操作</th>
 										</tr>
@@ -68,17 +68,17 @@
 
 									<tbody>
 									<tr ng-repeat="dailycheck in pageInfo.list">
-											<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
-											<td>{{storehouseObj[dailycheck.houseId].storehouseName}}</td>
-											<td>{{warehouseObj[dailycheck.warehouseId].warehouseName}}</td>
-											<td>{{dicData[dailycheck.subType]}}</td>
-											<td>{{dailycheck.checkTime | date :'yyyy-MM-dd '}}</td>
-											<td>{{dailycheck.checker}}</td>
+											<td style="text-align:center;">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</td>
+											<td style="text-align:center;">{{storehouseObj[dailycheck.houseId].storehouseName}}</td>
+											<td style="text-align:center;">{{warehouseObj[dailycheck.warehouseId].warehouseName}}</td>
+											<td style="text-align:center;">{{dicData[dailycheck.subType]}}</td>
+											<td style="text-align:center;">{{dailycheck.checkTime | date :'yyyy-MM-dd '}}</td>
+											<td style="text-align:center;">{{dailycheck.checker}}</td>
 											
 											<td class="text-center">
 											    <a href-void ng-click="showViewOut(dailycheck.id)"><i class="fa fa-info-circle"></i>查看</a>
-												<a ng-hide="isArchive" has-permission="717" href-void ng-click="showEditFbe(dailycheck.id)"><i class="fa fa-edit"></i>修改</a>
-												<a ng-hide="isArchive" has-permission="718" href-void ng-click="remove(dailycheck.id)"><i class="fa fa-trash-o"></i>删除</a>
+												<!--<a ng-hide="isArchive" has-permission="717" href-void ng-click="showEditFbe(dailycheck.id)"><i class="fa fa-edit"></i>修改</a>
+												<a ng-hide="isArchive" has-permission="718" href-void ng-click="remove(dailycheck.id)"><i class="fa fa-trash-o"></i>删除</a>-->
 											</td>
 										</tr>
 									</tbody>