保管员获取修改

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

@@ -349,6 +349,31 @@ angular.module('app.storage')
         	
         }
 
+        //更新
+        $scope.editEatScore = function(obj) {
+        	var params = [];
+            params.obj = obj;
+            var uibModalInstance = $uibModal.open({
+                size:'sm',
+                templateUrl: 'app/storage/views/qualitycheck/qualitycheck-first-editEatScore.html',
+                controller: 'editEatScoreModalCtrl',
+                resolve: {
+                    // items是一个回调函数
+                    items: function () {
+                        // 这个值会被模态框的控制器获取到
+                        return params;
+                    }
+                }
+            });
+            uibModalInstance.result.then(function (result) {
+                if (result != null) {
+                	$scope.loadData();
+                }
+            }, function (reason) {
+                console.log(reason);
+            });
+        }
+
     })
     .controller("qualitycheckSaveCtrl", function($scope,$state, $http, $stateParams, FileUploader, StorehouseService, warehouseService, keeperService, businessFileService,
       agentStorehouseService, $rootScope, $filter, enumService, qualitycheckService,keepAccountService, kcswService , productService,APP_CONFIG,agentDepotService,commonUtilService) {
@@ -625,9 +650,18 @@ angular.module('app.storage')
                         console.log(data);
                     });
 
-                    if (type != 0) {
-                    	$scope.findKeeperNames();
-                    }
+                    var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
+                	var keeperNames = null;
+                	if (datatype == "0") {
+                		keeperNames = $rootScope.storehouseObj[$scope.qualitycheck.houseId].dutystoreman;
+                	} else if (datatype == "1") {
+                		keeperNames = $rootScope.tankObj[$scope.qualitycheck.houseId].keeperNames;
+                	}
+                	if (keeperNames != null && keeperNames != "") {
+                		$scope.qualitycheck.keeper = keeperNames;
+                	} else {
+                		$scope.qualitycheck.keeper = null;
+                	}
                 }
             } else {
                 // 设置货位号为空.
@@ -1607,4 +1641,32 @@ angular.module('app.storage')
 
         // -----------------------------------------------   上传下载相关     结束           ------------------------------------------------
 
+    })
+    .controller("editEatScoreModalCtrl", function($scope, $state, items, $http, $stateParams, $rootScope, $uibModalInstance, qualitycheckService) {
+
+    	$scope.save = function() {
+    		var validator = $("#gxcczbxx-form").validate();
+    		if (validator.form()) {
+    			items.obj.eatScore = $scope.xmpcpfz;
+    			qualitycheckService.save(items.obj).then(function(datas){
+    				if (datas.status == "success") {
+    					alert("操作成功!");
+    					$scope.cancel(200);
+    				} else {
+    					alert("保存失败！");
+    				}
+    			},function(datas){
+    				console.log(datas);
+    			});
+    		}
+    	}
+
+        // 点叉号"x"关闭模态窗口
+        $scope.cancel = function(s) {
+        	if (s == 200) {
+        		$uibModalInstance.close(200);
+        	} else {
+        		$uibModalInstance.close(500);
+        	}
+        }
     })

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

@@ -132,6 +132,18 @@ angular.module('app.storage')
                 $scope.qualitycheck.levelUpdate = null; //粮油等级
         	}
             if ($scope.qualitycheck.houseId != null && $scope.qualitycheck.houseId != undefined && $scope.qualitycheck.houseId != '') {
+            	var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
+            	var keeperNames = null;
+            	if (datatype == "0") {
+            		keeperNames = $rootScope.storehouseObj[$scope.qualitycheck.houseId].dutystoreman;
+            	} else if (datatype == "1") {
+            		keeperNames = $rootScope.tankObj[$scope.qualitycheck.houseId].keeperNames;
+            	}
+            	if (keeperNames != null && keeperNames != "") {
+            		$scope.qualitycheck.keeper = keeperNames;
+            	} else {
+            		$scope.qualitycheck.keeper = null;
+            	}
             	warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.qualitycheck.houseId, "0").then(function(data){
                     if(data.wareList.length > 0){
                         $scope.warehouseList = data.wareList;  //下拉列表数据
@@ -147,9 +159,6 @@ angular.module('app.storage')
                     console.log(data);
                 });
 
-                if (type != 0) {
-                	$scope.findKeeperNames();
-                }
             } else {
                 // 设置货位号为空.
                 $scope.qualitycheck.warehouseId = null;
@@ -166,17 +175,6 @@ angular.module('app.storage')
             }
         }
 
