Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/business/purchase/controller/purchaseListCtrl.js

@@ -13,6 +13,13 @@ angular.module('app.supervise').controller("purchaseListCtrl", function ($scope,
 	};
 	$scope.loadData();
 
+	$scope.goPage = function(pageNum) {
+		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+			$scope.pageInfo.pageNum = pageNum;
+			$scope.loadData();
+		}
+	}
+
 	$scope.addRow = function() {
 		$state.go("app.business.gxhttz-add", {
 			info: 0,

src/main/resources/static/app/intelligent/aeration/views/aerationJob-edit.html

@@ -359,13 +359,10 @@
 													<select ng-model="aerationJob.fwszfs" required name="fwszfs"
 													class="form-control" ng-disabled="isNotEdit">
 														<option value="">--请选择--</option>
-														<option value="1">地槽</option>
-														<option value="2">地上笼</option>
-														<option value="3">移动式</option>
-														<option value="4">箱式</option>
-														<option value="5">径向</option>
-														<option value="6">维持通风</option>
-														<option value="9">其他</option>
+														<option value="1">地上槽</option>
+														<option value="2">地下槽</option>
+														<option value="3">横向</option>
+														<option value="4">径向</option>
 													</select>
 												</label>
 											</th>

src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthCtrl.js

@@ -29,6 +29,15 @@ angular.module('app.storage').controller("monthCtrl", function ($scope, $rootSco
 	};
 	$scope.loadData();
 
+
+	// 翻页
+	$scope.goPage = function(pageNum) {
+		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+			 $scope.pageInfo.pageNum = pageNum;
+			 $scope.loadData();
+		 }
+	}
+
 	$scope.addRow = function() {
 		$state.go("app.storage.foodstuffAnalysis.month-detail", {
 			id: 0,

src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthDetailCtrl.js

@@ -96,7 +96,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
 						swjcbzqk: '',
 						swjcsgqk: '',
 						clfahclxg: '',
-						jcsj: e.updatetime
+						jcsj: e.tTime
 					})
 				}
 				$scope.form.grainAnalysisAbnormalList = arr2
@@ -114,7 +114,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
 		$scope.form.bh = 'YB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
 		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
 		$scope.form.lkmc = $rootScope.orgInfo.orgName
-		$scope.form.tjr = $rootScope.orgInfo.orgName
+		$scope.form.tjr = $rootScope.userInfo.realName
 	}
 
 	var validator = $("#violation-form").validate();

src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterCtrl.js

@@ -48,6 +48,14 @@ angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootS
 	};
 	$scope.loadData();
 
+	// 翻页
+	$scope.goPage = function(pageNum) {
+		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+			 $scope.pageInfo.pageNum = pageNum;
+			 $scope.loadData();
+		 }
+	}
+
 	$scope.addRow = function() {
 		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
 			id: 0,

src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterDetailCtrl.js

@@ -96,7 +96,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
 						swjcbzqk: '',
 						swjcsgqk: '',
 						clfahclxg: '',
-						jcsj: e.updatetime
+						jcsj: e.tTime
 					})
 				}
 				$scope.form.grainAnalysisAbnormalList = arr2
@@ -114,7 +114,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
 		$scope.form.bh = 'JB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
 		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
 		$scope.form.lkmc = $rootScope.orgInfo.orgName
-		$scope.form.tjr = $rootScope.orgInfo.orgName
+		$scope.form.tjr = $rootScope.userInfo.realName
 	}
 
 	var validator = $("#violation-form").validate();

src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekCtrl.js

@@ -20,6 +20,15 @@ angular.module('app.storage').controller("weekCtrl", function ($scope, $rootScop
 	};
 	$scope.loadData();
 
+
+	// 翻页
+	$scope.goPage = function(pageNum) {
+		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+			 $scope.pageInfo.pageNum = pageNum;
+			 $scope.loadData();
+		 }
+	}
+	
 	$scope.addRow = function() {
 		$state.go("app.storage.foodstuffAnalysis.week-detail", {
 			id: 0,

src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekDetailCtrl.js

@@ -87,7 +87,7 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
 						swjcbzqk: '',
 						swjcsgqk: '',
 						clfahclxg: '',
-						jcsj: e.updatetime
+						jcsj: e.tTime
 					})
 				}
 				$scope.form.grainAnalysisAbnormalList = arr
@@ -106,7 +106,7 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
 		$scope.form.bh = 'ZB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
 		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
 		$scope.form.lkmc = $rootScope.orgInfo.orgName
-		$scope.form.tjr = $rootScope.orgInfo.orgName
+		$scope.form.tjr = $rootScope.userInfo.realName
 	}
 	var validator = $("#violation-form").validate();
 	$scope.save = function() {

src/main/resources/static/app/storage/foodstuffAnalysis/views/monthDetail.html

@@ -234,8 +234,7 @@
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
 												<th>
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
-														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
-														2019-10-06
+														{{ item.jcsj }}
 													</label>
 												</th>
 												<th>

src/main/resources/static/app/storage/foodstuffAnalysis/views/quarterDetail.html

@@ -234,8 +234,7 @@
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
 												<th>
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
-														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
-														2019-10-06
+														{{ item.jcsj }}
 													</label>
 												</th>
 												<th>

src/main/resources/static/app/storage/foodstuffAnalysis/views/weekDetail.html

@@ -250,8 +250,7 @@
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
 												<th>
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
-														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
-														2019-10-06
+														{{ item.jcsj }}
 													</label>
 												</th>
 												<th>

src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -378,7 +378,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内宽</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.width}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate | date:'yyyy-MM-dd'}}</td>
                                                 
                                                 <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
 
