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

src/main/resources/static/app/basic/storehouse/controller/StorehouseCtrl.js

@@ -607,11 +607,11 @@ angular.module('app.basic')
 	];
 	// 挡粮门型式
 	$scope.dlmxsList = [
-		{ id: 1, value: "“一字型”挡粮板" },
-		{ id: 2, value: "“三角形”挡粮门" },
-		{ id: 3, value: "“弧形”挡粮门" },
-		{ id: 4, value: "围包" },
-		{ id: 5, value: "其它型式" },
+		{ id: "1", value: "“一字型”挡粮板" },
+		{ id: "2", value: "“三角形”挡粮门" },
+		{ id: "3", value: "“弧形”挡粮门" },
+		{ id: "4", value: "围包" },
+		{ id: "5", value: "其它型式" },
 	];
 	//添加货位弹出窗口
 	$scope.editRow = function(warehouse, btnType) {

src/main/resources/static/app/basic/storehouse/views/Storehouse-edit.html

@@ -43,7 +43,8 @@
 													<input type="text" ng-model="basicStorehouse.depotName" name="depotName" ng-readonly="true">
 												</label>
 												<label class="select" ng-hide="basicStorehouse.libraryType == 0">
-													<select ng-model="basicStorehouse.depotId" required ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit"
+													<select ng-model="basicStorehouse.depotId" required 
+													 ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit"
 															ng-options="depot.depotId as depot.depotName for depot in depotList" id="depotId"
 															class="form-control">
 														<option value="">--请选择--</option>
@@ -77,7 +78,10 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="basicStorehouse.dutystoreman" required ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit" />
+													<input type="text" ng-model="basicStorehouse.dutystoreman" required 
+													name="dutystoreman"
+													ng-disabled="isNotEdit" />
+													<!-- ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit" -->
 												</label>
 											</th>
 											<th>
@@ -497,6 +501,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.ywfhfbfdss" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum" required
+														name="ywfhfbfdss"
 														class="form-control">
 													</select>
 												</label>
@@ -508,6 +513,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.nfszcc" ng-disabled="isNotEdit" required
 														ng-options="enum.id as enum.value for enum in falseEnum"
+														name="nfszcc"
 														class="form-control">
 													</select>
 												</label>
@@ -519,6 +525,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.ywfsfqfczz" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum" required
+														name="ywfsfqfczz"
 														class="form-control">
 													</select>
 												</label>
@@ -554,6 +561,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.ywjxtfss" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum" required
+														name="ywjxtfss"
 														class="form-control">
 													</select>
 												</label>
@@ -565,6 +573,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.nfhlxzsc" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum" required
+														name="nfhlxzsc"
 														class="form-control">
 													</select>
 												</label>
@@ -576,6 +585,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.nffddyqtcl" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum" required
+														name="nffddyqtcl"
 														class="form-control">
 													</select>
 												</label>
@@ -600,6 +610,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.clgx" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in clgxList" required
+														name="clgx"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -612,6 +623,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.nfgrbw" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum" required
+														name="nfgrbw"
 														class="form-control">
 													</select>
 												</label>
@@ -622,7 +634,9 @@
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.grxn" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in grxnList" required
+														ng-options="enum.id as enum.value for enum in grxnList" 
+														name="grxn"
+														required
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -636,8 +650,10 @@
 											</th>
 											<th>
 												<label class="select">
-													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in jgclList" required
+													<select ng-model="basicStorehouse.qmx" ng-disabled="isNotEdit"
+														ng-options="enum.id as enum.value for enum in jgclList" 
+														name="qmx"
+														required
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -650,6 +666,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in qmxList" required
+														name="jgcl"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -661,7 +678,8 @@
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.lqjs" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in lqjsList" required
+														ng-options="enum.id as enum.value for enum in lqjsList" 
+														name="lqjs"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -673,7 +691,8 @@
 											<th>
 												<label class="select">
 													<select ng-model="basicStorehouse.tfxtxs" ng-disabled="isNotEdit"
-														ng-options="enum.id as enum.value for enum in lqjsList" required
+														ng-options="enum.id as enum.value for enum in tfxtxsList" required
+														name="tfxtxs"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -686,8 +705,9 @@
 											</th>
 											<th>
 												<label class="select">
-													<select ng-model="basicStorehouse.tfxtxs" ng-disabled="isNotEdit"
+													<select ng-model="basicStorehouse.tfjs" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in tfjsList" required
+														name="tfjs"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -700,6 +720,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.scjs" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in scjsList" required
+														name="scjs"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -712,6 +733,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.kwjs" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in kwjsList" required
+														name="kwjs"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -724,6 +746,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.sfyjxxxhgz" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in falseEnum2" required
+														name="sfyjxxxhgz"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>
@@ -738,6 +761,7 @@
 												<label class="select">
 													<select ng-model="basicStorehouse.dlmxs" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in dlmxsList" required
+														name="dlmxs"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>

src/main/resources/static/app/business/facility/views/add-facility-get.html

@@ -24,13 +24,14 @@
                                                     ng-disabled="isNotEdit" 
                                                     ng-readonly="isNotEdit"
                                                     ng-change="useKeepChange()"
+													required
                                                 >
 													<option value="">--请选择--</option>
                                                 </select> 
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label">设施分类：<span style="color: red;">*</span></label>
+											<label class="label">设施分类：</label>
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -52,7 +53,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-3">
-											<label class="label">故障日期：</label>
+											<label class="label">故障日期：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input 
                                                     id="repairInfo_gzrq" 
@@ -62,11 +63,12 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="故障日期："
+													required
                                                 >
 											</label>
 										</section>
                                         <section class="col col-3">
-											<label class="label">维修开始日期：</label>
+											<label class="label">维修开始日期：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input 
                                                     id="repairInfo_wxksrq" 
@@ -76,6 +78,7 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="维修开始日期"
+													required
                                                 >
 											</label>
 										</section>
@@ -94,9 +97,9 @@
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">维修负责人: </label>
+											<label class="label">维修负责人: <span style="color: red;">*</span></label>
 											<label class="input">
-												<input type="text" ng-model="repairInfo.wxfzr" name="wxfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="维修负责人">
+												<input required type="text" ng-model="repairInfo.wxfzr" name="wxfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="维修负责人">
 											</label>
 										</section>
                                     </div>

src/main/resources/static/app/business/facility/views/add-facility-keep.html

@@ -24,13 +24,14 @@
                                                     ng-disabled="isNotEdit" 
                                                     ng-readonly="isNotEdit"
                                                     ng-change="useKeepChange()"
+                                                    required
                                                 >
 													<option value="">--请选择--</option>
                                                 </select> 
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label">设施分类：<span style="color: red;">*</span></label>
+											<label class="label">设施分类：</label>
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -52,7 +53,7 @@
 									</div>
 									<div class="row">
                                         <section class="col col-3">
-											<label class="label">保养开始日期：</label>
+											<label class="label">保养开始日期：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input 
                                                     id="keepInfo_byksrq" 
@@ -62,11 +63,12 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="保养开始日期"
+                                                    required
                                                 >
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">保养结束日期:</label>
+											<label class="label">保养结束日期:<span style="color: red;">*</span></label>
 											<label class="input">
                                                 <input 
                                                     id="keepInfo_byjsrq" 
@@ -76,13 +78,14 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="保养结束日期"
+                                                    required
                                                 >
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">保养负责人: </label>
+											<label class="label">保养负责人:<span style="color: red;">*</span> </label>
 											<label class="input">
-												<input type="text" ng-model="keepInfo.byfzr" name="byfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="保养负责人">
+												<input type="text" ng-model="keepInfo.byfzr" name="byfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="保养负责人" required>
 											</label>
 										</section>
                                     </div>

src/main/resources/static/app/business/facility/views/add-facility-scrap.html

@@ -24,7 +24,7 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label"  id="devicename-label">设施类型：<span style="color: red;">*</span></label>
+											<label class="label"  id="devicename-label">设施类型：</label>
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -37,7 +37,7 @@
 					                            data-default-label="请选择" name="deviceName" 
 					                            multi-select="false"
 					                            select-only-leafs="true"
-					                            data-callback="selectOnly1Or2(item, selectedItems)" required>
+					                            data-callback="selectOnly1Or2(item, selectedItems)">
 					                        </multi-select-tree>
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
 											</label>
@@ -45,7 +45,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-3">
-											<label class="label">设施状态</label>
+											<label class="label">设施状态: <span style="color: red;">*</span></label>
 											<label class="input">
 												<select required name="unite" ng-model="device.unit" ng-disabled="isNotEdit" ng-readonly="isNotEdit">
                                                     <option value="">--请选择--</option>
@@ -55,9 +55,9 @@
 											</label>
 										</section>
                                         <section class="col col-3">
-											<label class="label">报废日期：</label>
+											<label class="label">报废日期：<span style="color: red;">*</span></label>
 											<label class="input">
-												<input type="text" ng-model="device.inputTime" name="inputTime" data-smart-datepicker ng-disabled="isNotEdit"
+												<input required type="text" ng-model="device.inputTime" name="inputTime" data-smart-datepicker ng-disabled="isNotEdit"
 													   placeholder="报废日期">
 											</label>
 										</section>

src/main/resources/static/app/business/facility/views/add-facility.html

@@ -20,7 +20,7 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label"  id="devicename-label">设施分类：<span style="color: red;">*</span></label>
+											<label class="label"  id="devicename-label">设施分类：</label>
 											  <label class="select" id="deviceName-label">
 											 <multi-select-tree 
 					                            disabled-tree="isNotEdit"
@@ -29,7 +29,7 @@
 					                            data-default-label="请选择" name="ssfl" 
 					                            multi-select="false"
 					                            select-only-leafs="true"
-					                            data-callback="selectOnly1Or2(item, selectedItems)" required>
+					                            data-callback="selectOnly1Or2(item, selectedItems)">
 					                        </multi-select-tree>
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
 											</label>
@@ -49,31 +49,31 @@
 									</div>
 									<div class="row">
                                         <section class="col col-3">
-											<label class="label">竣工年份：</label>
+											<label class="label">竣工年份：<span style="color: red;">*</span></label>
 											<label class="input">
                                                 <input type="text" name="jgnf" id="facility_jgnf" ng-disabled="isNotEdit" ng-model="facilityInfo.jgnf"
-							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true">
+							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true" required>
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">安装时间：</label>
+											<label class="label">安装时间：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" id="facility_azsj" name="azsj" ng-disabled="isNotEdit"  ng-model="facilityInfo.azsj"
-													   placeholder="安装时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
+													   placeholder="安装时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">调试时间: </label>
+											<label class="label">调试时间: <span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" id="facility_tssj" name="tssj" ng-disabled="isNotEdit" ng-model="facilityInfo.tssj"
-													   placeholder="调试时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
+													   placeholder="调试时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
 											</label>
 										</section>
                                         <section class="col col-3">
-											<label class="label">验收时间：</label>
+											<label class="label">验收时间：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" id="facility_yssj" name="yssj" ng-disabled="isNotEdit" ng-model="facilityInfo.yssj"
-													   placeholder="验收时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
+													   placeholder="验收时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
 											</label>
 										</section>
                                     </div>

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/controller/keepAccount/houseKeepAccountCtrl.js

@@ -301,7 +301,7 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 	$scope.loadWare();
 
 
-	// $scope.butType = $stateParams.butType;
+	$scope.butType = $stateParams.butType;
 	$scope.edit = function() {
 		$scope.fcbgz = angular.fromJson($stateParams.account);
 		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");

src/main/resources/static/app/storage/controller/keepAccount/keepTotalAccountCtrl.js

@@ -125,7 +125,7 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 })
 .controller("keepTotalAccountEditCtrl", 
 		function($scope, $rootScope, $state, $stateParams, $filter, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
-
+	$scope.butType = $stateParams.butType;
 	// 获取列表日数据
 	$scope.edit = function() {
 		$scope.fcbgz = angular.fromJson($stateParams.account);

src/main/resources/static/app/storage/controller/keepAccount/keepVoucherCtrl.js

@@ -1,209 +0,0 @@
-"use strict";
-
-//保管总账
-angular.module('app.storage').controller("keepVoucherCtrl", 
-		function($scope, $rootScope, $state, $stateParams, $filter, enumService, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
-
-	// 获取列表数据
-	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.search = {lspz:"", lsxz:"", startDate:"", endDate:""};
-	$scope.loadData = function() {
-		if($scope.search.lsxz != undefined && $scope.search.lsxz != ""){
-			$scope.search.lsxz = $scope.search.lsxz[0].id;
-   	 	}
-		keepAccountService.getSumAccountPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function(data){
-	        $scope.pageInfo = data;
-	        $scope.deptName = $rootScope.depotInfo.orgName;
-	        //获取记账人和审核人
-	        //$scope.getAccountRecord($scope.pageInfo.list);
-	    },function(data){
-	        console.log(data);
-	    });
-		//加载打印区域的数据
-		keepAccountService.getSumAccountPageInfo(null, null, $scope.search).then(function(data){
-	        $scope.pageInfos = data;
-	        $scope.printList = data.list;
-	        //获取记账人和审核人
-	        //$scope.getAccountRecord($scope.printList);
-	    },function(data){
-	        console.log(data);
-	    });
-		// 树形下拉框(粮食性质)
-        enumService.getTreeListByTypeId($scope.search.lsxz, 1032).then(function(data) {
-        	var data_new = $scope.data_add(data);
-            $scope.grainAttributeTreeData = data_new;
-        },function(data) {
-            console.log(data);
-        });
-	}
-	$scope.loadData();
-
-	$scope.data_add = function(data) {
-    	//var data_new = $scope.data_add(data);
-		var e = [];
-    	if (data.length != 0) {
-    		//要插入的json对象串
-    		var a = {"id":null,"name":"请选择","children":[]};
-    		//将返回的json对象和要插入的json对象串转换为字符串格式
-    		var f = angular.toJson(a);
-    		var b = angular.toJson(data);
-    		//把要插入的json对象串插入返回数据的最前面
-    		var c = b.substring(0,1);
-    		var d = b.substring(1,b.length);
-    		e = c + f + "," + d;
-    	}
-    	//最后在转换为json对象返回去
-    	return angular.fromJson(e);
-	}
-
-	$scope.getAccountRecord = function (pageInfo) {
-		if (pageInfo != null || pageInfo.length != 0) {
-			var obj;
-			var rq;
-			for (var i = 0; i < pageInfo.length; i++) {
-				obj = pageInfo[0];
-				rq = $filter('date')(obj.rq, "yyyy-MM");
-				keepAccountService.accountingRecord(obj.ch, obj.hwh, obj.lspz, obj.hwxz, rq, obj.wjh, obj.remark, 1).then(function(data){
-					$scope.account = data.obj;
-					obj.accountingPerson = $scope.account.accountingPerson;//记账人
-					obj.auditor = $scope.account.auditor;//审核人
-				},function(data){
-					console.log(data);
-				});
-			}
-		}
-	}
-
-	// 翻页
-	$scope.goPage = function(pageNum) {
-		$scope.pageInfo.pageNum = pageNum;
-		$scope.loadData();
-	}
-
-    //页面跳转
-    $scope.edit = function(account, butType) {
-		var obj_str = angular.toJson(account);
-		$scope.fcbgz = angular.fromJson(obj_str);
-		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
-		if (butType != 3) { //记账、审核、查看
-			keepAccountService.accountingRecord(null, null, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
-				$scope.account = data.obj;
-				if (butType == 0) { //记账
-					if (data.obj.id != null || data.obj.id != undefined) {
-						alert("当前记录已记账！");
-						return;
-					}
-				} else if (butType == 1) { //审核
-					if (data.obj.id == null || data.obj.id == undefined) {
-						alert("当前记录还尚未记账，请先记账！");
-						return;
-					} else {
-						if (data.obj.auditor != null || data.obj.auditor != undefined) {
-							alert("当前记录已审核！");
-							return;
-						}
-					}
-				} else if (butType == 2) { //查看
-					if (data.obj.id == null || data.obj.id == undefined) {
-						alert("当前记录还尚未记账，请先记账！");
-						return;
-					}
-				}
-				$state.go('app.storage.account.keepTotalAccount.keepTotalAccountEdit',{account:angular.toJson(account), butType:butType});
-			},function(data){
-		        console.log(data);
-		    });
-		} else { //分仓账
-			$state.go('app.storage.account.houseKeepAccount',{account:angular.toJson(account), type:butType});
-		}
-	}
-	//打印
-	$scope.print = function() {
-		$("#print").printArea();
-	}
-	
-})
-.controller("keepTotalAccountEditCtrl", 
-		function($scope, $rootScope, $state, $stateParams, $filter, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
-
-	// 获取列表日数据
-	$scope.edit = function() {
-		$scope.fcbgz = angular.fromJson($stateParams.account);
-		$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
-		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
-		keepAccountService.accountingRecord($scope.fcbgz.ch, $scope.fcbgz.hwh, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
-			$scope.account = data.obj;
-
-			if ($stateParams.butType == 0) { //记账
-				//初始化数据记账表对象数据
-				$scope.account.lspz = $scope.fcbgz.lspz;
-				$scope.account.hwxz = $scope.fcbgz.hwxz;
-				$scope.account.rq = rq;
-				$scope.account.srsl = $scope.fcbgz.srsl;
-				$scope.account.zcsl = $scope.fcbgz.zcsl;
-				$scope.account.kcsl = $scope.fcbgz.kcsl;
-				$scope.account.accountingPerson = $rootScope.userInfo.realName; //记账人
-				$scope.account.accountingDate = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
-				$scope.account.remark = $scope.fcbgz.remark; //摘要
-				$scope.account.wjh = $scope.fcbgz.wjh; //文件号
-				//设置状态为记账
-				//$scope.accountType = 0;
-
-				//影藏审核信息
-				$scope.auditor_th = true;
-			} else if ($stateParams.butType == 1) { //审核
-				//设置记账时间格式化和不可编辑
-				$scope.account.accountingDate = $filter('date')($scope.account.accountingDate, "yyyy-MM-dd");
-				$scope.accounting_isNotEdit = true;
-				//显示审核信息
-				$scope.auditor_th = false;
-				//设置审核人为当前用户，审核时间为当前时间
-				$scope.account.auditor = $rootScope.userInfo.realName;
-				$scope.account.auditorDate = $filter('date')(new Date(), "yyyy-MM-dd");
-			} else if ($stateParams.butType == 2) { //查看
-				//设置记账时间格式化和不可编辑
-				$scope.account.accountingDate = $filter('date')($scope.account.accountingDate, "yyyy-MM-dd");
-				$scope.accounting_isNotEdit = true;
-				//显示审核信息
-				$scope.auditor_th = false;
-				//审核信息设置不可编辑
-				$scope.account.auditorDate = $filter('date')($scope.account.auditorDate, "yyyy-MM-dd");
-				$scope.auditor_isNotEdit = true;
-				//提交按钮影藏
-				$scope.isNotEdit = true;
-			}
-			//初始分仓保管账表对象数据
-			$scope.fcbgz.hwxz = $rootScope.dicData[$scope.fcbgz.hwxz];
-			$scope.fcbgz.lspz = $rootScope.dicData[$scope.fcbgz.lspz];
-			$scope.fcbgz.dj = $rootScope.dicData[$scope.fcbgz.dj];
-			$scope.fcbgz.rq = rq;
-		},function(data){
-	        console.log(data);
-	    });
-
-	}
-	$scope.edit();
-	
-	//提交
-	$scope.submit = function() {
-		keepAccountService.submit($scope.account, 1, $rootScope.orgInfo.orgId).then(function(data){
-			if (data.status = 'success') {
-				alert(data.msg);
-			} else {
-				alert("保存失败！");
-			}
-			$scope.retList();
-		},function(data){
-			alert("保存失败！");
-	    });
-	}
-	
-	//返回
-    $scope.retList = function () {
-		if ($rootScope.previousState_name != '') {
-        	$rootScope.back();
-        } else {
-        	$state.go('app.storage.account.keepTotalAccount');
-        }
-    }
-});

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