-        //用于初检，验收，春秋普查，日常检查和第三方检查带出的保管员
-        $scope.findKeeperNames = function () {
-            //通过仓房号获取保管员，用于在第三方检查和日常检查中显示保管员的名字
-            keeperService.getKeeperNamesByHouseId($scope.qualitycheck.houseId).then(function (data) {
-                $scope.keeper = data;
-                $scope.qualitycheck.keeper = $scope.keeper.keeperNames;
-            }, function (data) {
-                console.log(data);
-            });
-        }
-        
         //校验是否已经有初检了
         $scope.isChuJian = function (stype) {
         	if (stype==="0") {

src/main/resources/static/app/storage/grainCard/controller/checkFoodSituationListCtrl.js

@@ -16,6 +16,7 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                 }
                 $scope.findQuailckCardList($scope.GrainCardByIdObj.id);
                 $scope.findGrainCardList($scope.GrainCardByIdObj.qualitycheckId);
+                $scope.findailyCardList();
             }, function (data) {
                 console.log(data);
             });
@@ -60,22 +61,6 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                     $scope.grainCardView.zhycsj = $filter('date')($scope.grainCardView.zhycsj, "yyyy-MM-dd HH:mm:ss");
                     $scope.grainCardView.checkTime = $filter('date')($scope.grainCardView.checkTime, "yyyy-MM-dd");
 
-                    //小麦及混合小麦111 ，玉米112，大豆141，稻谷113  市平台
-                    //小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166
-//                    if($stateParams.grainVarietyNum == 1110000 || $stateParams.grainVarietyNum == 111){
-//                        $scope.grainCardView.subType = 3164;
-//                    }else if($stateParams.grainVarietyNum == 1120000 || $stateParams.grainVarietyNum == 112){
-//                        $scope.grainCardView.subType = 3165;
-//                    }else if($stateParams.grainVarietyNum == 1410000 || $stateParams.grainVarietyNum == 141){
-//                        $scope.grainCardView.subType = 2777;
-//                    }else if($stateParams.grainVarietyNum == 1130000 || $stateParams.grainVarietyNum == 113){
-//                        $scope.grainCardView.subType = 3166;
-//                    }else if($stateParams.grainVarietyNum == null || $stateParams.grainVarietyNum == '' || typeof $stateParams.grainVarietyNum == 'undefined') {
-//                        $scope.grainCardView.subType = null;
-//                    }else{
-//                        $scope.grainCardView.subType = 7052;
-//                    }
-
                     if ($scope.grainCardView.storehouseYG == 2) {
                     	$scope.grainCardView.useDate = $filter('date')($scope.grainCardView.useDate, "yyyy-MM-dd");
                     	$scope.grainCardView.useDate = $scope.grainCardView.useDate.substr(0,4);//建设年份
@@ -116,9 +101,9 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
         }
 
         //======日常检查==========
-        $scope.search = {cardNum:$stateParams.id,storehouseId:$stateParams.storehouseId, warehouseId:$stateParams.warehouseId};
         $scope.findailyCardList = function () {
             // 日常检查列表
+        	$scope.search = {cardNum:$stateParams.id,storehouseId:$scope.GrainCardByIdObj.storehouseId, warehouseId:$scope.GrainCardByIdObj.warehouseId};
             grainDailyCardService.findDailyCardList($scope.search).then(function (data) {
                 $scope.dailyCardList = data.dailyList;
                 $scope.dailyCardOneList = data.dailyListOne;
@@ -127,7 +112,6 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                 console.log(data);
             });
         };
-        $scope.findailyCardList();
 
         // ------------------------温度卡start-------------------
         // 温度卡查看列表