@@ -423,9 +423,9 @@
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">状态</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封死</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.storeType == 1 ? "直储" : "代储"}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">计价数量</td>
@@ -435,11 +435,11 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.slice(0, 4)}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.looseGrainVolume}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainPacks}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
                                             </tr>
                                             <!-- <tr>
                                                 
@@ -461,7 +461,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计仓容</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designCapacity}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">备注</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{grainCardView.remark}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{GrainCardByIdObj.remark}}</td>
                                             </tr>
                                            
                                             <table class="table table-striped table-bordered table-hover"

src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -27,7 +27,7 @@
                                     <table class="table table-striped table-bordered table-hover" width="100%">
                                         <tr>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">仓房名称:<span style="color: red;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
@@ -43,7 +43,7 @@
                                                 </section>
                                             </th>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">货位名称<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">货位名称:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
@@ -59,7 +59,7 @@
                                                 </section>
                                             </th>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种:<span style="color: red;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
@@ -72,7 +72,7 @@
                                         </tr>
                                         <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期:<span style="color: red;">*</span></label>
                                             </th>
                                             <th>
                                                 <section>
@@ -84,7 +84,7 @@
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">类型<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">类型:<span style="color: red;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
@@ -99,7 +99,7 @@
                                                 </section>
                                             </th>
                                             <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨):</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
@@ -110,9 +110,51 @@
                                                 </section>
                                             </th>
                                         </tr>
+
+
+                                        <tr>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.looseGrainVolume"
+                                                               name="looseGrainVolume" class="form-control">
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="select">
+                                                        <select ng-model="grainCard.storeType" name="storeType">
+                                                            <option value="">--请选择--</option>
+                                                            <option value="1">直储</option>
+                                                            <option value="2">代储</option>
+                                                        </select><i></i>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th style="border-bottom-width:1px">
+                                                <label class="label" style="margin-top: 9px;text-align: center;">包存粮包数:</label>
+                                            </th>
+                                            <th style="border-bottom-width:1px">
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.grainPacks"
+                                                               name="grainPacks" class="form-control">
+                                                    </label>
+                                                </section>
+                                            </th>
+                                        </tr>
+
+                                        
                                         <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
@@ -123,7 +165,7 @@
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;white-space: nowrap;">轮换协议编号:</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
@@ -133,7 +175,33 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th colspan="2"></th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
+                                            </th>
+                                            <th style="border-bottom-width:1px">
+                                                <section>
+                                                    <label class="select">
+                                                        <select ng-model="grainCard.grainRights" name="grainRights" required>
+                                                            <option value="">--请选择--</option>
+                                                            <option value="1">市粮食局</option>
+                                                            <option value="2">{{orgInfo.orgName}}</option>
+                                                        </select><i></i>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                        </tr>
+                                        <tr>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
+                                            </th>
+                                            <th style="border-bottom-width:1px" colspan="5">
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.remark"
+                                                               name="remark" class="form-control">
+                                                    </label>
+                                                </section>
+                                            </th>
                                         </tr>
                                     </table>
                                     <div>

src/main/resources/static/app/supervise/controller/humidityWarningThresholdCtrl.js

@@ -20,6 +20,14 @@ angular.module('app.supervise')
 		};
 		$scope.loadData();
 
+
+		$scope.goPage = function(pageNum) {
+			if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+				$scope.pageInfo.pageNum = pageNum;
+				$scope.loadData();
+			}
+		}
+		
 		// 打印
 		$scope.print = function () {
 			$("#print").printArea();

src/main/resources/static/app/supervise/controller/violationWarningListCtrl.js

@@ -6,7 +6,7 @@ angular.module('app.supervise')
 		$scope.search = {
 			startDate: '',
 			endDate: '',
-			violationType: '疑转圈粮预警',
+			violationType: 1,
 		}
 		// 默认分页
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};

src/main/resources/static/app/supervise/views/storeWarningThreshold.html

@@ -49,10 +49,10 @@
 												<td style="text-align:center;">{{ warning.level }}</td>
 												<td style="text-align:center;">{{ warning.inventoryQuantity }}</td>
 												<td style="text-align:center;">
-													{{ warning.fcTime | date:'yyyy-MM-dd HH:mm:ss' }}
+													{{ warning.fcTime.split(' ')[0] }}
 												</td>
 												<td style="text-align:center;">{{ warning.limitYear }}</td>
-												<td style="text-align:center;">{{ warning.cznx | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+												<td style="text-align:center;">{{ warning.cznx | date:'yyyy-MM-dd' }}</td>
 											</tr>
 										</tbody>
 									</table>

src/main/resources/static/app/supervise/views/violationDetail.html

@@ -47,7 +47,7 @@
 										<section class="col col-3">
                                             <label class="label">违规类型：<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select ng-model="form.violationType" name="violationType" ng-options="item for item in ['疑转圈粮预警']" required>
+                                                <select ng-model="form.violationType" name="violationType" ng-options="item.value as item.label for item in [{value: 1, label:'疑转圈粮预警'}]" required>
                                                 </select><i></i>
                                             </label>
                                         </section>

src/main/resources/static/app/supervise/views/violationWarningList.html

@@ -19,9 +19,8 @@
 										<label>
 											违规类型:
 											<select ng-model="search.violationType"
-											ng-options="num as num for num in ['疑转圈粮预警']"
+											ng-options="item.value as item.label for item in [{value: 1, label:'疑转圈粮预警'}]"
 											class="form-control input-sm">
-											
 										</select>
 										</label>
 										&nbsp;&nbsp;