1

src/main/resources/static/app/business/storeWareDetail/controller/storeWareDetailModalCtrl.js

@@ -133,20 +133,20 @@ angular.module('app.business').controller("storeWareDetailModalCtrl",
     $scope.getAttributeData = function() {
     	validator = $("#storeWareDetail-form").validate();
     	var parentid=1032; //粮油性质父级ID
-    	var notparentid = 3045;
-    	var notenumid = 3045;
+    	var notparentid = null;
+    	var notenumid = null;
     	
     	//计划管理下的计划 粮食性质 不取储备粮的，合同和通知单管理下出库业务中的粮食性质不取省级储备粮   用items.planManage区分
     	var ywlx = items.executeType;
     	//detailType = "contract"
-//    	if (items.detailType == "contract") {//合同业务
-//    		if (ywlx == "3148" || ywlx == "7131") {//出库类型的业务
-//    			notenumid = 6877;
-//    		}
-//    	} else if (items.detailType == "plan" || items.detailType == "notice") {
-//    		notparentid = 3045;
-//    		notenumid = 3045;
-//    	}
+    	if (items.detailType == "contract") {//合同业务
+    		if (ywlx == "3148" || ywlx == "7131") {//出库类型的业务
+    			notenumid = 6877;
+    		}
+    	} else if (items.detailType == "plan") {
+    		notparentid = 3045;
+    		notenumid = 3045;
+    	}
 
         enumService.findConditionEnum($scope.storeWareDetail.grainAttribute, parentid, notparentid, notenumid).then(function(data) {
             $scope.grainAttributeTreeData = data;

src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetectionModel.js

@@ -188,11 +188,15 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
             for (var i =1;i<= Object.keys(detailList).length; i++) {
                 if ($scope.td_type_5_avg_true) {
                     $("#t_body tr").eq(trNum).append(
+//                        "<td colspan='" + $scope.td_type_5_avg + "' style=\"border: 1px solid #000;text-align: center;\">"
+//                        + i + '层' + "</td>"
                         "<td colspan='" + $scope.td_type_5_avg + "' style=\"border: 1px solid #000;text-align: center;\">"
                         + i + '层' + "</td>"
                     );
                 } else {
                     $("#t_body tr").eq(trNum).append(
+//                        "<td colspan='" + $scope.td_type_5_avg_p + "' style=\"border: 1px solid #000;text-align: center;width:5%;\">"
+//                        + i + '层' + "</td>"
                         "<td colspan='" + $scope.td_type_5_avg_p + "' style=\"border: 1px solid #000;text-align: center;width:5%;\">"
                         + i + '层' + "</td>"
                     );

src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-model.html

@@ -33,7 +33,7 @@
             <table border="1" id="table" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0">
             	<caption align="top" style="font-size: 25px;text-align: center;color:black">{{orgInfo.orgName}}粮情检测报表</caption>
             	<tbody style="font-size: 10px;">
-            	<tr style="text-align: center;height:3px">
+            	<tr style="text-align: center;height:30px;">
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">仓房名称</td>
             		<td style="border: 1px solid #000;text-align: center;width:19%;">{{storeHouseCodeObj[vCfCode].storehouseName}}</td>
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">粮油品种</td>
@@ -43,7 +43,7 @@
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">数量(t)</td>
             		<td style="border: 1px solid #000;text-align: center;width:10%;">{{storehouseCode[vCfCode]==undefined?'':storehouseCode[vCfCode].kcsl/1000}}</td>
             	</tr>
-            	<tr>
+            	<tr style="text-align: center;height:30px;">
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">检测时间</td>
             		<td style="border: 1px solid #000;text-align: center;width:19%;">{{time | date:'yyyy/MM/dd HH:mm:ss'}}</td>
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">仓温</td>

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

@@ -99,18 +99,13 @@
 													<a has-permission="709" href-void ng-click="deletes(product.id)">
 														<i class="fa fa-trash-o"></i>删除
 													</a>
-													<a href-void ng-click="edit(product.id, 'detail')">
-														<i class="fa fa-info-circle"></i>查看
-													</a>
 													<a has-permission="710" href-void ng-click="gitSubmit(product.id)">
 														<i class="fa fa-info-circle"></i>审核
 													</a>
 												</span>
-												<span ng-if="product.deleteState=='2'">
-													<a href-void ng-click="edit(product.id, 'detail')">
-														<i class="fa fa-info-circle"></i>查看
-													</a>
-												</span>
+												<a href-void ng-click="edit(product.id, 'detail')">
+													<i class="fa fa-info-circle"></i>查看
+												</a>
 											</td>
 										</tr>
 									</tbody>

src/main/resources/static/app/storage/waterCheck/controller/waterCheckCtrl.js

@@ -82,6 +82,10 @@ angular.module('app.storage')
 
     //刪除
     $scope.deletes = function(id) {
+    	var flag = confirm("确定要删除吗？");
+        if (!flag) {
+            return;
+        }
     	waterCheckService.remove(id).then(function(data){
     		if (data.status == "success") {
     			$scope.loadData();

src/main/resources/static/app/system/controller/userCtrl.js

@@ -48,7 +48,6 @@ angular.module('app.system').controller("userCtrl",
         // 删除一条记录
         $scope.remove = function(userId) {
             var flag = confirm("确定要删除吗？删除用户会同时删除当前用户对应的员工的信息,请知悉!");
-            console.log(flag);
             if (!flag) {
                 return;
             }