@@ -178,7 +162,7 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
             $state.go('app.storage.foodSituation.addTemperatureTest', {
                 cardNum: $stateParams.id,
 //                storehouseNum: $stateParams.storehouseNum,
-                storehouseNum: $rootScope.storehouseObj[$stateParams.storehouseId].storehouseCode,
+                storehouseNum: $rootScope.storehouseObj[$scope.GrainCardByIdObj.storehouseId].storehouseCode,
                 warehouseNum: $scope.GrainCardByIdObj.warehouseNum,
                 grainRemark: $scope.grainRemark
             })
@@ -241,9 +225,9 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
         $scope.moistureAddData = function () {
             $state.go('app.storage.foodSituation.addMoistureTest',{
                 warterId: $stateParams.id,
-                storehouse: $stateParams.storehouseId,
-                warehouse: $stateParams.warehouseId,
-                warterRemark: $stateParams.warterRemark
+                storehouse: $scope.GrainCardByIdObj.storehouseId,
+                warehouse: $scope.GrainCardByIdObj.warehouseId,
+                warterRemark: $scope.warterData.warterremark
             });
         }
 
@@ -292,8 +276,8 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
         $scope.dailyAddData = function () {
             $state.go('app.storage.foodSituation.addDailyTest', {
                 cardNum: $stateParams.id,
-                storehouseId: $stateParams.storehouseId,
-                warehouseId: $stateParams.warehouseId
+                storehouseId: $scope.GrainCardByIdObj.storehouseId,
+                warehouseId: $scope.GrainCardByIdObj.warehouseId
             })
         };
 

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-first-editEatScore.html

@@ -0,0 +1,30 @@
+<div class="modal-content">
+	<div class="modal-header">
+		<button type="button" class="close" ng-click="cancel(500)">
+			&times;</button>
+		<h4 class="modal-title" id="myModalLabel">更新存储指标信息</h4>
+	</div>
+
+	<div class="modal-body">
+		<form id="gxcczbxx-form" name='gxcczbxx-form'
+			class="smart-form ng-pristine ng-valid"
+			data-validator-option="validateOptions" novalidate="novalidate">
+			<fieldset>
+				<div class="row">
+					<section class="col col-12">
+						<label class="label">小麦品尝评分值<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+						<label class="input">
+							<input type="text" ng-model="xmpcpfz" name="xmpcpfz" class="form-control" required />
+						</label>
+					</section>
+				</div>
+			</fieldset>
+		</form>
+	</div>
+	<div class="modal-footer">
+		<button ng-click="save()" type="button" ng-hide="isNotEdit"
+			class="btn btn-primary">提交</button>
+		<button ng-click="cancel(500)" class="btn btn-default"
+			data-dismiss="modal">取消</button>
+	</div>
+</div>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-list.html

@@ -98,10 +98,9 @@
 <!--								</td>-->
                         		<td>{{qualitycheck.checkTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                         		<td>
-									<!--<a has-permission="475" href-void ng-click="showAddAck(qualitycheck.id,qualitycheck.houseId,qualitycheck.warehouseId)"><i class="fa fa-plus"></i>验收</a>&nbsp;&nbsp;-->
                         			<a href-void ng-click="showViewFck(qualitycheck.id, 'view')"><i class="fa fa-info-circle"></i>查看</a>&nbsp;&nbsp;
-                        			<a href-void ng-click="showEditFck(qualitycheck.id, 'update')" ng-hide="isArchive || qualitycheck.processState=='3'" has-permission="737"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
-<!--                         			<a  ng-hide="isArchive" has-permission="738" href-void ng-click="remove(qualitycheck)"><i class="fa fa-trash-o"></i>删除</a> -->
+                        			<a href-void ng-click="showEditFck(qualitycheck.id, 'update')" ng-hide="isArchive || qualitycheck.processState=='3'" has-permission="737"><i class="fa fa-edit"></i>修改&nbsp;&nbsp;</a>
+                         			<a href-void ng-hide="isArchive || qualitycheck.subType!='3164' || qualitycheck.processState!='3' || qualitycheck.eatScore!=null" ng-click="editEatScore(qualitycheck)"><i class="fa fa-edit"></i>更新</a>
                         		</td>
                         	</tr>
                         </tbody>