@@ -4,7 +4,7 @@ angular
   .module("app.storage")
   .controller(
     "safeProduceDangerHandle",
-    function ($scope, $state, $rootScope, safeDangerHandleService) {
+    function ($scope, $state, $rootScope, safeDangerHandleService, $filter) {
       $scope.pageInfo = { pageNum: 1, pageSize: 10 };
       $scope.orgName = $rootScope.depotInfo.orgName;
       $scope.loadData = function () {
@@ -86,7 +86,8 @@ angular
       $rootScope,
       safeDangerHandleService,
       StorehouseService,
-      $stateParams
+      $stateParams,
+      $filter
     ) {
       $scope.orgName = $rootScope.depotInfo.orgName;
       $scope.insertDanger = {
@@ -129,6 +130,10 @@ angular
             .queryById($stateParams.id)
             .then(function (data) {
               $scope.insertDanger = data.data;
+              if($scope.insertDanger.solveTime) {
+                $scope.insertDanger.solveTime = $filter('date')($scope.insertDanger.solveTime, "yyyy-MM-dd");
+                $scope.insertDanger.solveTime = $scope.insertDanger.solveTime.slice(0, 10);
+              }
             });
         }
       };

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/storage/views/safeproduce/safeDangerHandle-edit.html

@@ -51,7 +51,7 @@
                     </section>
                     <section class="form-group col col-3">
                       <label class="label"
-                        >整改时限<span style="color: red">*</span></label
+                        >整改时限</label
                       >
                       <label class="select">
                         <input
@@ -159,18 +159,16 @@
                   </div>
                   <div class="row">
                     <section class="col col-12" style="width: 100%">
-                      <label class="label"
-                        >隐患整改验收信息<span style="color: red"
-                          >*</span
-                        ></label
-                      >
+                      <label class="label">隐患整改信息<span style="color: red"
+                        >*</span
+                      ></label>
                       <label class="input">
                         <input
+                          required
                           type="text"
-                          ng-model="insertDanger.riskSolve"
+                          ng-model="insertDanger.solveCheckInfo"
                           ng-disabled="isNotEdit"
-                          required
-                          name="riskSolve"
+                          name="solveCheckInfo"
                         />
                       </label>
                     </section>
@@ -193,13 +191,18 @@
                   </div>
                   <div class="row">
                     <section class="col col-12" style="width: 100%">
-                      <label class="label">整改验收信息</label>
+                      <label class="label"
+                        >隐患整改验收信息<span style="color: red"
+                          >*</span
+                        ></label
+                      >
                       <label class="input">
                         <input
                           type="text"
-                          ng-model="insertDanger.solveCheckInfo"
+                          ng-model="insertDanger.riskSolve"
                           ng-disabled="isNotEdit"
-                          name="solveCheckInfo"
+                          required
+                          name="riskSolve"
                         />
                       </label>
                     </section>