1

src/main/resources/static/app/business/deliveryStorageNotice/controller/grainDeliveryStorageNoticeSaveCtrl.js

@@ -139,6 +139,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                             console.log(data);
                         });
                     } else {//入库
+                    	$scope.y_lyxz = ele1.grainAttribute;
                     	ele1.grainAttribute = 3052;
                     	$scope.settzdData(ele1, result);
                     }
@@ -558,7 +559,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                     contract_obj.grainKind = result.lypz;
                     contract_obj.grainDetailKind = result.mxpz;
                     contract_obj.grainGrade = result.lydj;
-                    //contract_obj.grainAttribute = result.lyxz; 
+                    $scope.y_lyxz = result.lyxz; 
                     contract_obj.grainAttribute = 3052;
                     contract_obj.grainAnnual = result.shnd;
                     contract_obj.grainProducingArea = result.lycd;
@@ -1274,7 +1275,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                                     	//当选择出库通知单时，平台校验是否该企业存在状态为“入库中”的仓房，
                                     	//如果有，则在库级屏幕中央显示提示弹窗“预计出现同时出入库作业情况，请提前报送报备手续至市粮食储备有限公司”。
                                     	//要求显示20秒后自动关闭提示弹窗。
-                                    	if (variable == "1") {
+                                    	if (variable == "1" && $scope.y_lyxz == 6877) {
                                     		warehouseService.getCrkStatusList(0, 2, $rootScope.orgInfo.orgId).then(function(data){
                                     			if (data.length > 0) {
                                     				var showConfim=document.getElementById("crkStatusAlert");
@@ -1304,7 +1305,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                                         $scope.saveFlag = false;
                                     }
                                 }else{
-                                	if (variable == "1") {
+                                	if (variable == "1" && $scope.y_lyxz == 6877) {
                                 		warehouseService.getCrkStatusList(0, 2, $rootScope.orgInfo.orgId).then(function(data){
                                             if (data.length > 0) {
                                             	var showConfim=document.getElementById("crkStatusAlert");

src/main/resources/static/app/business/device/views/deviceStorage-edit.html

@@ -85,7 +85,7 @@
 
                                         <div class="row">
                                             <section class="col col-3">
-                                                <label class="label">单价(万元)<span style="color: red;">*</span></label>
+                                                <label class="label">单价(元)<span style="color: red;">*</span></label>
                                                 <label class="input">
                                                     <input type="text" ng-model="dSbxxsjy.cgjg" name="cgjg" ng-readonly="isNotEdit" required
                                                            placeholder="单价" validDouble="true" />
@@ -267,7 +267,7 @@
                                                 </label>
                                             </section>
                                             <section class="col col-3">
-                                                <label class="label">单价(万元)：<span style="color: red;">*</span></label>
+                                                <label class="label">单价(元)：<span style="color: red;">*</span></label>
                                                 <label class="input">
                                                     <input type="text" ng-model="dSbxxsjy.cgjg" name="cgjg" ng-readonly="isNotEdit"
                                                            placeholder="单价" validDouble="true" required />

src/main/resources/static/app/storage/grainAnalysis/controller/monthAnalysisCtrl.js

@@ -55,7 +55,7 @@ angular.module('app.storage')
 		// 回调函数.
 		modalInstance.result.then(function (result) {
 			if (result != null) {
-				$state.go('app.storage.grainAnalysis.houseMonthAnalysisList', {id:result, butType:'update'});
+				$state.go('app.storage.grainAnalysis.yl.houseMonthAnalysisList', {id:result, butType:'update'});
 			}
 		}, function (reason) {
 			console.log(reason);
@@ -64,7 +64,7 @@ angular.module('app.storage')
 
     //查看和编辑跳转的页面
     $scope.edit = function(id, butType) {
-    	$state.go('app.storage.grainAnalysis.houseMonthAnalysisList', {id:id, butType:butType});
+    	$state.go('app.storage.grainAnalysis.yl.houseMonthAnalysisList', {id:id, butType:butType});
     }
 
     //删除一条报表
@@ -104,7 +104,7 @@ angular.module('app.storage')
 
     //单仓分析数据编辑、查看
     $scope.edit = function(obj, butType) {
-    	$state.go("app.storage.grainAnalysis.monthEdit", {
+    	$state.go("app.storage.grainAnalysis.yl.monthEdit", {
 			id: obj.id,
 			butType: butType,
 			gnly_butType: $stateParams.butType
@@ -130,7 +130,7 @@ angular.module('app.storage')
     
     //取消或返回
     $scope.retList = function () {
-    	$state.go('app.storage.grainAnalysis.monthList');
+    	$state.go('app.storage.grainAnalysis.yl.monthList');
     }
 
     //提交整条报表
@@ -309,7 +309,7 @@ angular.module('app.storage')
 
     //取消按钮
     $scope.retList = function(obj) {
-    	$state.go('app.storage.grainAnalysis.houseMonthAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType});
+    	$state.go('app.storage.grainAnalysis.yl.houseMonthAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType});
     }
     
 })

src/main/resources/static/app/storage/grainAnalysis/controller/quarterAnalysisCtrl.js

@@ -56,7 +56,7 @@ angular.module('app.storage')
 		// 回调函数.
 		modalInstance.result.then(function (result) {
 			if (result != null) {
-				$state.go('app.storage.grainAnalysis.houseQuarterAnalysisList', {id:result, butType:'update'});
+				$state.go('app.storage.grainAnalysis.yl.houseQuarterAnalysisList', {id:result, butType:'update'});
 			}
 		}, function (reason) {
 			console.log(reason);
@@ -65,7 +65,7 @@ angular.module('app.storage')
 
     //查看和编辑跳转的页面
     $scope.edit = function(id, butType) {
-    	$state.go('app.storage.grainAnalysis.houseQuarterAnalysisList', {id:id, butType:butType});
+    	$state.go('app.storage.grainAnalysis.yl.houseQuarterAnalysisList', {id:id, butType:butType});
     }
 
     //删除一条报表
@@ -105,7 +105,7 @@ angular.module('app.storage')
 
     //单仓分析数据编辑、查看
     $scope.edit = function(obj, butType) {
-    	$state.go("app.storage.grainAnalysis.quarterEdit", {
+    	$state.go("app.storage.grainAnalysis.yl.quarterEdit", {
 			id: obj.id,
 			butType: butType,
 			gnly_butType: $stateParams.butType
@@ -131,7 +131,7 @@ angular.module('app.storage')
     
     //取消或返回
     $scope.retList = function () {
-    	$state.go('app.storage.grainAnalysis.quarterList');
+    	$state.go('app.storage.grainAnalysis.yl.quarterList');
     }
 
     //提交整条报表
@@ -280,7 +280,7 @@ angular.module('app.storage')
 
 	//取消按钮
     $scope.retList = function(obj) {
-    	$state.go('app.storage.grainAnalysis.houseQuarterAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType});
+    	$state.go('app.storage.grainAnalysis.yl.houseQuarterAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType});
     }
     
 })

src/main/resources/static/app/storage/grainAnalysis/controller/selectHouseModalCtrl.js

@@ -13,7 +13,7 @@ angular.module('app.storage').controller("selectHouseModalCtrl",
     // items为上一个模态窗传过来的参数对象.
     // 获取列表数据
     $scope.loadData = function() {
-        grainAnalysisService.selectClcf(items.orgId).then(function(data){
+        grainAnalysisService.selectClcf(items.orgId, items.lylx).then(function(data){
     		$scope.list = data.data;
     		for (var i = 0; i < $scope.list.length; i++) {
     			$scope.list[i].checked = true;
@@ -71,7 +71,7 @@ angular.module('app.storage').controller("selectHouseModalCtrl",
     	if ($scope.funcType == "2") {//半月报
     		ssyf = $("#ybyf").val();
     		if (ssyf == null || ssyf == "" || $scope.sbzq == null || $scope.sbzq == "") {
-        		alert("上班周期不能为空！");
+        		alert("上报周期不能为空！");
         		return;
         	} else {
         		sbzq = $filter('date')(ssyf, "yyyy年MM月")+$scope.sbzq;
@@ -80,7 +80,7 @@ angular.module('app.storage').controller("selectHouseModalCtrl",
     	if ($scope.funcType == "3") {//季度报
     		ssyf = $("#jbyf").val();
     		if (ssyf == null || ssyf == "" || $scope.sbzq == null || $scope.sbzq == "") {
-        		alert("上班周期不能为空！");
+        		alert("上报周期不能为空！");
         		return;
         	} else {
         		sbzq = ssyf+"年"+$scope.sbzq;
@@ -100,6 +100,7 @@ angular.module('app.storage').controller("selectHouseModalCtrl",
     				sbzq: sbzq,
     				sbcfs: arr.length,
     				dataStatus: 0,
+    				lylx: items.lylx,
     				tjr: $rootScope.userInfo.realName
     		};
     		grainAnalysisService.save($scope.grain, arr).then(function(data){

src/main/resources/static/app/storage/grainAnalysis/controller/weekAnalysisCtrl.js

@@ -5,7 +5,7 @@ angular.module('app.storage')
 
 	//周粮情分析列表数据查询
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.grain = {dataType : "1", startTime : "", endTime : "", orgId: $rootScope.orgInfo.orgId};
+	$scope.grain = {dataType : "1", startTime : "", endTime : "", orgId: $rootScope.orgInfo.orgId, lylx: $stateParams.lylx};
     $scope.loadData = function() {
     	$scope.grain.startTime = $("#startDate").val();
     	$scope.grain.endTime = $("#endDate").val();
@@ -37,6 +37,7 @@ angular.module('app.storage')
 		$scope.modelItem = [];//参数对象
         $scope.modelItem.orgId = $rootScope.orgInfo.orgId;
         $scope.modelItem.type = 1;//报表类型是周报
+        $scope.modelItem.lylx = $scope.grain.lylx;//粮油类型(0:原粮,1:成品粮)
 		
         // 展开选择仓房的模态框.
 		var modalInstance = $uibModal.open({
@@ -55,7 +56,12 @@ angular.module('app.storage')
 		// 回调函数.
 		modalInstance.result.then(function (result) {
 			if (result != null) {
-				$state.go('app.storage.grainAnalysis.houseWeekAnalysisList', {id:result, butType:'update'});
+				if ($scope.modelItem.lylx == '0') {
+					$state.go('app.storage.grainAnalysis.yl.houseWeekAnalysisList', {id:result, butType:'update', lylx:$scope.modelItem.lylx});
+				}
+				if ($scope.modelItem.lylx == '1') {
+					$state.go('app.storage.grainAnalysis.cpl.houseWeekAnalysisList', {id:result, butType:'update', lylx:$scope.modelItem.lylx});
+				}
 			}
 		}, function (reason) {
 			console.log(reason);
@@ -64,7 +70,12 @@ angular.module('app.storage')
 
     //查看和编辑跳转的页面
     $scope.edit = function(id, butType) {
-    	$state.go('app.storage.grainAnalysis.houseWeekAnalysisList', {id:id, butType:butType});
+    	if ($scope.grain.lylx == '0') {
+			$state.go('app.storage.grainAnalysis.yl.houseWeekAnalysisList', {id:id, butType:butType, lylx:$scope.grain.lylx});
+		}
+		if ($scope.grain.lylx == '1') {
+			$state.go('app.storage.grainAnalysis.cpl.houseWeekAnalysisList', {id:id, butType:butType, lylx:$scope.grain.lylx});
+		}
     }
 
     //删除一条报表
@@ -102,11 +113,22 @@ angular.module('app.storage')
 
     //单仓分析数据编辑、查看
     $scope.edit = function(obj, butType) {
-    	$state.go("app.storage.grainAnalysis.weekEdit", {
-			id: obj.id,
-			butType: butType,
-			gnly_butType: $stateParams.butType
-		});
+    	if ($stateParams.lylx == '0') {
+	    	$state.go("app.storage.grainAnalysis.yl.weekEdit", {
+				id: obj.id,
+				butType: butType,
+				gnly_butType: $stateParams.butType,
+				lylx: $stateParams.lylx
+			});
+    	}
+    	if ($stateParams.lylx == '1') {
+	    	$state.go("app.storage.grainAnalysis.cpl.weekEdit", {
+				id: obj.id,
+				butType: butType,
+				gnly_butType: $stateParams.butType,
+				lylx: $stateParams.lylx
+			});
+    	}
     }
 
     //删除一条单仓的分析数据
@@ -128,7 +150,12 @@ angular.module('app.storage')
     
     //取消或返回
     $scope.retList = function () {
-    	$state.go('app.storage.grainAnalysis.weekList');
+    	if ($stateParams.lylx == '0') {
+			$state.go('app.storage.grainAnalysis.yl.weekList', {lylx:$stateParams.lylx});
+		}
+		if ($stateParams.lylx == '1') {
+			$state.go('app.storage.grainAnalysis.cpl.weekList', {lylx:$stateParams.lylx});
+		}
     }
 
     //提交整条报表
@@ -144,7 +171,7 @@ angular.module('app.storage')
         }
     	grainAnalysisService.submitStorageGrainAnalysis(obj.id).then(function(data){
     		if (data.status == "200") {
-    			$state.go('app.storage.grainAnalysis.weekList');
+    			$state.go('app.storage.grainAnalysis.yl.weekList');
     			alert("操作成功！");
     		} else {
     			alert("操作失败！");
@@ -196,7 +223,12 @@ angular.module('app.storage')
 		GrainAnalysisService.getInfo(id).then(function(data) {
 			$scope.form = data;
 			$scope.temperature = data.tTestdata;//旧的温度数据
-			$scope.newtemperature = data.analysisTestdata;//旧的温度数据
+			if ($stateParams.lylx == '0') {
+				$scope.newtemperature = data.analysisTestdata;//旧的温度数据
+			}
+			if ($stateParams.lylx == '1') {
+				$scope.newtemperature = data.analysisCpltestdata;//成品粮的温度数据
+			}
 
 			//通过仓房号，获取货位号.
 			$scope.onStoreChange();
@@ -236,7 +268,12 @@ angular.module('app.storage')
 
 	// 返回
     $scope.retList = function (obj) {
-    	$state.go('app.storage.grainAnalysis.houseWeekAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType});
+    	if ($stateParams.lylx == '0') {
+    		$state.go('app.storage.grainAnalysis.yl.houseWeekAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType, lylx: $stateParams.lylx});
+    	}
+    	if ($stateParams.lylx == '1') {
+    		$state.go('app.storage.grainAnalysis.cpl.houseWeekAnalysisList', {id:obj.zid, butType:$stateParams.gnly_butType, lylx: $stateParams.lylx});
+    	}
     }
 	
 }).directive('stringToNumber', function() {

src/main/resources/static/app/storage/grainAnalysis/service/grainAnalysisService.js

@@ -15,7 +15,8 @@ angular.module('app.storage').service("grainAnalysisService", function($http, $q
 				orgId : grain == undefined?"":grain.orgId,
 				dataType : grain == undefined?"":grain.dataType,
 				ssyf : grain == undefined?"":grain.ssyf,
-				dataStatus : grain == undefined?"":grain.dataStatus
+				dataStatus : grain == undefined?"":grain.dataStatus,
+			    lylx : grain == undefined?"":grain.lylx
 			}
 		}).then(function successCallback(response) {
 			// 请求成功执行代码
@@ -28,13 +29,14 @@ angular.module('app.storage').service("grainAnalysisService", function($http, $q
 	};
 	
 	//查询当前粮库储粮的仓房(不含油罐)
-	this.selectClcf = function (orgId) {
+	this.selectClcf = function (orgId, lylx) {
 		var d = $q.defer();
 		$http({
 			method : 'GET',
 			url : APP_CONFIG.keeperHouseUrl + '/storageGrainAnalysis/selectClcf',
 			params : {
-				orgId : orgId
+				orgId : orgId,
+				lylx : lylx
 			}
 		}).then(function successCallback(response) {
 			// 请求成功执行代码

src/main/resources/static/app/storage/grainAnalysis/views/monthAnalysis-edit.html

@@ -129,6 +129,23 @@
 								       	</label>
 									</section>
 								</fieldset>
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+	                                        <label class="label">提交人</label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjr" name="tjr" required ng-readonly="true">
+	                                        </label>
+	                                    </section>
+										<section class="col col-3">
+	                                        <label class="label">提交日期<span style="color: red;">*</span></label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" 
+				                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" ng-disabled="true" required />
+	                                        </label>
+	                                    </section>
+									</div>
+                                </fieldset>
                                 <div>
                                     <footer class="text-align-center">
 										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>

src/main/resources/static/app/storage/grainAnalysis/views/quarterAnalysis-edit.html

@@ -114,10 +114,27 @@
 								       	</label>
 									</section>
 								</fieldset>
-                                    <footer class="text-align-center">
-										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
-                                        <button type="button" class="btn btn-default" ng-click="retList(form)">取消</button>
-                                    </footer>
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+	                                        <label class="label">提交人</label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjr" name="tjr" required ng-readonly="true">
+	                                        </label>
+	                                    </section>
+										<section class="col col-3">
+	                                        <label class="label">提交日期<span style="color: red;">*</span></label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" 
+				                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" ng-disabled="true" required />
+	                                        </label>
+	                                    </section>
+									</div>
+                                </fieldset>
+                                <footer class="text-align-center">
+									<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
+                                    <button type="button" class="btn btn-default" ng-click="retList(form)">取消</button>
+                                </footer>
                                </div>
                             </form>
                         </div>

src/main/resources/static/app/storage/grainAnalysis/views/weekAnalysis-cpl-edit.html

@@ -0,0 +1,217 @@
+<div id="content">
+    <section id="widget-grid" widget-grid>
+        <div class="row">
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <div jarvis-widget id="form-grid-widget"
+                    data-widget-colorbutton="false" data-widget-editbutton="false"
+                    data-widget-custombutton="false">
+                    <div>
+                        <div class="widget-body no-padding">
+                            <form id="weekAnlysis-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
+                                <header>
+									<a href-void class="btn btn-default btn-xs" ng-click="retList(form)">
+										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+									</a>
+									&nbsp;<strong>周报详情</strong>
+									<span class="pull-right font-xs">带*的部分必须填写</span>
+								</header>
+								<h2 style="text-align: center;"><strong>周报详情</strong></h2>
+								<header>基本信息</header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
+                                            <label class="select"> 
+												<select ng-model="form.houseId" name="houseId" class="form-control"
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
+													ng-change="onStoreChange()" required ng-disabled="true">
+													<option value="">请选择</option>
+												</select>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">货位名称<span style="color: red;">*</span></label> 
+                                            <label class="select"> 
+                                                <select ng-model="form.warehouseId" name="warehouseId"
+													ng-options="ware.warehouseId as ware.warehouseName for ware in wareAnalysisList"
+													ng-change="onTimeChange()" required ng-disabled="disabled">
+                                                    <option value="">--请选择--</option>
+                                                </select>
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">粮食品种</label> 
+                                            <label class="select"> 
+                                                <select ng-model="form.lspz" name="lspz" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" ng-disabled="true">
+                                                    <option value="">--请选择--</option>
+                                                </select>
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">责任保管员</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.zrbgy" name="zrbgy" ng-readonly="true" />
+                                            </label>
+                                        </section>
+										<section class="col col-3" id="DataTables_Table_1_wrapper" class="dataTables_wrapper">
+                                            <label class="label">检查开始日期<span style="color: red;">*</span></label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.jcqsrq" name="jcqsrq" id="startDate"
+                                                    onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
+													ng-disabled="true" ng-blur="onTimeChange()" required />
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">检查终止日期<span style="color: red;">*</span></label> 
+                                            <label class="input"> 
+                                                <input type="text" name="jczzrq" ng-model="form.jczzrq" class="form-control" id="endDate"
+                                                    onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
+													ng-disabled="true" ng-blur="onTimeChange()" required />
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">仓房类型</label> 
+                                            <label class="select"> 
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="true">
+                                                    <option value="">--请选择--</option>
+                                                </select>
+                                            </label>
+                                        </section>
+                                    </div>
+                                </fieldset>
+								<header><strong>温湿度情况</strong></header>
+								<fieldset>
+									<div class="col-xs-12 col-sm-12">
+										<table class="table table-striped table-bordered table-hover" width="100%">
+											<tbody><tr>
+												<th rowspan="2">
+													<label class="label" style="margin-top: 34px;text-align: center;">检查时间</label>
+												</th>
+												<th rowspan="2">
+													<label class="label" style="margin-top: 34px;text-align: center;">仓温</label>
+												</th>
+												<th colspan="2">
+													<label class="label" style="margin-top: 9px;text-align: center;">机动点1</label>
+												</th>
+												<th colspan="2">
+													<label class="label" style="margin-top: 9px;text-align: center;">机动点2</label>
+												</th>
+												<th colspan="2">
+													<label class="label" style="margin-top: 9px;text-align: center;">机动点3</label>
+												</th>
+											</tr>
+											<tr>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">部位</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">温度</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">部位</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">温度</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">部位</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">温度</label>
+												</th>
+											</tr>
+											<tr ng-repeat="item in newtemperature" class="ng-scope">
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.jcsj" name="jcsj" ng-readonly="true" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.cw" name="cw" ng-readonly="disabled"
+													    onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.bwOne" name="bwOne" ng-readonly="disabled" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.wdOne" name="wdOne" ng-readonly="disabled"
+													    onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.bwTwo" name="bwTwo" ng-readonly="disabled" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.wdTwo" name="wdTwo" ng-readonly="disabled"
+													    onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.bwThree" name="bwThree" ng-readonly="disabled" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.wdThree" name="wdThree" ng-readonly="disabled"
+													    onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''" />
+													</label>
+												</th>
+											</tr>
+										</tbody></table>
+									</div>
+								</fieldset>
+								<header><strong>仓内检查情况<span style="color: red;">*</span></strong></header>
+								<fieldset>
+									<section>
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
+								           	<textarea rows="5" ng-model="form.lqzk" name="lqzk" maxlength="255" class="ng-pristine ng-untouched ng-valid" required ng-disabled="disabled"></textarea>
+								       	</label>
+									</section>
+								</fieldset>
+								<header><strong>粮情分析<span style="color: red;">*</span></strong></header>
+								<fieldset>
+									<section>
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
+								           	<textarea rows="5" ng-model="form.lqfx" name="lqfx" maxlength="255" class="ng-pristine ng-untouched ng-valid" required ng-disabled="disabled"></textarea>
+								       	</label>
+									</section>
+								</fieldset>
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+	                                        <label class="label">提交人</label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjr" name="tjr" required ng-readonly="true">
+	                                        </label>
+	                                    </section>
+										<section class="col col-3">
+	                                        <label class="label">提交日期<span style="color: red;">*</span></label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" 
+				                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" ng-disabled="true" required />
+	                                        </label>
+	                                    </section>
+									</div>
+                                </fieldset>
+                                <div>
+                                    <footer class="text-align-center">
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
+                                        <button type="button" class="btn btn-default" ng-click="retList(form)">取消</button>
+                                    </footer>
+                               </div>
+                            </form>
+                        </div>
+                    </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/storage/grainAnalysis/views/weekAnalysis-edit.html

@@ -22,15 +22,9 @@
                                         <section class="col col-3">
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-												<select 
-													ng-model="form.houseId"
-													name="houseId"
-													class="form-control"
+												<select ng-model="form.houseId" name="houseId" class="form-control"
 													ng-options="store.storehouseId as store.storehouseName for store in storelist"
-													ng-change="onStoreChange()"
-													required
-													ng-disabled="true"
-												>
+													ng-change="onStoreChange()" required ng-disabled="true">
 													<option value="">请选择</option>
 												</select>
                                             </label>
@@ -38,14 +32,9 @@
                                         <section class="col col-3">
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select 
-													ng-model="form.warehouseId"
-													name="warehouseId"
+                                                <select ng-model="form.warehouseId" name="warehouseId"
 													ng-options="ware.warehouseId as ware.warehouseName for ware in wareAnalysisList"
-													ng-change="onTimeChange()"
-													required
-													ng-disabled="disabled"
-												>
+													ng-change="onTimeChange()" required ng-disabled="disabled">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -75,33 +64,17 @@
 										<section class="col col-3" id="DataTables_Table_1_wrapper" class="dataTables_wrapper">
                                             <label class="label">检查开始日期<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input 
-													class="form-control"
-													type="text"
-                                                    ng-model="form.jcqsrq"
-													name="jcqsrq"
-													id="startDate"
+                                                <input class="form-control" type="text" ng-model="form.jcqsrq" name="jcqsrq" id="startDate"
                                                     onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
-													ng-disabled="true"
-													ng-blur="onTimeChange()"
-													required
-												/>
+													ng-disabled="true" ng-blur="onTimeChange()" required />
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">检查终止日期<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input 
-													type="text"
-													name="jczzrq"
-                                                    ng-model="form.jczzrq"
-													class="form-control"
-													id="endDate"
+                                                <input type="text" name="jczzrq" ng-model="form.jczzrq" class="form-control" id="endDate"
                                                     onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
-													ng-disabled="true"
-													ng-blur="onTimeChange()"
-													required
-												/>
+													ng-disabled="true" ng-blur="onTimeChange()" required />
                                             </label>
                                         </section>
                                     </div>
@@ -192,6 +165,23 @@
 								       	</label>
 									</section>
 								</fieldset>
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+	                                        <label class="label">提交人</label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjr" name="tjr" required ng-readonly="true">
+	                                        </label>
+	                                    </section>
+										<section class="col col-3">
+	                                        <label class="label">提交日期<span style="color: red;">*</span></label> 
+	                                        <label class="input"> 
+	                                            <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" 
+				                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" ng-disabled="true" required />
+	                                        </label>
+	                                    </section>
+									</div>
+                                </fieldset>
                                 <div>
                                     <footer class="text-align-center">
 										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>

src/main/resources/static/app/storage/grainAnalysis/views/weekAnalysis-list.html

@@ -42,9 +42,10 @@
 											<tr>
 												<th data-class="expand" style="text-align:center;">序号</th>
 												<th data-class="expand" style="text-align:center;">所属月份</th>
+												<th data-class="expand" style="text-align:center;">提交人</th>
 												<th data-class="expand" style="text-align:center;">提交日期</th>
 												<th data-class="expand" style="text-align:center;">检查开始日期----检查结束日期</th>
-												<th data-class="expand" style="text-align:center;">上报仓房数</th>
+												<th data-class="expand" style="text-align:center;" ng-show="grain.lylx=='0'">上报仓房数</th>
 												<th data-class="expand" style="text-align:center;">状态</th>
 												<th data-class="expand" style="text-align:center;">操作</th>
 											</tr>
@@ -54,9 +55,10 @@
 											<tr ng-repeat="item in pageInfo.list">
 												<td style="text-align:center;">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</td>
 												<td style="text-align:center;">{{ item.ssyf }}</td>
+												<td style="text-align:center;">{{ item.tjr }}</td>
 												<td style="text-align:center;">{{ item.tjrq }}</td>
 												<td style="text-align:center;">{{ item.jcksrq + '----' + item.jcjsrq }}</td>
-												<td style="text-align:center;">{{ item.sbcfs }}</td>
+												<td style="text-align:center;" ng-show="grain.lylx=='0'">{{ item.sbcfs }}</td>
 												<td style="text-align:center;">{{ item.dataStatus == '0'?"未完成":"已完成" }}</td>
 												<td style="text-align:center;">
 													<a href-void ng-click="edit(item.id, 'update')" ng-show="item.dataStatus=='0'">编辑</a>

src/main/resources/static/app/storage/module.js

@@ -2169,8 +2169,14 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     title: '粮情分析报告'
                 }
             })
-            .state('app.storage.grainAnalysis.weekList', {
-                url: '/weekList',
+            .state('app.storage.grainAnalysis.yl', {
+                abstract: true,
+                data: {
+                    title: '原粮'
+                }
+            })
+            .state('app.storage.grainAnalysis.yl.weekList', {
+                url: '/yl/weekList/:lylx',
                 data: {
                     title: '周报'
                 },
@@ -2182,8 +2188,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
             //列表点新建或编辑查看跳转的路由
-            .state('app.storage.grainAnalysis.houseWeekAnalysisList', {
-                url: '/houseWeekAnalysisList/:id/:butType',
+            .state('app.storage.grainAnalysis.yl.houseWeekAnalysisList', {
+                url: '/yl/houseWeekAnalysisList/:id/:butType/:lylx',
                 data: {
                     title: '周报详情'
                 },
@@ -2195,8 +2201,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
             //编辑单仓粮情分析跳转的路由
-            .state('app.storage.grainAnalysis.weekEdit', {
-                url: '/weekEdit/:id/:butType/:gnly_butType',
+            .state('app.storage.grainAnalysis.yl.weekEdit', {
+                url: '/yl/weekEdit/:id/:butType/:gnly_butType/:lylx',
                 data: {
                     title: '周报详情'
                 },
@@ -2207,8 +2213,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
-            .state('app.storage.grainAnalysis.monthList', {
-                url: '/monthList',
+            .state('app.storage.grainAnalysis.yl.monthList', {
+                url: '/yl/monthList/:lylx',
                 data: {
                     title: '半月报'
                 },
@@ -2220,8 +2226,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
             //列表点新建或编辑查看跳转的路由
-            .state('app.storage.grainAnalysis.houseMonthAnalysisList', {
-                url: '/houseMonthAnalysisList/:id/:butType',
+            .state('app.storage.grainAnalysis.yl.houseMonthAnalysisList', {
+                url: '/yl/houseMonthAnalysisList/:id/:butType',
                 data: {
                     title: '半月报详情'
                 },
@@ -2232,8 +2238,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
-            .state('app.storage.grainAnalysis.monthEdit', {
-                url: '/monthEdit/:id/:butType/:gnly_butType',
+            .state('app.storage.grainAnalysis.yl.monthEdit', {
+                url: '/yl/monthEdit/:id/:butType/:gnly_butType',
                 data: {
                     title: '半月报详情'
                 },
@@ -2244,8 +2250,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
-            .state('app.storage.grainAnalysis.quarterList', {
-                url: '/quarterList',
+            .state('app.storage.grainAnalysis.yl.quarterList', {
+                url: '/yl/quarterList/:lylx',
                 data: {
                     title: '季报'
                 },
@@ -2257,8 +2263,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
             //列表点新建或编辑查看跳转的路由
-            .state('app.storage.grainAnalysis.houseQuarterAnalysisList', {
-                url: '/houseQuarterAnalysisList/:id/:butType',
+            .state('app.storage.grainAnalysis.yl.houseQuarterAnalysisList', {
+                url: '/yl/houseQuarterAnalysisList/:id/:butType',
                 data: {
                     title: '季报详情'
                 },
@@ -2269,8 +2275,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
-            .state('app.storage.grainAnalysis.quarterEdit', {
-                url: '/quarterEdit/:id/:butType/:gnly_butType',
+            .state('app.storage.grainAnalysis.yl.quarterEdit', {
+                url: '/yl/quarterEdit/:id/:butType/:gnly_butType',
                 data: {
                     title: '季报详情'
                 },
@@ -2281,6 +2287,50 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
+            .state('app.storage.grainAnalysis.cpl', {
+                abstract: true,
+                data: {
+                    title: '成品粮'
+                }
+            })
+            .state('app.storage.grainAnalysis.cpl.weekList', {
+                url: '/cpl/weekList/:lylx',
+                data: {
+                    title: '周报'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'weekAnalysisCtrl',
+                        templateUrl: 'app/storage/grainAnalysis/views/weekAnalysis-list.html'
+                    }
+                }
+            })
+            //列表点新建或编辑查看跳转的路由
+            .state('app.storage.grainAnalysis.cpl.houseWeekAnalysisList', {
+                url: '/cpl/houseWeekAnalysisList/:id/:butType/:lylx',
+                data: {
+                    title: '周报详情'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'houseWeekAnalysisCtrl',
+                        templateUrl: 'app/storage/grainAnalysis/views/house-weekAnalysis-list.html'
+                    }
+                }
+            })
+            //编辑单仓粮情分析跳转的路由
+            .state('app.storage.grainAnalysis.cpl.weekEdit', {
+                url: '/cpl/weekEdit/:id/:butType/:gnly_butType/:lylx',
+                data: {
+                    title: '周报详情'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'weekAnalysisEditCtrl',
+                        templateUrl: 'app/storage/grainAnalysis/views/weekAnalysis-cpl-edit.html'
+                    }
+                }
+            })
 			//周报(旧)
             .state('app.storage.grainAnalysis.week', {
                 url: '/storage/grainAnalysis/week',

src/main/resources/static/app/warnAndAlarm/qualityWarn/views/qualityWarn-list.html

@@ -44,7 +44,6 @@
                                         <tr>
                                             <th data-class="expand" style="text-align:center;">序号</th>
                                             <th data-class="expand" style="text-align:center;">仓房/油罐</th>
-                                            <th data-class="expand" style="text-align:center;">货位</th>
                                             <th data-class="expand" style="text-align:center;">粮油品种</th>
                                             <th data-class="expand" style="text-align:center;">粮食性质</th>
                                             <th data-class="expand" style="text-align:center;">类型</th>
@@ -59,7 +58,6 @@
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
                                             <td style="text-align:center;">{{ warning.cfmc }}</td>
-                                            <td style="text-align:center;">{{ warning.hwmc }}</td>
                                             <td style="text-align:center;">{{ warning.pzmc }}</td>
                                             <td style="text-align:center;">{{ warning.lyxzmc }}</td>
                                             <td style="text-align:center;">{{ warning.crklx }}</td>