批量更新好多

pom.xml

@@ -53,6 +53,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
+		<dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 		<dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-zuul</artifactId>

src/main/java/com/chinaitop/depot/config/WebSecurityConfig.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig 
+extends WebSecurityConfigurerAdapter 
+{
+
+	@Override
+    protected void configure(HttpSecurity http) throws Exception {
+        String[] urls = {
+                "*",
+                "/*",
+                "/*/*",
+                "/*/*/*",
+                "/*/*/*/*",
+                "/*/*/*/*/*/*",
+                "/depot-system/userInfo/login",
+                "/login",
+                "depot-system/userInfo/login",
+                "login"
+        };
+
+        
+        http.authorizeRequests()
+        .antMatchers("/**")
+//        .anyRequest()
+        .permitAll() //允许所有用户访问所有资源
+                .and()
+                .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
+
+        super.configure(http);
+    }
+}

src/main/resources/application.properties

@@ -1,31 +1,31 @@
 server.port=9025
 #本项目ip
-#eureka.instance.ip-address=10.10.1.25
-#使用ip替代实例名
-#eureka.instance.prefer-ip-address=true
-#设置实例的ID为ip:port
-#eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
+eureka.instance.hostname=172.16.0.16
 # 每隔10s发送一次心跳(默认30s)
 eureka.instance.lease-renewal-interval-in-seconds=10
 # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
 eureka.instance.lease-expiration-duration-in-seconds=30
 
+#eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:9001/eureka/
+eureka.client.serviceUrl.defaultZone=http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
+eureka.instance.status-page-url=http://${eureka.instance.hostname}:${server.port}/swagger-ui.html
+
+management.server.port=-1
+#management.endpoints.enabled-by-default=false
+
+
 #gbase8s的数据库配置
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#spring.datasource.url=jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
-#spring.datasource.username=gbasedbt
-#spring.datasource.password=cDbK2S0go8
-spring.datasource.url=jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+spring.datasource.url=jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
 spring.datasource.username=gbasedbt
-spring.datasource.password=GBase123
+spring.datasource.password=cDbK2S0go8
+
 spring.datasource.driverClassName=com.gbasedbt.jdbc.IfxDriver
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 
-eureka.client.serviceUrl.defaultZone=http://localhost:9001/eureka/
-
 spring.application.name=depot-web
 
-#eureka.instance.status-page-url=http://10.10.1.25:${server.port}/swagger-ui.html
+#eureka.instance.status-page-url=http://${eureka.instance.hostname}:${server.port}/swagger-ui.html
 
 # Redis数据库索引（默认为0）
 spring.redis.database=3
@@ -66,5 +66,5 @@ spring.servlet.multipart.max-request-size=60MB
 #validationQuery = "SELECT 1"
 #testWhileIdle = "true
 #图片路径 „
-web.upload-path=/home
+web.upload-path=/home/depot/depot-web/depot-file
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}

src/main/resources/static/app/act/util/auditInfoList-new-state.html

@@ -0,0 +1,83 @@
+<!-- MAIN CONTENT -->
+<div style="position:relative; padding: 0 14px;">
+    <!-- widget grid -->
+    <section id="widget-grid" widget-grid>
+        <!-- START ROW -->
+        <div class="row" style="margin: 0;">
+            <!-- NEW COL START -->
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <!-- Widget ID (each widget will need unique ID)-->
+                <div jarvis-widget id="form-grid-widget"
+                    data-widget-colorbutton="false" data-widget-editbutton="false"
+                    data-widget-custombutton="false">
+                    <!-- widget div-->
+                    <div style="border-top-width:1px; border-width:1px;position:relative;padding: 0; box-sizing: border-box;">
+                        <!-- widget content -->
+                        <div class="widget-body no-padding" style="margin: 0;">
+                            <form id="auditAdivce-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate" >
+                                <header ng-hide="isAuditMsg"><h3><strong>审批信息</strong></h3></header>
+                                <fieldset ng-hide="isAuditMsg">
+                                    <div ng-hide="isAuditMsg" class="form-group has-feedback"  >
+		                                <table class="table table-striped table-bordered table-hover" ng-repeat="audit in auditList" >
+		                                	<tr>
+		                                		<td  rowspan="3" width='10%'  >
+		                                			<label class="label"  style="margin-top: 45%;text-align: center;">{{audit.taskName}}</label>
+		                                		</td>
+		                                		<td>
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">处理人</label>
+		                                		</td>
+		                                		<td width='20%'>
+						                            <section>
+			                                            <label class="input"> 
+			                                                <input class="form-control" type="text" ng-readonly="true" ng-disabled="true"
+			                                                placeholder="{{userInfoAllData[audit.operator] }}"
+			                                                required>
+			                                            </label>
+			                                        </section>
+		                                		</td>
+		                                		<td >
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">审批时间</label>
+		                                		</td>
+		                                		<td colspan="2" width='30%' style="margin-top: 9px;text-align: center;">
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">{{audit.operateTime}}</label>
+		                                		</td>
+		                                	</tr>
+		                                	<tr>
+		                                		<td rowspan="2">
+		                                			<label class="label" style="margin-top: 20px;text-align: center;">审批意见</label>
+		                                		</td>
+		                                		<td colspan="4" style="margin-top: 9px;text-align: center;">
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">{{audit.content}}</label>
+		                                		</td>
+		                                	</tr>
+		                                	<tr>
+		                                		<td colspan="3" style="border-top: 0px;border-right: 0px;">
+		                                			<!-- 签字前面 -->
+		                                		</td>
+		                                		<td width='30%' style="border-top: 0px;border-left: 0px;">
+		                                		电子签名
+		                                		</td>
+		                                	</tr>
+		                                </table>
+                                    </div>
+                                 
+                                </fieldset>
+	                                <div  ng-hide="!isAudit" style=" border-width:1px; position:relative; padding: 12px 14px 12px 12px;">
+	                                    <label class="control-label pull-left" style="font-size:150%">审批意见</label>
+	                                    <textarea  class="form-control"  ng-model="audit.content" ng-readonly="!isAudit" rows="2" data-bv-field="review" required></textarea>
+	                                </div>
+	                                <footer class="text-align-center" >
+	                                    <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
+	                                    <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">保存</button>
+	                                    <button type="button" class="btn btn-primary" ng-hide="!isAudit" ng-click="audit('3')">拒绝</button>
+	                                    <button type="button" class="btn btn-primary" ng-hide="!isAudit" ng-click="audit('2')">驳回</button>
+	                                    <button type="button" class="btn btn-primary" ng-hide="!isAudit" ng-click="audit('1')">通过</button>
+	                                </footer>
+                            </form>
+                        </div>
+                    </div>
+				</div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/additionalHome/controller/businessCtrl.js

@@ -136,7 +136,7 @@ angular.module('app.additionalHome').controller('businessCtrl', function ($rootS
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -204,7 +204,7 @@ angular.module('app.additionalHome').controller('businessCtrl', function ($rootS
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.safeproduce.notifyList");
+    	$state.go("app.storage.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -213,11 +213,11 @@ angular.module('app.additionalHome').controller('businessCtrl', function ($rootS
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.list', {type:1});
+    		$state.go('app.storage.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/defendCtrl.js

@@ -47,19 +47,19 @@ angular.module('app.additionalHome').controller('defendCtrl', function ($rootSco
 	// 查看页面
     $scope.showViewNotify = function(id) {
     	$scope.switchTopMenu(19);
-        $state.go('app.safeproduce.notifyAdd', {id:id,isNotEdit:true});
+        $state.go('app.storage.safeproduce.notifyAdd', {id:id,isNotEdit:true});
     };
     
     // 发布通知公告
     $scope.showAddNotify=function () {
     	$scope.switchTopMenu(19);
-        $state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+        $state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     };
     
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.safeproduce.notifyList");
+    	$state.go("app.storage.safeproduce.notifyList");
     }
     
     //跳转报警信息列表
@@ -76,9 +76,9 @@ angular.module('app.additionalHome').controller('defendCtrl', function ($rootSco
     $scope.safeProduceTodo=function(layerType) {
     	$scope.switchTopMenu(19);
     	if("publish" == layerType){//跳转文档发布页面
-    		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
+    		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
     	}else if("list" == layerType) {//跳转文档列表页面
-    		$state.go('app.safeproduce.list', {type:1});
+    		$state.go('app.storage.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/qualityCtrl.js

@@ -96,7 +96,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
 	// 查看页面
     $scope.showViewNotify = function(id) {
     	$scope.switchTopMenu(19);
-        $state.go('app.safeproduce.notifyAdd', {id:id,isNotEdit:true});
+        $state.go('app.storage.safeproduce.notifyAdd', {id:id,isNotEdit:true});
     };
     
     // 发布通知公告
@@ -104,7 +104,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -149,7 +149,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.safeproduce.notifyList");
+    	$state.go("app.storage.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -158,11 +158,11 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.list', {type:1});
+    		$state.go('app.storage.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/storageCtrl.js

@@ -117,7 +117,7 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -168,7 +168,7 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.safeproduce.notifyList");
+    	$state.go("app.storage.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -177,11 +177,11 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.list', {type:1});
+    		$state.go('app.storage.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/transferCtrl.js

@@ -96,7 +96,7 @@ angular.module('app.additionalHome').controller('transferCtrl', function ($rootS
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -118,7 +118,7 @@ angular.module('app.additionalHome').controller('transferCtrl', function ($rootS
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.safeproduce.notifyList");
+    	$state.go("app.storage.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -127,11 +127,11 @@ angular.module('app.additionalHome').controller('transferCtrl', function ($rootS
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.safeproduce.list', {type:1});
+    		$state.go('app.storage.safeproduce.list', {type:1});
     	}
     }
     

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

@@ -51,7 +51,7 @@ angular.module('app', [
     'app.supervise',
     'app.cameraRecord',
     'app.alarm',
-    'app.safeproduce',
+    // 'app.safeproduce',
     //'app.foodbasicinfo',
     'app.qualityDlag',
     'app.cameraGroup',
@@ -68,11 +68,11 @@ angular.module('app', [
     'app.log',
     'app.additionalHome',
     'app.registrationTable',
-    'app.archive',
-    'app.risk',
-    'app.cstj',
-    'app.jczcsupervise'
-    
+    'app.archive'
+    //'app.risk',
+    //'app.cstj',
+    //'app.jczcsupervise'
+
 ])
 
 

src/main/resources/static/app/basic/file/fileService.js

@@ -0,0 +1,25 @@
+"use strict";
+
+angular.module('app.basic').service("fileService", function($http, $q, APP_CONFIG) {
+
+    //删除一个服务器的文件
+    this.deleteFile = function(wjpath) {
+        var d = $q.defer();
+    	$http({
+            method: 'POST',
+            url: APP_CONFIG.basicUrl + '/depot/basic/file/removeFile',
+            data: {
+            	wjPath : wjpath
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+        	// 请求失败执行代码
+    		d.reject("error");
+        });
+        
+        return d.promise;
+    }
+
+});

src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js

@@ -178,6 +178,8 @@ angular.module('app.basic')
     $scope.addZyzg = [];
     // 用于存放新增的上岗证
     //$scope.addSgz = [];
+    // 用于存放新增的证书附件
+    $scope.addZswj = [];
 	
 	// 新增或修改保管员信息跳转页面加载数据
     $scope.edit = function() {
@@ -193,6 +195,7 @@ angular.module('app.basic')
     		
     		$scope.addXwxl = data.xlxwList;
     		$scope.addZyjs = data.zyjsList;
+    		$scope.addZswj = data.zswjList;
     		for (var i = 0; i < $scope.addZyjs.length; i++) {
     			$scope.addZyjs[i].issueTime = $filter('date')($scope.addZyjs[i].issueTime, "yyyy-MM-dd");
     		}
@@ -328,6 +331,13 @@ angular.module('app.basic')
     			return;
     		}
     		$scope.addZyzg.push({datatype: 3,keeperId:kId});
+    	} else if (typeId === 5) {
+    		i = $scope.addZswj.length;
+    		if (i > 0 && null == $scope.addZswj[i-1].department) {
+    			alert("请先录入空行！");
+    			return;
+    		}
+    		$scope.addZswj.push({datatype: 5,keeperId:kId});
     	}
     }
 
@@ -367,6 +377,17 @@ angular.module('app.basic')
    		    }
    		    index = $scope.addZyzg.indexOf(obj);
    		    $scope.addZyzg.splice(index, 1);
+   	    } else if (typeId === 5) {
+   	    	/*if ($scope.addZswj.length <=1 ) {
+	            alert("至少要有一条职业资格信息！");
+	            return;
+	        }*/
+   	    	// 如果有ID，说明当前数据已经是存在于数据库的，那么要郑重删除
+   		    if (obj.id != undefined) {
+   		    	$scope.deleteEdu(obj.id);
+   		    }
+   		    index = $scope.addZswj.indexOf(obj);
+   		    $scope.addZswj.splice(index, 1);
    	    }
     }
     
@@ -386,7 +407,7 @@ angular.module('app.basic')
         });
     }
     
-    // 文件上传实例
+    // 头像图片文件上传
 	$scope.uploader = new FileUploader({
 		url : APP_CONFIG.basicUrl + '/fileUpload/uploadFileYS',
 		autoUpload : true, // 将文件添加到队列后自动上传
@@ -402,6 +423,40 @@ angular.module('app.basic')
 		}
 	});
 	
+	// 头像图片文件上传
+	$scope.zswjUploader = new FileUploader({
+		url : APP_CONFIG.basicUrl + '/fileUpload/uploadFileYS',
+		autoUpload : true, // 将文件添加到队列后自动上传
+		formData : [{fileType:'image'}], // 与文件一起发送的数据
+		removeAfterUpload : true, // 从队列上传后删除文件
+		// 上传进度
+		onProgressItem : function(fileItem, progress) {
+			console.info("正在上传：" + progress + "%");
+		},
+		// 回调函数，在一个文件上传成功后触发
+		onSuccessItem : function(fileItem, response, status, headers) {
+			$scope.keeper.avatorUrl = response;
+		}
+	});
+	
+	$scope.deleteFileByLinenumber = function(index) {
+		var index = $scope.addZswj.indexOf(index);
+        if (index != -1) {
+        	// 从linenumbers移除.
+            $scope.addZswj.splice(index, 1);
+            
+            if ($scope.fileMap.has($scope.linenumber)) {
+            	// 以linenumber为key从$scope.fileMap获取fileId.
+            	   var fileId = $scope.fileMap.get($scope.linenumber).id;
+		        	// 后台删除数据和文件.
+		        	$scope.deleteFileByFileId(fileId, index);
+		        	
+		        	// 从$scope.fileMap移除.
+		        	$scope.fileMap.delete(linenumber);
+			}
+        }
+	}
+	
 	//返回和取消
 	$scope.returnTop = function() {
 		if ($rootScope.previousState_name != '') {

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

@@ -21,7 +21,7 @@
 									<a href-void class="btn btn-default btn-xs" ng-click="returnTop()">
 										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
 									</a>
-									&nbsp;<strong>人员信息编辑</strong>
+									&nbsp;<strong>员工信息编辑</strong>
 									<span class="pull-right font-xs">带*的部分必须填写</span>
 								</header>
 								<fieldset>
@@ -153,6 +153,16 @@
 									            </span><input type="text" ng-model="keeper.avatorUrl" placeholder="" ng-readonly="isNotEdit">
 											</div>
 										</section>
+										<section class="col col-3">
+											<label class="label">是否涉及交流轮岗</label> 
+											<label class="select">
+												<select ng-model="keeper.sfsjjllg" name="sfsjjllg" ng-disabled="isNotEdit" class="form-control">
+													<option value="">--请选择--</option>
+													<option value="0">是</option>
+													<option value="1">否</option>
+												</select>
+											</label>
+										</section>
 									</div>
 								</fieldset>
 								<header>
@@ -201,7 +211,7 @@
 													</select>
 												</label>
 											</section>
-											<section class="col col-2">
+											<!-- <section class="col col-2">
 												<label class="label">学位明细</label>
 												<label class="select">
 													<select type="text" ng-model="keeperedu.degreeDetailed" name="degreeDetailed{{$index}}" 
@@ -216,6 +226,16 @@
 													ng-options="enum.enumid as enum.enumname for enum in dicDataList[5294]"
 													class="form-control" ng-disabled="isNotEdit"></select>
 												</label>
+											</section> -->
+											<section class="col col-2">
+												<label class="label">是否为涉粮专业</label> 
+												<label class="select">
+													<select ng-model="keeperedu.sfwslzy" name="sfwslzy{{$index}}" class="form-control" ng-disabled="isNotEdit">
+													    <option value="">--请选择--</option>
+													    <option value="0">是</option>
+													    <option value="1">否</option>
+													</select>
+												</label>
 											</section>
 											<section class="col col-1">
 												<label class="label"> </label>
@@ -290,17 +310,14 @@
 										<input type="hidden" ng-model="zyzg.id" />
 										<div class="row">
 											<section class="col col-2">
-												<label class="label">专业</label>
-												<label class="select">
-													<select ng-model="zyzg.occupation" name="occupation{{$index}}"
-													ng-options="enum.enumid as enum.enumname for enum in dicDataList[5307]"
-													class="form-control" ng-disabled="isNotEdit">
-														<option value="">--请选择--</option>
-												</select>
+												<label class="label">职业资格证书名称</label>
+												<label class="input">
+													<input type="text" ng-model="zyzg.department" maxlength="20"
+													name="departmente{{$index}}" ng-readonly="isNotEdit" />
 												</label>
 											</section>
 											<section class="col col-2">
-												<label class="label">等级</label>
+												<label class="label">职称(等级)</label>
 												<label class="select">
 													<select ng-model="zyzg.rank" name="rank{{$index}}" 
 														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5310]"
@@ -310,6 +327,35 @@
 												</label>
 											</section>
 											<section class="col col-2">
+												<label class="label">证书编号</label>
+												<label class="input">
+													<input type="text" ng-model="zyzg.zsbh" maxlength="25"
+													name="zsbh{{$index}}" ng-readonly="isNotEdit" />
+												</label>
+											</section>
+											<section class="col col-2">
+												<label class="label">专业</label>
+												<label class="select">
+													<select ng-model="zyzg.sfwslzy" name="sfwslzy{{$index}}" class="form-control" ng-disabled="isNotEdit">
+														<option value="">--请选择--</option>
+														<option value="0">涉粮相关专业</option>
+														<option value="1">非涉粮相关专业</option>
+												</select>
+												</label>
+											</section>
+											<section class="col col-2">
+												<label class="label">&nbsp;</label>
+												<label class="select">
+													<select ng-model="zyzg.occupation" name="occupation{{$index}}"
+													ng-options="enum.enumid as enum.enumname for enum in dicDataList[5307]"
+													class="form-control" ng-disabled="isNotEdit">
+														<option value="">--请选择--</option>
+												</select>
+												</label>
+											</section>
+										</div>
+									    <div class="row">
+											<section class="col col-2">
 												<label class="label">颁证机构</label> <label class="input">
 													<input type="text" ng-model="zyzg.issueFacility" maxlength="20"
 													name="issueFacility{{$index}}" ng-readonly="isNotEdit">
@@ -322,6 +368,7 @@
 													name="zyzgissueTime{{$index}}" ng-disabled="isNotEdit">
 												</label>
 											</section>
+											
 											<section class="col col-2">
 												<label class="label"></label> 
 												<label class="input">
@@ -364,6 +411,76 @@
 										</div>
 									</div>
 								</fieldset>
+								<header>
+									<h3>
+										<strong>证书附件</strong>&nbsp;&nbsp; <a ng-hide="isNotEdit" 
+											class="btn btn-primary btn-circle" ng-click="addEducation(keeper.id,5)">新增</a>
+									</h3>
+								</header>
+								<fieldset>
+									<!-- <div ng-repeat="zswj in addZswj">
+										<input type="hidden" ng-model="zswj.datatype" />
+										<input type="hidden" ng-model="zswj.keeperId" />
+										<input type="hidden" ng-model="zswj.id" />
+										<div class="input input-file">
+												<span class="button">
+									            	<input type="file" nv-file-select="" uploader="uploader" accept="image/*" options="id" id="fileInputId{{zswj}}
+									            	 ng-hide="isNotEdit" onchange="if (this.value != '')this.parentNode.nextSibling.value = this.value" />
+									                	浏览
+									            </span><input type="text" ng-model="zswj.department" name="departments{{$index}}" placeholder="" ng-readonly="isNotEdit">
+											</div>
+									</div> -->
+									<div>
+                                	<table ng-hide="isNotEdit" class="table table-striped table-bordered table-hover" ng-repeat="zswj in addZswj" ng-click="clickFileInput(linenumber)" >
+										<input type="hidden" ng-model="zswj.datatype" />
+										<input type="hidden" ng-model="zswj.keeperId" />
+										<input type="hidden" ng-model="zswj.id" />
+										<tr>
+											<th width='10%' >
+												<label class="label" style="margin-top: 9px;text-align: center;">附件</label>
+											</th>
+											<th colspan="4">
+												<section>
+									            	<div class="input input-file" style="margin-top: 9px; text-align: center; margin-right: 22px;">
+											            <span class="button" >
+											            	<input type="file" nv-file-select="" uploader="uploader" accept="image/*" options="id" id="fileInputId{{linenumber}}"
+											            		onchange="if (this.value != '')this.parentNode.nextSibling.value = this.value">
+											                	上传
+											            </span><input type="text" name="imgUrl" placeholder="" readonly="">
+										        	</div>
+									            </section>
+											</th>
+											<th width='10%'>
+										            <div class="input input-file" style="margin-top: 9px; text-align: center; margin-right: 16px;">
+														<span class="button"  ng-click="deleteFileByLinenumber(zswj)">删除
+											            </span>
+													</div>
+											</th>
+											
+										</tr>
+										<!--第四3个tr结束 -->
+		                             </table>
+
+                                	<!--回显文件的表格  -->
+                                	<table class="table table-striped table-bordered table-hover" ng-repeat="file in fileList" >
+										<tr>
+											<th width='10%' >
+												<label class="label" style="margin-top: 9px;text-align: center;">附件</label>
+											</th>
+											<th colspan="5">
+												<section >
+										            <input class="form-control" type="text" ng-model="file.department" readonly="">
+		                                		</section>
+											</th>
+											<th width='10%' >
+												<section style="margin-top: 9px; text-align: center; margin-right: 22px;">
+							                        <a class="btn btn-default" href-void ng-click="downloads(file.filePath, file.department)"><i class="fa fa-download"></i>下载</a>
+		                                		</section>
+											</th>
+										</tr>
+		                             </table>
+		                             </div>
+								</fieldset>
 								<footer class="modal-footer text-align-center">
 									<button ng-click="returnTop()"
 										class="btn btn-default btn-lg" data-dismiss="modal">取消</button>

src/main/resources/static/app/basic/keeper/views/keeper-list.html

@@ -9,7 +9,7 @@
 					<header>
 						<span class="widget-icon"> <i class="fa fa-table"></i>
 						</span>
-						<h2>人员信息列表</h2>
+						<h2>员工信息列表</h2>
 					</header>
 					<div>
 						<div class="widget-body no-padding">

src/main/resources/static/app/basic/keeper/views/keeper-view.html

@@ -10,7 +10,7 @@
 							<a href-void class="btn btn-default btn-xs" ng-click="returnTop()">
 								<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
 							</a>
-							&nbsp;<strong>人员信息展示</strong>
+							&nbsp;<strong>员工信息展示</strong>
 						</header>
 						<div class="col-sm-5" style="width:30%;padding-top:10px;height:305px">
 							<img style="width: 100%;height:100%" class="img-responsive"

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

@@ -9,7 +9,7 @@ angular.module('app.basic')
     .state('app.basic', {
         abstract: true,
         data: {
-            title: '基本信息'
+            title: '基础数据'
         }
     })
     //仓房管理list页
@@ -128,8 +128,45 @@ angular.module('app.basic')
             }
         }
     })
-    
-    
+    //初始化员工信息调用
+    .state('app.basic.keeperList', {
+    	url: '/keeperList',
+        data: {
+            title: '员工信息管理'
+        },
+        views: {
+            "content@app": {
+                controller: 'keeperCtrl',
+                templateUrl: 'app/basic/keeper/views/keeper-list.html'
+            }
+        }
+    })
+    //点新增或修改保管员信息调用
+    .state('app.basic.keeperEdit', {
+    	url: '/keeperEdit/:id/:showType',
+        data: {
+            title: '员工信息详情'
+        },
+        views: {
+            "content@app": {
+                controller: 'keeperCtrlEdit',
+                templateUrl: 'app/basic/keeper/views/keeper-edit.html'
+            }
+        }
+    })
+    //点查看跳转页面
+    .state('app.basic.keeperView', {
+    	url: '/keeperView/:id/:types',
+        data: {
+            title: '员工信息展示'
+        },
+        views: {
+            "content@app": {
+                controller: 'keeperViewCtrl',
+                templateUrl: 'app/basic/keeper/views/keeper-view.html'
+            }
+        }
+    })
     .state('app.basic.cameraList', {
         url: '/basic/cameraList',// 传参 : id/:name/:pwd
         data: {
@@ -395,527 +432,4 @@ angular.module('app.basic')
             }
         }
     })
-    
-    
-    /*----------------------------------------------客户------------------------------------*/
-    .state('app.basic.customer', {
-        abstract: true,
-        data: {
-            title: '客户管理'
-        }
-    })
-    
-    .state('app.basic.customer.list', {
-        url: '/basic/customer',
-        data: {
-            title: '客户档案管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerCtrl',
-                templateUrl: 'app/business/customer/views/customer-list.html'
-            }
-        }
-    })
-    .state('app.basic.customer.add', {
-            url: '/basic/customer/add/:id',
-            data: {
-                title: '客户档案新增'
-            },
-            views: {
-                "content@app": {
-                    controller: 'customerSaveCtrl as datatables',
-                    templateUrl: 'app/business/customer/views/customer-edit.html'
-                }
-            }
-        }
-    )
-    .state('app.basic.customer.edit', {
-        url: '/basic/customer/edit/:id',
-        data: {
-            title: '客户档案修改'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerSaveCtrl as datatables',
-                templateUrl: 'app/business/customer/views/customer-edit.html'
-            }
-        }
-    })
-    
-    
-    .state('app.basic.customer.badrecord', {
-        url: '/basic/customer/badrecord',
-        data: {
-            title: '客户不良记录管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerBadrecordCtrl',
-                templateUrl: 'app/business/customer/views/customerBadrecord-list.html'
-            }
-        }
-    })
-    
-    .state('app.basic.customer.blackList', {
-        url: '/basic/customer/blackList',
-        data: {
-            title: '客户黑名单管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerBlackListCtrl',
-                templateUrl: 'app/business/customer/views/customer-blackList.html'
-            }
-        }
-    })
-    
-    
-    //-----------------------------------------------------智能器材库------------------------------------------------------//
-        // 设备器材管理二级路由
-        .state('app.basic.device', {
-            abstract: true,
-            data: {
-                title: '设备器材管理'
-            }
-        })
-        // 设备器材入库
-        .state('app.basic.device.deviceStorageList', {
-            url: '/device/deviceStorageList',
-            data: {
-                title: '设备器材入库'
-            },
-            views: {
-                "content@app": {
-                    controller: 'deviceStorageCtrl',
-                    templateUrl: 'app/business/device/views/deviceStorage-list.html'
-                }
-            }
-        })
-        // 详情,编辑
-        .state('app.basic.device.deviceStorageList.edit', {
-            url: '/device/deviceStorageList/edit/:id/:isNotEdit',
-            data: {
-                title: '设备器材入库详情'
-            },
-            views: {
-                "content@app": {
-                    controller: 'deviceStorageEditCtrl',
-                    templateUrl: 'app/business/device/views/deviceStorage-edit.html'
-                }
-            }
-        })
-        //----------------设备入库登记开始---------------//
-        .state('app.basic.deviceInputList', {
-            url: '/deviceInputList',
-            data: {
-                title: '设备入库列表'
-            },
-            views: {
-                "content@app": {
-                    controller: 'deviceInputCtrl',
-                    templateUrl: 'app/business/device/views/deviceInput-list.html'
-                }
-            }
-        })  
-        .state('app.basic.deviceInputAdd', {
-        	url: '/deviceInputAdd/:id/:isNotEdit',
-        	data: {
-        		title: '设备入库'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceInputCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
-        		}
-        	}
-        })  
-        .state('app.basic.inputEdit', {
-        	url: '/inputEdit/:id/:isNotEdit',
-        	data: {
-        		title: '设备查看'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceInputCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
-        		}
-        	}
-        })  
-        //----------------设备入库登记结束---------------//
-        
-        //----------------器材领用开始---------------//
-        .state('app.basic.device.deviceGetList', {
-        	url: '/deviceGetList',
-        	data: {
-        		title: '机械器材领用'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-list.html'
-        		}
-        	}
-        })  
-        .state('app.basic.device.deviceGetAdd', {
-        	url: '/deviceGetAdd',
-        	data: {
-        		title: '领用信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-add.html'
-        		}
-        	}
-        })  
-        .state('app.basic.device.deviceGetBack', {
-        	url: '/deviceGetBack/:id/:getCount',
-        	data: {
-        		title: '归还信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetBackCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-back.html'
-        		}
-        	}
-        })  
-        .state('app.basic.device.deviceChack', {
-        	url: '/deviceChack/:id',
-        	data: {
-        		title: '信息详情'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetBackCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-detail.html'
-        		}
-        	}
-        })  
-        //----------------器材领用结束---------------//
-
-        // 设备器材管理三级路由
-        .state('app.basic.device.manage', {
-            abstract: true,
-            data: {
-                title: '设备管理'
-            }
-        })
-        //----------------器材保养开始---------------//
-        .state('app.basic.device.manage.deviceKeepList', {
-        	url: '/deviceKeepList',
-        	data: {
-        		title: '器材保养'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceKeepCtrl',
-        			templateUrl: 'app/business/device/views/deviceKeep-list.html'
-        		}
-        	}
-        })  
-        .state('app.basic.device.manage.deviceKeepAdd', {
-        	url: '/deviceKeepAdd',
-        	data: {
-        		title: '添加保养信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceKeepAddCtrl',
-        			templateUrl: 'app/business/device/views/deviceKeep-add.html'
-        		}
-        	}
-        }) 
-        .state('app.basic.device.manage.deviceKeepMassage', {
-        	url: '/deviceKeepMassage/:id',
-        	data: {
-        		title: '保养信息明细'
-        	},
-        	views: {   
-        		"content@app": {
-        			controller: 'deviceKeepSelCtrl',
-        			templateUrl: 'app/business/device/views/deviceKeep-olist.html'
-        		}
-        	}
-        }) 
-         //----------------器材保养结束---------------//
-        
-         //----------------器材维修开始---------------//
-        .state('app.basic.device.manage.deviceRepairList', {
-        	url: '/deviceRepairList',
-        	data: {
-        		title: '器材维修'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceRepairCtrl',
-        			templateUrl: 'app/business/device/views/deviceRepair-list.html'
-        		}
-        	}
-        })  
-        .state('app.basic.device.manage.devicerepairAdd', {
-        	url: '/devicerepairAdd',
-        	data: {
-        		title: '添加维修信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceRepairAddCtrl',
-        			templateUrl: 'app/business/device/views/deviceRepair-add.html'
-        		}
-        	}
-        })  
-        .state('app.basic.device.manage.deviceRepairMassage', {
-        	url: '/deviceRepairMassage/:id/:isNotEdit',
-        	data: {
-        		title: '维修信息明细'
-        	},
-        	views: {   
-        		"content@app": {
-        			controller: 'deviceRepairSaveCtrl',
-        			templateUrl: 'app/business/device/views/deviceRepair-olist.html'
-        		}
-        	}
-        }) 
-        
-        //----------------器材维修结束---------------//
-        
-        
-        //----------------设备报废开始---------------//
-        .state('app.basic.device.manage.deviceOutList', {
-        	url: '/deviceOutList',
-        	data: {
-        		title: '设备报废'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceOutCtrl',
-        			templateUrl: 'app/business/device/views/deviceOut-list.html'
-        		}
-        	}
-        })  
-         //----------------设备报废结束---------------//
-        //----------------台账开始---------------//
-        .state('app.basic.device.deviceAccountList', {
-        	url: '/deviceAccountList',
-        	data: {
-        		title: '台账'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceAccountCtrl',
-        			templateUrl: 'app/business/device/views/deviceAccount-list.html'
-        		}
-        	}
-        })
-        
-        .state('app.basic.device.accountEdit', {
-        	url: '/accountEdit/:deviceType/:deviceName/:model/:isNotEdit',
-        	data: {
-        		title: '设备台账'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceInputCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceAccount-edit.html'
-        		}
-        	}
-        }) 
-         //----------------台账结束---------------//
-        .state('app.basic.device.deviceCheckList', {
-        	url: '/deviceCheckList',
-        	data: {
-        		title: '盘点单'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceCheck-list.html'
-        		}
-        	}
-        })
-        .state('app.basic.device.checkAdd', {
-        	url: '/checkAdd',
-        	data: {
-        		title: '新建盘点单'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceCheckAddCtrl',
-        			templateUrl: 'app/business/device/views/deviceAdd.html'
-        		}
-        	}
-        })
-        .state('app.basic.device.checkEdit', {
-        	url: '/checkEdit/:checkNumber/:isNotEdit',
-        	data: {
-        		title: '修改盘点单'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceCheckEditCtrl',
-        			templateUrl: 'app/business/device/views/deviceEdit.html'
-        		}
-        	}
-        })
-        //---------------------------------设施管理------------------------------------------------------
-         // 设施管理二级路由
-         .state('app.basic.facility', {
-            abstract: true,
-            data: {
-                title: '设施管理'
-            }
-        })
-        //----------------设施基础信息维护开始---------------//
-        .state('app.basic.facility.facilityStorageList', {
-            url: '/facilityStorageList',
-            data: {
-                title: '设施基础信息维护'
-            },
-            views: {
-                "content@app": {
-                    controller: 'facilityListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-list.html'
-                }
-            }
-        })  
-        .state('app.basic.facility.addFacility', {
-            url: '/addFacility/:isNotEdit/:facility?',
-            data: {
-                title: '新增设施'
-            },
-            views: {
-                "content@app": {
-                    controller: 'addfacilityCtrl',
-                    templateUrl: 'app/business/facility/views/add-facility.html'
-                }
-            }
-        })  
-        
-        //----------------设施基础信息维护结束---------------//
-        //----------------设施保养开始---------------//
-        .state('app.basic.facility.facilityKeepList', {
-            url: '/facilityKeepList',
-            data: {
-                title: '设施保养'
-            },
-            views: {
-                "content@app": {
-                    controller: 'facilityKeepListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-keep.html'
-                }
-            }
-        }) 
-        .state('app.basic.facility.addFacilityKeep', {
-            url: '/addFacilityKeep/:isNotEdit/:facility?',
-            data: {
-                title: '添加设施保养信息'
-            },
-            views: {
-                "content@app": {
-                    controller: 'addfacilityKeepCtrl',
-                    templateUrl: 'app/business/facility/views/add-facility-keep.html'
-                }
-            }
-        })  
-        
-        //----------------设施保养结束---------------//
-         //----------------设施维修开始---------------//
-         .state('app.basic.facility.facilityGetList', {
-            url: '/facilityGetList',
-            data: {
-                title: '设施维修'
-            },
-            views: {
-                "content@app": {
-                    controller: 'facilityGetListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-get-list.html'
-                }
-            }
-        }) 
-        .state('app.basic.facility.addFacilityGet', {
-            url: '/addfacilityGet/:isNotEdit/:facility?',
-            data: {
-                title: '添加设施维修信息'
-            },
-            views: {
-                "content@app": {
-                    controller: 'addFacilityGetCtrl',
-                    templateUrl: 'app/business/facility/views/add-facility-get.html'
-                }
-            }
-        })  
-        
-        //----------------设施维修结束---------------//
-        // //----------------设施报废开始---------------//
-        // .state('app.basic.facility.facilityScrapList', {
-        //     url: '/facilityScrapList',
-        //     data: {
-        //         title: '设施报废'
-        //     },
-        //     views: {
-        //         "content@app": {
-        //             controller: 'facilityScrapListCtrl',
-        //             templateUrl: 'app/business/facility/views/facility-scraplist.html'
-        //         }
-        //     }
-        // }) 
-        // .state('app.basic.facility.addFacilityScrap', {
-        //     url: '/addFacilityScrap',
-        //     data: {
-        //         title: '添加设施报废信息'
-        //     },
-        //     views: {
-        //         "content@app": {
-        //             controller: 'addFacilityScrapCtrl',
-        //             templateUrl: 'app/business/facility/views/add-facility-scrap.html'
-        //         }
-        //     }
-        // })  
-        
-        // //----------------设施报废结束---------------//
-        
-        
-        
-        //初始化员工信息调用
-    .state('app.basic.keeperList', {
-    	url: '/keeperList',
-        data: {
-            title: '人员管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'keeperCtrl',
-                templateUrl: 'app/basic/keeper/views/keeper-list.html'
-            }
-        }
-    })
-    
-    //点新增或修改保管员信息调用
-    .state('app.basic.keeperEdit', {
-    	url: '/keeperEdit/:id/:showType',
-        data: {
-            title: '人员信息详情'
-        },
-        views: {
-            "content@app": {
-                controller: 'keeperCtrlEdit',
-                templateUrl: 'app/basic/keeper/views/keeper-edit.html'
-            }
-        }
-    })
-    //点查看跳转页面
-    .state('app.basic.keeperView', {
-    	url: '/keeperView/:id/:types',
-        data: {
-            title: '人员信息展示'
-        },
-        views: {
-            "content@app": {
-                controller: 'keeperViewCtrl',
-                templateUrl: 'app/basic/keeper/views/keeper-view.html'
-            }
-        }
-    })
 });

src/main/resources/static/app/business/commonUtilService.js

@@ -124,4 +124,136 @@ angular.module('app.business').service("commonUtilService", function($http, $q,
         return (arg1*m+arg2*m+arg3*m+arg4*m+arg5*m+arg6*m)/m;
     }
 
+    //四舍五入保留一位小数
+    this.getMath1 = function(v) {
+        if (isNaN(v) || v == "") {
+            v = "0.0";
+        } else {
+            v = Math.round(v*10)/10;
+            v = v.toString();
+            var rs = v.indexOf('.');
+            if(rs < 0){
+                v = v + ".0";
+            }else{
+                while(v.length <= rs + 1){v += '0';}
+            }
+        }
+        return v;
+    }
+
+    //四舍五入保留两位小数
+    this.getMath = function(v) {
+        if (isNaN(v) || v == "") {
+            v = "0.00";
+        } else {
+            v = Math.round(v*100)/100;
+            v = v.toString();
+            var rs = v.indexOf('.');
+            if(rs < 0){
+                v = v + ".00";
+            }else{
+                while(v.length <= rs + 2){v += '0';}
+            }
+        }
+        return v;
+    }
+    
+    //将v四舍五入，且保留n位小数
+    this.getMath_N = function(v, n) {
+        if (isNaN(v) || v == "") {
+        	if (isNaN(n) || v == "") {
+        		v = "0.00";
+        	} else if (n == 0) {
+        		v = "0";
+        	} else {
+        		v = "";
+        		for (var i = 1; i <= n; i++) {
+            		if (i == 1) {
+            			v = "0.0";
+            		} else {
+            			v = v+"0";
+            		}
+            	}
+        	}
+        } else {
+            v = Math.round(v*100)/100;
+            v = v.toString();
+            var rs = v.indexOf('.');
+            if (rs < 0) {
+            	if (n > 0) {
+            		for (var i = 1; i <= n; i++) {
+            			if (i == 1) {
+                			v = v+".0";
+                		} else {
+                			v = v+"0";
+                		}
+            		}
+            	}
+            }else{
+                while(v.length <= rs + n){v += '0';}
+            }
+        }
+        return v;
+    }
+
+    /**
+     * 判断奇进偶舍(目前最多保留两位小数)
+     * v:原数据值
+     * n:要保留的小数位数
+     */
+    this.checkJqos = function(v, n) {
+    	if (!isNaN(v) && v != "") {
+    	    var pos = v.toString().indexOf(".");
+    	    if (pos == -1) {
+    	    	var f = n;
+    	    	v = v + ".";
+    	    	for (var i = 0; i < n+1; i++) {
+    	    		v=v+"0";
+    	    	}
+    		} else {
+                var len = v.toString().substr(pos + 1, v.toString().length).length;
+                if (len<(n+1)) {
+                    var d = n+1;
+                    var s = d-len;//计算少了少几位小数
+                    //把少的位置补上
+                    for (var i = 0; i < s; i++) {
+    	    			v=v+"0";
+    	    		}
+                }
+    			var intv, secondNum, firstNum;
+    	        if (n==1) {
+    	        	intv = v.toString().substr(0, pos);
+    	        	secondNum = parseInt(v.toString().substr(pos + 2, 1));	//第二位小数
+    	        	firstNum = parseInt(v.toString().substr(pos + 1, 1));	//第一位小数
+    	            if (secondNum == 5) {
+    	                if (firstNum % 2 == 0) {
+    	                    v = intv.toString()+'.'+firstNum.toString()+'4';
+    	                } else {
+    	                    v = intv.toString()+'.'+firstNum.toString()+'6';
+    	                }
+    	        	} else {
+    	        		v = intv.toString()+'.'+firstNum.toString()+secondNum.toString();
+    	        	}
+    	        } else if (n==2) {
+    	        	intv = v.toString().substr(0, pos+2);
+                    firstNum = parseInt(v.toString().substr(pos + 2, 1));	//第二位小数
+    	            secondNum = parseInt(v.toString().substr(pos + 3, 1));	//第三位小数
+
+    	        	if (secondNum == 5) {
+    	                if (firstNum % 2 == 0) {
+    	                    v = intv.toString()+firstNum.toString()+'4';
+    	                } else {
+    	                    v = intv.toString()+firstNum.toString()+'6';
+    	                }
+    	        	} else {
+    	        		v = intv.toString()+firstNum.toString()+secondNum.toString();
+    	        	}
+    	        }
+    	     }
+    	    v = this.getMath1(v);
+    	} else {
+    		v = 0.0
+    	}
+    	return v;
+    }
 })

src/main/resources/static/app/business/customer/controller/customerCtrl.js

@@ -28,7 +28,7 @@ angular.module('app.business').controller("customerCtrl", function($scope, $root
     	if($scope.menu!=null){
     		$state.go('app.business.management.customer.add', {id : 0,menu:$scope.menu});
     	}else{
-    		$state.go('app.basic.customer.add', {id : 0});
+    		$state.go('app.business.customer.add', {id : 0});
     	}
         
     }
@@ -38,7 +38,7 @@ angular.module('app.business').controller("customerCtrl", function($scope, $root
     	if($scope.menu!=null){
     		$state.go('app.business.management.customer.edit', {id : id,menu:$scope.menu});
     	}else{
-    		$state.go('app.basic.customer.edit', {id : id});
+    		$state.go('app.business.customer.edit', {id : id});
     	}
     }
     

src/main/resources/static/app/business/customer/controller/customerSaveCtrl.js

@@ -163,7 +163,7 @@ angular.module('app.business').controller("customerSaveCtrl", function($scope, $
         if ($rootScope.previousState_name != '') {
         	$rootScope.back();
         } else {
-        	$state.go('app.basic.customer.list');
+        	$state.go('app.business.customer.list');
         }
     }
     

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

@@ -11,18 +11,15 @@ angular.module('app.business').controller("deliveryStorageNoticeAuditPassCtrl",
             console.log(data);
         });
     }
-    
-    
+
     $scope.loadData();
-    
+
     // 清空查询条件.
     $scope.clearConditions = function() {
    	    $scope.searchCondition = {};
    	    $scope.loadData();
     }
 
-
-
     // 查看页面.
     $scope.showView = function(deliveryStorageNotice) {
         if (deliveryStorageNotice.billType == "1") {

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

@@ -1,7 +1,7 @@
 angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
     function($scope, $http, $filter, $stateParams, $state, $uibModal, $rootScope,agentDepotService,
-             deliveryStorageNoticeService, deliveryStorageNoticeAuditService, commonUtilService,
-             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, userRoleService, $location, APP_CONFIG) {
+             deliveryStorageNoticeService, deliveryStorageNoticeAuditService, commonUtilService, 
+             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, userRoleService, qualitycheckService, $location, APP_CONFIG) {
 
         $scope.deliveryStorageNotice = {};
         $scope.billNumber = {};
@@ -73,22 +73,22 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                 }
             });
         }
-        
 
         //选择接收通知单
         $scope.getNotice = function (val) {
         	
-        	//$scope.deliveryStorageNotice.agreementNumber = "";//协议号
+        	//$scope.deliveryStorageNotice.agreementNumber = "";//协议号1111
         	
         	$scope.modelItem = [];
 
         	if($stateParams.noticeType == "delivery"){//出库通知单  选择销售或者轮换的通知单
-        		$scope.modelItem.ywtype = 1; //竞买的通知单
-        		$scope.modelItem.cktzd = 0; //标识
-        		//$scope.modelItem.crktype = 3; //出库
+        		//$scope.modelItem.ywtype = 1; //竞买的通知单
+        		//$scope.modelItem.cktzd = 0; //标识
+        		$scope.modelItem.crktype = 3; //出库
+        		$scope.modelItem.auditState = 5;//选择审批通过的
         	}else{
-                $scope.modelItem.ywtype = 1;//入库 收储
-                //$scope.modelItem.crktype = 1;//入库 
+                //$scope.modelItem.ywtype = 1;//入库 收储
+                $scope.modelItem.crktype = 1;//入库 
         	}
         	if($scope.lsoryltype == '000'){//粮食
         		$scope.modelItem.lyflag = 1;
@@ -96,7 +96,6 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
         		$scope.modelItem.lyflag = 0;
         	}
         	
-        	$scope.modelItem.auditState = 5;//选择审批通过的
         	$scope.modelItem.isNotice = 0;//选择可以引用的通知单
             var modalInstance = $uibModal.open({
                 size: 'lg',
@@ -115,74 +114,103 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
             modalInstance.result.then(function (result) {
                 if (result != null) {
                     //result是选中的值，addedDetail是现在的值，遍历一遍result里面的值，在addedDetail里面存在不存在，如果不存在，就进去就可以了
-                    for (var index = 0;index < result.length; index++) {
-                        const ele1 = result[index];
-                        var isfind = false;//标记是否在addedDetail里面找到该值
-                        for (var j = 0; j < $scope.addedDetail.length; j++) {
-                            const ele2 = $scope.addedDetail[j];
-                            if(ele1.id === ele2.id){
-                                //id唯一，判断id是否相等，如果相等，标记找到，说明addedDetail里面已经存在该值，不需要放在addedDetail里面了
-                                isfind = true;
-                                continue;
+                	const ele1 = result[0];
+                    ele1.state = ele1.orgId;//代储库的orgId
+                    if(ele1.wareHouseId != 'undefined' && ele1.wareHouseId !=null){
+                    	ele1.warehouseId = ele1.wareHouseId;
+                    	ele1.warehouseName = $rootScope.wares[ele1.warehouseId].warehouseName;
+            		}
+                    ele1.houseName = $rootScope.storehouseObj[ele1.houseId].storehouseName;
+
+                    if ($stateParams.noticeType == "delivery") {//出库前检查有没有做出库检验
+                    	//判断当前仓房是否做了出库检验，没做的话不允许做出库通知单
+                		qualitycheckService.findConditionCkCheck(ele1.houseId, ele1.warehouseId, '3').then(function (data) {
+
+                            if (data.status == "200" && data.msg.length > 0) {
+                            	$scope.settzdData(ele1, result);
+                            } else {
+                            	$scope.addedDetail = [];
+                            	result = [];
+                            	alert("您当前所选择的仓房未做出库检验，不允许做出库通知单！");
+                            	return;
                             }
-                        }
-                        if(!isfind){
-                            //如果没有找到该值，说明不存在，就需要放到改数组里面，渲染到页面上
-//                            $scope.addedDetail.push(ele1);
-                        	$scope.addedDetail[0] = ele1;
-                        }
-                    }
-
-                    if(val=="1" && $scope.addedDetail.length>0){
-                		$('#xzht').css('display','none');
-                	}
-                    
-                    //给协议号赋值
-                    for (var i=0; i< result.length; i++) {
-                    	if ($stateParams.noticeType == "delivery") {//出库
-                    		if (result[i].ywtype == "2") {//销售=竞价
-                				$scope.addedDetail[i].htbh = result[i].contractNumber;//通知单本身的协议号就是合同号
-                				$scope.addedDetail[i].agreementNumber = null;
-                    		}else if (result[i].ywtype == "3") {//包干，通知单的合同号是从接收合同引的，本身的协议号/合同号的值就只是协议号
-                    			$scope.addedDetail[i].htbh = result[i].htbh;
-                    			$scope.addedDetail[i].agreementNumber = result[i].contractNumber;
-                    		}
-                    	}
-                    }
-                    //根据合同号获取接收合同信息中的客户ID
-                    if ($scope.addedDetail[0].htbh != null) {
-                    	contractReceiveService.getPageInfo(null, 
-                    			null, 
-                    			$scope.addedDetail[0].htbh,
-                    			null,
-                    			null,
-                    			null).then(function (data) {
-                    				$scope.pageInfo = data;
-                    				if (data.list != null && data.list.length > 0) {
-                    					var khid = data.list[0].khid;
-                    					$scope.addedDetail[0].outCount = data.list[0].htzsl;
-                    					$scope.addedDetail[0].outPrice = data.list[0].htdj;
-                    					$scope.addedDetail[0].outDetailTotalPrice = data.list[0].htzj;
-                    					$scope.deliveryStorageNotice.shipingCount = $scope.addedDetail[0].outCount;
-                    					$scope.deliveryStorageNotice.moneyQuantity = $scope.addedDetail[0].outDetailTotalPrice;
-                    					//带出客户
-                    					$scope.getCustomer(khid);
-                    				}
-                    			}, function (data) {
-                    				console.log(data);
-                    			});
+                        }, function (data) {
+                            console.log(data);
+                        });
+                    } else {//入库
+                    	ele1.grainAttribute = 3052;
+                    	$scope.settzdData(ele1, result);
                     }
-                    // 计算总数量.
-                    $scope.countSumAmount();
-                    //计算总金额
-                    $scope.countMoneyQuantity();
                     
+
                 }
 
             }, function (reason) {
                 console.log(reason);
             });
         }
+        
+        $scope.settzdData = function(ele1, result) {
+        	var isfind = false;//标记是否在addedDetail里面找到该值
+
+        	if ($scope.addedDetail.length > 0) {
+        		const ele2 = $scope.addedDetail[0];
+        		if(ele1.id === ele2.id){
+        			//id唯一，判断id是否相等，如果相等，标记找到，说明addedDetail里面已经存在该值，不需要放在addedDetail里面了
+        			isfind = true;
+        		}
+        	}
+
+            if(!isfind){
+                //如果没有找到该值，说明不存在，就需要放到改数组里面，渲染到页面上
+//                    $scope.addedDetail.push(ele1);
+            	$scope.addedDetail[0] = ele1;
+            }
+
+            //给协议号赋值
+            if (result[0].ywtype == "3") {//包干，通知单的合同号是从接收合同引的，本身的协议号/合同号的值就只是协议号
+    			$scope.addedDetail[0].htbh = result[0].htbh;
+    			$scope.addedDetail[0].agreementNumber = result[0].contractNumber;
+    			$scope.addedDetail[0].incomingType = "1";//包干轮换
+    		} else {//出库和入库的竞价类型、还有兜底是一种模式
+        		$scope.addedDetail[0].htbh = result[0].contractNumber;//通知单本身的协议号就是合同号
+				$scope.addedDetail[0].agreementNumber = null;
+				if (result[0].ywtype == "4") {
+					$scope.addedDetail[0].incomingType = "5";//兜底
+				} else if (result[0].ywtype == "1") {
+					$scope.addedDetail[0].incomingType = "3";//竞买
+				}
+        	}
+
+            //根据合同号获取接收合同信息中的客户ID
+            if ($scope.addedDetail[0].htbh != null) {
+            	contractReceiveService.getPageInfo(null, 
+            			null, 
+            			$scope.addedDetail[0].htbh,
+            			null,
+            			null,
+            			null).then(function (datas) {
+            				$scope.pageInfo = datas;
+            				if (datas.list != null && datas.list.length > 0) {
+            					var khid = datas.list[0].khid;
+            					//$scope.addedDetail[0].outCount = data.list[0].htzsl;
+            					$scope.addedDetail[0].outPrice = datas.list[0].htdj;
+            					var outDetailTotalPrice = commonUtilService.accMul($scope.addedDetail[0].outCount, $scope.addedDetail[0].outPrice);
+            					$scope.addedDetail[0].outDetailTotalPrice = outDetailTotalPrice;
+            					$scope.deliveryStorageNotice.shipingCount = $scope.addedDetail[0].outCount;
+            					$scope.deliveryStorageNotice.moneyQuantity = $scope.addedDetail[0].outDetailTotalPrice;
+            					//带出客户
+            					$scope.getCustomer(khid);
+            				}
+            			}, function (datas) {
+            				console.log(datas);
+            			});
+            }
+            // 计算总数量.
+            $scope.countSumAmount();
+            //计算总金额
+            $scope.countMoneyQuantity();
+        }
 
      
         //------------------------------提交（选择审批人）-----------------------------------
@@ -525,7 +553,8 @@ 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;
+                    //contract_obj.grainAttribute = result.lyxz; 
+                    contract_obj.grainAttribute = 3052;
                     contract_obj.grainAnnual = result.shnd;
                     contract_obj.grainProducingArea = result.lycd;
                     contract_obj.inPrice = result.htdj;
@@ -770,7 +799,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 	    		params.planOutRemainingNumber = detailInfo.planOutRemainingNumber;  //计划的剩余数量
 	    		params.copyId = copyId;
 	    		if (detailInfo.crktype == 3) {//出库
-	    			if (detailInfo.ywtype == "2") {//销售=竞价
+	    			if (detailInfo.ywtype == "2" || detailInfo.ywtype == "4") {//销售=竞价
 	    				if (detailInfo.htbh == null) {
 	    					params.htbh = detailInfo.contractNumber;//通知单本身的协议号就是合同号
 	    					params.agreementNumber = null;
@@ -840,7 +869,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 	    						}
 	    						
 	    					}, function (data) {
-	    						console.log(data);  
+	    						console.log(data);
 	    					});
 	    					//货位名称
 	    					agentDepotService.getAgentStoreWareList($rootScope.userInfo.orgId,result.houseId).then(function(data) {
@@ -1161,6 +1190,8 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 		                                		delete $scope.addedDetail[i].id;
 		                                  }*/
                                         $scope.detailList.push($scope.addedDetail[i]);
+                                        delete $scope.addedDetail[i].cblx;
+                                        delete $scope.addedDetail[i].ysid;
                                         
                                         if($scope.addedDetail[i].grainGrade == null || $scope.addedDetail[i].grainGrade == ""){
                                         	alert("明细信息中等级不能为空，否则不能提交");

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

@@ -2,6 +2,7 @@ angular.module('app.business').controller("propertyTransitionSheetAuditCtrl", fu
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
 	
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	//isSheet=0代表是性质转变单
 	$scope.searchCondition = {isSheet:0};
      // 获取列表数据
      $scope.loadData = function() {

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

@@ -3,14 +3,11 @@ angular.module('app.business').controller("receiveNoticeCtrl", function($scope,
 	
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
 
+	//isNotice=0代表是可引用的通知单,sfzswtzd=0代表允许展示在接收通知单列表中
 	$scope.searchCondition = {isNotice : 0};
      // 获取列表数据
      $scope.loadData = function() {
     	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
-             /*//单位换算成吨
-    		 for (var i = 0; i < data.list.length; i++) {
-            	 data.list[i].count = commonUtilService.accDiv(data.list[i].count,1000);
-			 }*/
              $scope.pageInfo = data;
          },function(data){
              console.log(data);

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

@@ -12,12 +12,14 @@ angular.module('app.business').controller("receiveNoticeSaveCtrl",
 	         }else if($scope.businessNoticeReceive.crktype == 3){
 	        	 $scope.businessNoticeReceive.crktype = "出库";
 	         }
-	         
+
 	         $scope.ywlx = "";
 	         if ($scope.businessNoticeReceive.ywtype == 1 || $scope.businessNoticeReceive.ywtype == 2) {//<!-- 1竞买=竞价,2 销售=竞价 3轮换=包干 --> 
 	        	 $scope.ywlx = "竞价";
 	         } else if ($scope.businessNoticeReceive.ywtype == 3){
 	        	 $scope.ywlx = "包干";
+	         } else if ($scope.businessNoticeReceive.ywtype == 4){
+	        	 $scope.ywlx = "兜底";
 	         }
 	     },function(data){
 	    	 console.log(data);
@@ -29,7 +31,12 @@ angular.module('app.business').controller("receiveNoticeSaveCtrl",
 	 $scope.getReceiveContract = function(businessNoticeReceive) {
          var params = [];
          params.houseId = businessNoticeReceive.houseId;
- 		 params.warehouseId = businessNoticeReceive.wareHouseId;
+         var cflx = $rootScope.storehouseObj[params.houseId].datatype;
+         if (cflx == "0") {//仓房的数据
+        	 params.warehouseId = businessNoticeReceive.wareHouseId;
+         } else {
+        	 params.warehouseId = null;
+         }
  		 if (businessNoticeReceive.crktype == "出库") {//销售
  			 params.htlx = "1";
  		 } else if (businessNoticeReceive.crktype == "入库") {//采购

src/main/resources/static/app/business/deliveryStorageNotice/views/grainStorageNotice-edit.html

@@ -138,6 +138,8 @@
 												<strong>粮食信息</strong>
 												<a class="btn btn-primary" ng-hide="xztzdButton" 
 													ng-click="getContract()">选择合同</a>
+												<a class="btn btn-primary" ng-hide="xztzdButton" 
+													ng-click="getNotice('0')">选择通知单</a>
 											</h3>
 
 										</header>

src/main/resources/static/app/business/deliveryStorageNotice/views/propertyTSheet-list.html

@@ -17,7 +17,7 @@
                                     <div class="form-group">
                                        <label>仓房名称:&emsp;   
 											<select ng-model="searchCondition.houseId" class="form-control input-sm"
-													ng-options="store.storehouseId as store.storehouseName for store in storelist"
+													ng-options="store.storehouseId as store.storehouseName for store in store_tank_list"
 													ng-change="loadWare()">
 												<option value="">请选择</option>
 											</select>&emsp;
@@ -30,14 +30,19 @@
 												<option value="">请选择</option>
 											</select>&emsp;
                                        </label>
-                                       <label>
+                                       <select class="form-control input-sm" ng-model="searchCondition.crktype">
+                                           <option value="">请选择</option>
+                                           <option value="1">入库</option>
+                                           <option value="3">出库</option>
+                                       </select>
+                                       <!-- <label>
                                        		审批状态:&emsp;
                                             <select class="form-control input-sm" ng-model="searchCondition.auditState">
                                                             <option value="">请选择</option>
                                                             <option value="14">审批中</option>
                                                             <option value="5">审批结束</option>
                                             </select>
-                                       </label>&emsp;
+                                       </label> -->&emsp;
 	                                       <label><a class="btn btn-default btn-sm" ng-click="loadData()">
 														<i class="fa fa-search"></i>&nbsp;查&nbsp;询
 													</a>
@@ -60,6 +65,7 @@
 		                        <tr>
 		                        	<th data-class="expand" style="text-align:center;" width="3%"> 序号</th>
 		                            <th data-class="expand" style="text-align:center;" width="7%"> 性质转变单编号</th>
+		                            <th data-class="expand" style="text-align:center;" width="7%"> 出入库类型</th>
 		                            <th data-class="expand" style="text-align:center;" width="4%"> 仓房名称</th>
 		                            <th data-class="expand" style="text-align:center;" width="4%"> 货位名称</th>
 		                            <th data-class="expand" style="text-align:center;" width="5%"> 粮油品种</th>
@@ -77,6 +83,7 @@
 	                            <tr ng-repeat="receiveNotice in pageInfo.list">
 	                                <td data-class="expand" style="text-align:center;">{{$index+1}}</td>
 	                                <td data-class="expand" style="text-align:center;">{{receiveNotice.lsxzzbdh}}</td>
+	                                <td data-class="expand" style="text-align:center;">{{receiveNotice.crktype==1?"入库":"出库"}}</td>
 	                                <td data-class="expand" style="text-align:center;">{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
 	                                <td data-class="expand" style="text-align:center;">
 									    <span ng-if="receiveNotice.wareHouseId != null">{{wares[receiveNotice.wareHouseId].warehouseName}}</span>
@@ -87,14 +94,16 @@
 	                                <td data-class="expand" style="text-align:center;">{{dicData[receiveNotice.grainAttribute]}}</td>
 	                                <td data-class="expand" style="text-align:center;">{{dicData[receiveNotice.hzqlsxzdm]}}</td>
 	                                <td data-class="expand" style="text-align:center;">{{receiveNotice.count}}</td>
-	                                <td data-class="expand" style="text-align:center;">{{receiveNotice.receiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                                <td data-class="expand" style="text-align:center;">{{receiveNotice.hzrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
 	                                <td data-class="expand" style="text-align:center;">
 									    <span ng-if="receiveNotice.auditState == 0">仓储部经理审批中</span>
 									    <span ng-if="receiveNotice.auditState == 1">质检部经理审批中</span>
 									    <span ng-if="receiveNotice.auditState == 2">统计部经理审批中</span>
 									    <span ng-if="receiveNotice.auditState == 3">会计审批中</span>
 									    <span ng-if="receiveNotice.auditState == 4">库领导审批中</span>
-									    <span ng-if="receiveNotice.auditState == 5">审批结束</span>
+									    <span ng-if="receiveNotice.auditState == 5 && receiveNotice.crktype=='3'">审批结束</span>
+									    <span ng-if="receiveNotice.auditState == 5 && receiveNotice.crktype=='1'">待第三方质检合格</span>
+									    <span ng-if="receiveNotice.auditState == 6 && receiveNotice.crktype=='1'">审批结束</span>
 									</td>
 	                                <td data-class="expand" style="text-align:center;">
 	                                	<a href-void ng-click="auditView(receiveNotice.id)"><i class="fa fa-info-circle"></i>查看</a>

src/main/resources/static/app/business/deliveryStorageNotice/views/receiveNotice-edit.html

@@ -104,7 +104,7 @@
                               	</div>
                               	<div>
                               		<section class="col col-3">
-										<label class="label">出库期限：</label>
+										<label class="label">质检报告有效期：</label>
 										<label class="input">
 											<input type="text" ng-model="businessNoticeReceive.outgoingPeriod" name="outgoingPeriod" ng-readonly="isNotEdit" />
 												   

src/main/resources/static/app/business/deliveryStorageNotice/views/receiveNotice-list.html

@@ -93,6 +93,7 @@
 		                                    <div ng-switch-when="1">竞价</div>
 		                                    <div ng-switch-when="2">竞价</div>
 		                                    <div ng-switch-when="3">包干</div>
+		                                    <div ng-switch-when="4">兜底</div>
 	                                    </div>
 	                                </td>
 	                                <td>{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
@@ -104,7 +105,16 @@
 	                                <td>{{dicData[receiveNotice.grainGrade]}}</td>
 	                                <td>{{receiveNotice.count}}</td>
 	                                <td>{{receiveNotice.receiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-	                                <td>{{receiveNotice.htbh}}</td>
+	                                <td>
+	                                    <div>
+	                                        <div ng-switch="{{receiveNotice.ywtype}}"><!-- 1竞买2 销售 3轮换 -->
+			                                    <div ng-switch-when="1">{{receiveNotice.contractNumber}}</div>
+			                                    <div ng-switch-when="2">{{receiveNotice.contractNumber}}</div>
+			                                    <div ng-switch-when="3">{{receiveNotice.htbh}}</div>
+			                                    <div ng-switch-when="4">{{receiveNotice.contractNumber}}</div>
+		                                    </div>
+	                                    </div>
+	                                </td>
 	                                <td>
 	                                	<a href-void ng-click="edit(receiveNotice.id, 'show')"><i class="fa fa-info-circle"></i>查看</a>
 	                                	<a ng-show="receiveNotice.ywtype==3" href-void ng-click="edit(receiveNotice.id, 'glht')"><i class="fa fa-info-circle"></i>关联合同</a>

src/main/resources/static/app/business/device/controller/deviceAccountCtrl.js

@@ -23,7 +23,7 @@ angular.module('app.business')
 	    
 	 // 查看页面
 	    $scope.showViewInput = function(deviceType,deviceName,model) {
-	    	$state.go('app.basic.device.accountEdit',{ssfl:deviceType,deviceName:deviceName,model:model,isNotEdit:true});
+	    	$state.go('app.business.device.accountEdit',{ssfl:deviceType,deviceName:deviceName,model:model,isNotEdit:true});
 	    }
 	 
 })

src/main/resources/static/app/business/device/controller/deviceCheckCtrl.js

@@ -37,7 +37,7 @@ angular.module('app.business')
 
         //新增
         $scope.showCheck = function () {
-            $state.go('app.basic.device.checkAdd');
+            $state.go('app.business.device.checkAdd');
         }
 
         // 翻页
@@ -59,7 +59,7 @@ angular.module('app.business')
 
         //修改
         $scope.loadDataById = function (checkNumber, type) {
-            $state.go("app.basic.device.checkEdit", {checkNumber: checkNumber, isNotEdit: type});
+            $state.go("app.business.device.checkEdit", {checkNumber: checkNumber, isNotEdit: type});
         }
 
         // 翻页
@@ -133,7 +133,7 @@ angular.module('app.business')
         }
 
         $scope.back = function () {
-            $state.go("app.basic.device.deviceCheckList");
+            $state.go("app.business.device.deviceCheckList");
         }
         var validator = $("#deviceCheck-form").validate();
         $scope.pd = {};
@@ -166,7 +166,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.basic.device.deviceCheckList');
+                        $state.go('app.business.device.deviceCheckList');
                     } else {
                         alert("保存失败！");
                     }
@@ -233,7 +233,7 @@ angular.module('app.business')
             if (type == 1) return years + "-" + month + "-" + strDate + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
         };
         $scope.back = function () {
-            $state.go("app.basic.device.deviceCheckList");
+            $state.go("app.business.device.deviceCheckList");
         }
 
         $scope.deviceCheck = {};
@@ -293,7 +293,7 @@ angular.module('app.business')
             }).then(function successCallback(response) {
                 if (response.data.status == "success") {
                     alert("保存成功！");
-                    $state.go('app.basic.device.deviceCheckList');
+                    $state.go('app.business.device.deviceCheckList');
                 } else {
                     alert("保存失败！");
                 }

src/main/resources/static/app/business/device/controller/deviceGetCtrl.js

@@ -174,18 +174,18 @@ angular.module('app.business')
 
         //领取
         $scope.showGet = function () {
-            $state.go('app.basic.device.deviceGetAdd');
+            $state.go('app.business.device.deviceGetAdd');
         }
 
 
         //归还
         $scope.showGetBack = function (id, getCount) {
-            $state.go('app.basic.device.deviceGetBack', {id: id, getCount: getCount});
+            $state.go('app.business.device.deviceGetBack', {id: id, getCount: getCount});
         }
 
         //查看
         $scope.showMassage = function (id) {
-            $state.go('app.basic.device.deviceChack', {id: id});
+            $state.go('app.business.device.deviceChack', {id: id});
         }
 
         // 翻页
@@ -230,7 +230,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.basic.device.deviceGetList');
+                        $state.go('app.business.device.deviceGetList');
                     } else {
                         alert(response.data.msg);
                     }
@@ -322,7 +322,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("归还成功！");
-                        $state.go('app.basic.device.deviceGetList');
+                        $state.go('app.business.device.deviceGetList');
                     } else {
                         alert(response.data.msg);
                     }

src/main/resources/static/app/business/device/controller/deviceInputCtrl.js

@@ -32,7 +32,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.basic.device.deviceInputAdd',{id:0,isNotEdit:false});
+		 $state.go('app.business.device.deviceInputAdd',{id:0,isNotEdit:false});
 	 }
 
 
@@ -57,12 +57,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.showViewInput = function(id) {
-    	$state.go('app.basic.device.inputEdit',{id:id,isNotEdit:true});
+    	$state.go('app.business.device.inputEdit',{id:id,isNotEdit:true});
     }
     
     //修改页面
     $scope.showEditInput = function(id) {
-    	$state.go('app.basic.device.inputEdit',{id:id,isNotEdit:false});
+    	$state.go('app.business.device.inputEdit',{id:id,isNotEdit:false});
     }
 
     //树形下拉框获取器材设备名称
@@ -182,7 +182,7 @@ angular.module('app.business')
    			}).then(function successCallback(response) {
    				if(response.data.status == "success"){
    					alert("保存成功！");
-   					$state.go('app.basic.device.deviceInputList');
+   					$state.go('app.business.device.deviceInputList');
    				}else{
    					alert(response.data.msg);
    					$scope.saveFlag = false;

src/main/resources/static/app/business/device/controller/deviceKeepCtrl.js

@@ -34,12 +34,12 @@ angular.module('app.business')
 
         //新增
         $scope.showKeep = function () {
-            $state.go('app.basic.device.manage.deviceKeepAdd');
+            $state.go('app.business.device.manage.deviceKeepAdd');
         }
 
         //展示保养信息
         $scope.showKeepMassage = function (id) {
-            $state.go('app.basic.device.manage.deviceKeepMassage', {id: id});
+            $state.go('app.business.device.manage.deviceKeepMassage', {id: id});
         }
 
 
@@ -137,7 +137,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.basic.device.manage.deviceKeepList');
+                        $state.go('app.business.device.manage.deviceKeepList');
                     } else {
                         alert("保存失败！");
                     }

src/main/resources/static/app/business/device/controller/deviceRepairCtrl.js

@@ -34,12 +34,12 @@ angular.module('app.business')
     
 	 //添加维护信息页面
 	 $scope.showRepair = function () {
-	   $state.go('app.basic.device.manage.devicerepairAdd');
+	   $state.go('app.business.device.manage.devicerepairAdd');
 	 }
 	 
 	 //维护信息详情
 	 $scope.showRepairMassage = function (id) {
-		 $state.go('app.basic.device.manage.deviceRepairMassage',{id:id,isNotEdit:false});
+		 $state.go('app.business.device.manage.deviceRepairMassage',{id:id,isNotEdit:false});
 	 }
 
     	
@@ -205,7 +205,7 @@ angular.module('app.business')
                     }).then(function successCallback(response) {
                         if (response.data.status == "success") {
                             alert("保存成功！");
-                            $state.go('app.basic.device.manage.deviceRepairList');
+                            $state.go('app.business.device.manage.deviceRepairList');
                         } else {
                             alert("保存失败！");
                         }

src/main/resources/static/app/business/device/controller/deviceStorageCtrl.js

@@ -31,17 +31,17 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
 
     // 新增页面
     $scope.showAdd = function () {
-        $state.go('app.basic.device.deviceStorageList.edit', { id: '0', isNotEdit: false });
+        $state.go('app.business.device.deviceStorageList.edit', { id: '0', isNotEdit: false });
     };
     // 修改页面
     $scope.showEdit = function (dSbxxsjy) {
         dSbxxsjy.ssfl.toString();
-        $state.go("app.basic.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: false });
+        $state.go("app.business.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: false });
     };
     // 查看页面
     $scope.showView = function (dSbxxsjy) {
         dSbxxsjy.ssfl.toString();
-        $state.go("app.basic.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: true });
+        $state.go("app.business.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: true });
     };
     // 删除一条记录.
     $scope.delete = function (id) {
@@ -251,7 +251,7 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         if ($rootScope.previousState_name != '') {
             $rootScope.back();
         } else {
-            $state.go("app.basic.device.deviceStorageList");
+            $state.go("app.business.device.deviceStorageList");
         }
     };
 

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

@@ -117,18 +117,20 @@
                                             <section class="col col-3">
                                                 <label class="label">生产日期：<span style="color: red;">*</span></label>
                                                 <label class="input">
-                                                    <input type="text" ng-model="dSbxxsjy.scrq" name="scrq" class="Wdate" id="disablescrq"
-                                                           ng-readonly="true" ng-disabled="isNotEdit" required onClick="WdatePicker({lang:'zh-cn'})">
+                                                    <input type="text" ng-model="dSbxxsjy.scrq" name="scrq" id="disablescrq"
+                                                           ng-disabled="isNotEdit" required onClick="WdatePicker({lang:'zh-cn'})">
                                                 </label>
                                             </section>
                                         </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" ng-model="dSbxxsjy.rkrq" name="rkrq" class="Wdate" id="disablerkrq"
-                                                           ng-readonly="true" ng-disabled="isNotEdit" required onClick="WdatePicker({lang:'zh-cn'})">
+                                                    <input type="text" ng-model="dSbxxsjy.rkrq" name="rkrq" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isNotEdit"
+														    id="disablerkrq" required />
+                                                    <!-- <input type="text" ng-model="dSbxxsjy.rkrq" name="rkrq" class="Wdate" id="disablerkrq"
+                                                           ng-readonly="true" ng-disabled="isNotEdit" required onClick="WdatePicker({lang:'zh-cn'})" /> -->
                                                 </label>
                                             </section>
                                             <section class="col col-3">
@@ -267,10 +269,10 @@
                                         </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" ng-model="dSbxxsjy.rkrq" name="rkrq" class="Wdate" id="disableQcrkrq"
-                                                           ng-readonly="true" ng-disabled="isNotEdit" required onClick="WdatePicker({lang:'zh-cn'})">
+                                                    <input type="text" ng-model="dSbxxsjy.rkrq" name="rkrq" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isNotEdit"
+														    id="disableQcrkrq" required />
                                                 </label>
                                             </section>
                                             <section class="col col-3">

src/main/resources/static/app/business/facility/controller/facilityGetListCtrl.js

@@ -17,7 +17,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.basic.facility.addFacilityGet',{isNotEdit:false});
+		 $state.go('app.business.facility.addFacilityGet',{isNotEdit:false});
 	 }
 
 
@@ -42,12 +42,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.viewFacility = function(facility) {
-    	$state.go('app.basic.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:true});
+    	$state.go('app.business.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:true});
     }
     
     //修改页面
     $scope.editFacility = function(facility) {
-    	$state.go('app.basic.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:false});
+    	$state.go('app.business.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:false});
     }
 
     // //树形下拉框获取器材设备名称
@@ -176,7 +176,7 @@ angular.module('app.business')
                 FacilityGetService.savaFacility({dFacilitiesRepairJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");
-                        $state.go('app.basic.facility.facilityGetList');
+                        $state.go('app.business.facility.facilityGetList');
                     }else{
                         alert(response.msg);
                         $scope.saveFlag = false;

src/main/resources/static/app/business/facility/controller/facilityKeepListCtrl.js

@@ -17,7 +17,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.basic.facility.addFacilityKeep',{isNotEdit:false});
+		 $state.go('app.business.facility.addFacilityKeep',{isNotEdit:false});
 	 }
 
 
@@ -42,12 +42,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.viewFacility = function(facility) {
-    	$state.go('app.basic.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:true});
+    	$state.go('app.business.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:true});
     }
     
     //修改页面
     $scope.editFacility = function(facility) {
-    	$state.go('app.basic.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:false});
+    	$state.go('app.business.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:false});
     }
 
     // //树形下拉框获取器材设备名称
@@ -172,7 +172,7 @@ angular.module('app.business')
                 facilityKeepService.savaFacility({dFacilitiesMaintainJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");
-                        $state.go('app.basic.facility.facilityKeepList');
+                        $state.go('app.business.facility.facilityKeepList');
                     }else{
                         alert(response.msg);
                         $scope.saveFlag = false;

src/main/resources/static/app/business/facility/controller/facilityListCtrl.js

@@ -18,7 +18,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.basic.facility.addFacility',{isNotEdit:false});
+		 $state.go('app.business.facility.addFacility',{isNotEdit:false});
 	 }
 
 
@@ -43,12 +43,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.viewFacility = function(facility) {
-    	$state.go('app.basic.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:true});
+    	$state.go('app.business.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:true});
     }
     
     //修改页面
     $scope.editFacility = function(facility) {
-    	$state.go('app.basic.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:false});
+    	$state.go('app.business.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:false});
     }
 
     // 报废
@@ -174,7 +174,7 @@ angular.module('app.business')
                 facilityListService.savaFacility({dFacilitiesBasicsJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");
-                        $state.go('app.basic.facility.facilityStorageList');
+                        $state.go('app.business.facility.facilityStorageList');
                     }else{
                         alert(response.msg);
                     }

src/main/resources/static/app/business/index/views/business-index.html

@@ -70,12 +70,12 @@
 			$("a[data-ui-sref='app.business.plan-schedule']").click();
 		});
 		$("#customer").click(function(){
-			$("a[data-ui-sref='app.basic.customer.list']").parents('li').each(function () {
+			$("a[data-ui-sref='app.business.customer.list']").parents('li').each(function () {
 				if($(this).attr("ng-show") == null && !$(this).hasClass('open')){//非顶级且当前不是打开的
 	                $(this).find("a:first").click();
 				}
             });
-			$("a[data-ui-sref='app.basic.customer.list']").click();
+			$("a[data-ui-sref='app.business.customer.list']").click();
 		});
 		setTimeout(function(){
 			var receiveNotice = $("#images")[0].width*0.35936+","+$("#images")[0].height*0.49819+",50";

src/main/resources/static/app/business/jsgl/controller/jsglCtrl.js

@@ -4,15 +4,18 @@ angular.module('app.business')
     .controller("jsglCtrl", function($scope, $http, $state, $rootScope, jsglService, warehouseService, $stateParams, APP_CONFIG) {
     // 获取列表数据
     $scope.jslx = $stateParams.jslx;
-	if ($scope.jslx == "0") {
+    $scope.ywlx = $stateParams.ywlx;
+	if ($scope.jslx == "0" && $scope.ywlx == '1') {
     	$scope.top_title = "入库结算列表";
-    } else if ($scope.jslx == "1") {
+    } else if ($scope.jslx == "1" && $scope.ywlx == '1') {
     	$scope.top_title = "出库结算列表";
+    } else {
+    	$scope.top_title = "散粮入库结算列表";
     }
      $scope.pageInfo = {pageNum : 1, pageSize : 10};
-     $scope.search = {houseId:null, wareId: null};
+     $scope.search = {houseId:null, wareId: null, ywlx: $scope.ywlx};
 	 $scope.loadData = function() {
-		 jsglService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $stateParams.jslx, $scope.search).then(function(data){
+		 jsglService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $stateParams.jslx, $scope.search).then(function(data){
 			 $scope.pageInfo = data;
 	     },function(data){
 	         console.log(data);
@@ -44,7 +47,11 @@ angular.module('app.business')
 	 * jslx: 0是入库,1是出库
 	 */
     $scope.edit = function(id, butType) {
-    	$state.go('app.business.rkjslist.edit',{id:id, butType:butType, jslx: $stateParams.jslx});
+    	if ($scope.ywlx == "0") {
+    		$state.go('app.business.rkjs-sl-list.edit',{id:id, butType:butType, jslx: $stateParams.jslx});
+    	} else {
+    		$state.go('app.business.rkjslist.edit',{id:id, butType:butType, jslx: $stateParams.jslx});
+    	}
     }
 
     //删除
@@ -60,7 +67,7 @@ angular.module('app.business')
     }
 
 })
-.controller("jsglEditCtrl", function($scope, $http, $filter, $state, $rootScope, $stateParams, $uibModal, APP_CONFIG, jsglService, warehouseService, customerService ) {
+.controller("jsglEditCtrl", function($scope, $http, $filter, $state, $rootScope, $stateParams, $uibModal, APP_CONFIG, jsglService, warehouseService, customerService, commonUtilService ) {
     var id = $stateParams.id;
     var butType = $stateParams.butType;
     $scope.jslx = $stateParams.jslx;
@@ -110,6 +117,7 @@ angular.module('app.business')
     	$scope.jsgl.jslx = $scope.jslx;
     	$scope.jsgl.fpzt = "1"; //发票状态默认1正常
     	$scope.jsgl.bcjsfs = "1"; //付款方式默认1转账
+    	$scope.jsgl.ywlx = "1"; //业务类型是非散粮类型
     }
 	
 	$scope.getReceiveContract = function() {
@@ -208,47 +216,9 @@ angular.module('app.business')
 		 * 
 		 */
 		var bcjsje = $scope.jsgl.bcjssl * 1000 * $scope.jsgl.bcjsdj * 1000 / 1000000;
-		$scope.jsgl.bcjsje = $scope.getMath(bcjsje, 2);
+		$scope.jsgl.bcjsje = $scope.getMath_N(bcjsje, 2);
 	}
 
-	//将v四舍五入，且保留n位小数
-    $scope.getMath = function(v, n) {
-        if (isNaN(v) || v == "") {
-        	if (isNaN(n) || v == "") {
-        		v = "0.00";
-        	} else if (n == 0) {
-        		v = "0";
-        	} else {
-        		v = "";
-        		for (var i = 1; i <= n; i++) {
-            		if (i == 1) {
-            			v = "0.0";
-            		} else {
-            			v = v+"0";
-            		}
-            	}
-        	}
-        } else {
-            v = Math.round(v*100)/100;
-            v = v.toString();
-            var rs = v.indexOf('.');
-            if (rs < 0) {
-            	if (n > 0) {
-            		for (var i = 1; i <= n; i++) {
-            			if (i == 1) {
-                			v = v+".0";
-                		} else {
-                			v = v+"0";
-                		}
-            		}
-            	}
-            }else{
-                while(v.length <= rs + n){v += '0';}
-            }
-        }
-        return v;
-    }
-	
 	// 返回.
     $scope.retList = function () {
         if ($rootScope.previousState_name != '') {
@@ -307,3 +277,264 @@ angular.module('app.business')
     	}
     }
 })
+.controller("jsglSlEditCtrl", function($scope, $http, $filter, $state, $rootScope, $stateParams, $uibModal, APP_CONFIG, jsglService, warehouseService, customerService, commonUtilService ) {
+
+	var id = $stateParams.id;
+    var butType = $stateParams.butType;
+    $scope.jslx = $stateParams.jslx;
+    if ($scope.jslx == "0") {
+    	$scope.top_title = "入库结算详情";
+    	
+    } else if ($scope.jslx == "1") {
+    	$scope.top_title = "出库结算详情";
+    }
+    var isNotEdit = false;//大多数文本框
+    var isEdit = false;//少数要控制的文本框
+    $scope.jsgl = {};
+
+	// 获取列表数据
+	$scope.loadData = function() {
+		jsglService.findBykey($stateParams.id).then(function(data){
+			$scope.jsgl = data;
+			$scope.jsgl.orgId = $rootScope.orgInfo.orgId;
+			$scope.loadWare($scope.jsgl.houseId);
+	    },function(data){
+	        console.log(data);
+	    });
+	}
+
+	$scope.loadWare = function(houseId) {
+		//按照单位获取单位下的仓房信息
+		var orgId = $rootScope.orgInfo.orgId;
+		warehouseService.getStorehouse(orgId, houseId, "0").then(function(data){
+			$scope.warehouseList = data.wareList;  //下拉列表数据
+		},function (data) {
+			console.log(data);
+		});
+	}
+
+	if ("" != id) {
+    	if (butType == "show") {//查看
+    		$scope.isNotEdit = true;
+    		$scope.isEdit = true;
+        } else {
+        	$scope.isEdit = true;
+        }
+    	$scope.loadData();
+    } else {
+    	$scope.jsgl.bcjssj = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
+    	$scope.jsgl.fkdw = $rootScope.orgInfo.orgName;
+    	$scope.jsgl.orgId = $rootScope.orgInfo.orgId;
+    	$scope.jsgl.jslx = $scope.jslx;
+    	$scope.jsgl.fpzt = "1"; //发票状态默认1正常
+    	$scope.jsgl.bcjsfs = "1"; //付款方式默认1转账
+    	$scope.jsgl.ywlx = "0"; //业务类型是散粮类型
+    }
+
+	//获取储备粮外面的自建通知单列表
+	$scope.getDeliveryStorageNotice = function() {
+		var params = [];
+		if ($scope.jslx == "0") {//入库
+			params.billType = "1";//查询入库类型的通知单
+		} else if ($scope.jslx == "1") {//出库
+			params.billType = "3";
+		} else {
+			alert("系统异常，请联系管理员!");
+			return;
+		}
+		params.orgId = $scope.jsgl.orgId;
+        var uibModalInstance = $uibModal.open({
+            size:'lg',
+            templateUrl: 'app/business/jsgl/view/tzd-zj-model.html',
+            controller: 'tzdZjCtrl',
+            resolve: {
+                // items是一个回调函数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+        uibModalInstance.result.then(function (result) {
+            if (result != null) {
+                // 获取明细信息.
+            	$scope.jsgl.htid = result.id;
+           	    $scope.jsgl.htbh = result.billNumber;
+           	    $scope.jsgl.htzsl = parseInt(result.shipingCount);
+           	    $scope.jsgl.yjssl = result.yjssl;
+           	    $scope.jsgl.houseId = result.houseId;
+           	    $scope.jsgl.warehouseId = result.warehouseId;
+           	    if (result.warehouseId != null) {
+           	    	$scope.loadWare(result.houseId);
+           	    }
+           	    $scope.jsgl.lypz = result.lypz;
+           	    $scope.jsgl.mxpz = result.mxpz;
+           	    $scope.jsgl.lyxz = result.lyxz;
+           	    $scope.jsgl.bcjsdj = result.dj;
+           	    //$scope.getCustomer(result.khid);
+            }
+        }, function (result) {
+            console.log(result);
+        });
+	}
+
+	// 选择个人客户.
+    $scope.getCustomer = function(id) {
+        if (id == null) {
+        	var params = [];
+            params.type = "addBlacklist"; //不是黑名单人员
+            params.classify = 3152;
+            var uibModalInstance = $uibModal.open({
+                size:'lg',
+                templateUrl: 'app/business/util/views/customer-list-modal.html',
+                controller: 'customerListModalCtrl',
+                resolve: {
+                    // items是一个回调函数
+                    items: function () {
+                        // 这个值会被模态框的控制器获取到
+                        return params;
+                    }
+                }
+            });
+            uibModalInstance.result.then(function (result) {
+                if (result != null) {
+                    // 客户表id.
+                    $scope.jsgl.customerId = result.id;
+                    // 收付款人赋值客户姓名.
+                    $scope.jsgl.sfkr = result.name;
+                    //开户行名称
+                    $scope.jsgl.khhmc = result.bankName;
+                    //开户行号
+                    $scope.jsgl.khhh = result.khhh;
+                    //银行账号
+                    $scope.jsgl.yhzh = result.accountNumber;
+
+                    if (result.classify == 3152) {
+                        // 个人.
+                        //收付款人身份证号
+                    	$scope.jsgl.skrsfzh = result.identification;
+                    } else if (result.classify == 3153) {
+                        // 企业.
+                        //收付款人身份证号(社会信用代码)
+                    	$scope.jsgl.skrsfzh = result.socialCreditCode;
+                    }
+                    //付款单位
+                    $scope.jsgl.fkdw = $rootScope.orgInfo.orgName;
+                }
+                // 关闭模态框时刷新页面数据
+            }, function (reason) {
+                console.log(reason);
+            });
+        } else {
+        	customerService.loadDataById(id).then(function(data){
+                // 客户表id.
+        		$scope.jsgl.customerId = id;
+                // 收付款人姓名.
+        		$scope.jsgl.sfkr = data.name;
+        		//开户行名称
+                $scope.jsgl.khhmc = data.bankName;
+                //开户行号
+                $scope.jsgl.khhh = data.khhh;
+                //银行账号
+                $scope.jsgl.yhzh = data.accountNumber;
+                if (data.classify == 3152) {
+                    // 个人.
+                    //身份证号
+                	$scope.jsgl.skrsfzh = data.identification;
+                } else if (data.classify == 3153) {
+                    // 企业.
+                    //社会信用代码
+                	$scope.jsgl.skrsfzh = data.socialCreditCode;
+                }
+                //付款单位
+                $scope.jsgl.fkdw = $rootScope.orgInfo.orgName;
+        	}, function (data) {
+				console.log(data);
+			});
+        }
+    }
+
+    /**
+	 * 计算本次结算金额 = 本次结算数量 * 本次结算单价
+	 * 保留两位小数
+	 */
+	$scope.calculate = function() {
+		var bcjssl = $scope.jsgl.bcjssl;
+		var bcjsdj = $scope.jsgl.bcjsdj;
+		var re = /^([0-9]+.[0-9]{3})[0-9]*/;
+		if(bcjssl !== undefined && bcjssl !== "" && bcjssl != null) {
+			bcjssl = bcjssl.toString().replace(re,"$1");
+			bcjssl = parseFloat(bcjssl);
+			$scope.jsgl.bcjssl = bcjssl;
+		} else {
+			return;
+		}
+		if(bcjsdj !== undefined && bcjsdj !== "" && bcjsdj != null) {
+			bcjsdj = bcjsdj.toString().replace(re,"$1");
+			bcjsdj = parseFloat(bcjsdj);
+			$scope.jsgl.bcjsdj = bcjsdj;
+		} else {
+			return;
+		}
+
+		/**
+		 * 
+		 */
+		var bcjsje = $scope.jsgl.bcjssl * 1000 * $scope.jsgl.bcjsdj * 1000 / 1000000;
+		$scope.jsgl.bcjsje = commonUtilService.getMath(bcjsje);
+	}
+	
+	// 返回.
+    $scope.retList = function () {
+        if ($rootScope.previousState_name != '') {
+        	$rootScope.back();
+        } else {
+        	$state.go('app.business.rkjs-sl-list');
+        }
+    }
+    
+    
+
+    //保存(0:保存,1:提交)
+    $scope.save = function(czlx) {
+    	$scope.jsgl.dataStatus = czlx;
+    	var fp_s = $scope.jsgl.fpStart;
+    	var fp_e = $scope.jsgl.fpEnd;
+    	var fps = $scope.jsgl.fps;
+    	if (fp_s == null && fp_e == null && fps == null) {
+    		alert("连续发票号和不连续发票号至少要录入一种，不能都为空值!");
+    		return;
+    	} else {
+    		if ((fp_s == null && fp_e != null) || (fp_s != null && fp_e == null)) {
+    			alert("连续发票号码不能只录入起始值或只录入终止值!");
+    			return;
+    		}
+    	}
+    	$scope.isCustomerEdit = $scope.jsgl.bcjsfs=='0'?false:true
+    	if ($scope.jsgl.bcjsfs == '1') {
+    		if ($scope.jsgl.yhzh == null || $scope.jsgl.khhmc == null || $scope.jsgl.khhh == null) {
+    			alert("请补全对应客户档案信息!");
+    			return;
+    		}
+    	}
+    	var validator = $("#jsgl-sl-form").validate();
+    	if (validator.form()) {
+    		//本次结算时间
+            $("input[name='bcjssj']").each(function(j,item){
+                if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                    $scope.jsgl.bcjssj = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                }
+            });
+    		jsglService.saveData($scope.jsgl).then(function(data){
+    			if (data.status == "200") {
+    				alert("操作成功！");
+    			} else {
+    				alert("操作失败！");
+    			}
+    			$state.go('app.business.rkjs-sl-list');
+    	    },function(data){
+    	        console.log(data);
+    	    });
+    	}
+    }
+})

src/main/resources/static/app/business/jsgl/controller/tzdZjCtrl.js

@@ -0,0 +1,73 @@
+angular.module('app.business').controller("tzdZjCtrl", 
+	function($scope, $uibModalInstance, $filter, $http, $uibModal,deliveryStorageNoticeService, storeWareDetailService, jsglService, commonUtilService, APP_CONFIG, items) {
+
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};  
+	$scope.searchCondition = {}; //查询入库的
+    // 获取列表数据
+	
+    $scope.loadData = function() {
+    	deliveryStorageNoticeService.getPassPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.searchCondition).then(function(data){
+            $scope.pageInfo = data;
+        },function(data){
+            console.log(data);
+        });
+    }
+
+    if (items != undefined && items != null) {
+        if (items.billType != undefined && items.billType != null) {
+            $scope.searchCondition.billType = items.ywtype;
+        }
+        if (items.orgId != undefined && items.orgId != null) {
+        	$scope.searchCondition.orgId = items.orgId;
+        }
+    }
+
+    $scope.loadData();
+
+    // 翻页
+	$scope.goPage = function(pageNum) {
+		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {  
+     		$scope.pageInfo.pageNum = pageNum;
+     		$scope.loadData();
+     	}
+	}
+
+	$scope.selected = [];
+
+	// 选择一条数据
+	$scope.selectData = function(check) {
+		var datas = {billNumber: check.billNumber, shipingCount: check.shipingCount};
+		storeWareDetailService.getStoreWareDetailList(check.id, 'notice').then(function(data) {
+			datas.houseId = data[0].houseId;
+			datas.warehouseId = data[0].warehouseId;
+			datas.lypz = data[0].grainKind;
+			datas.mxpz = data[0].grainDetailKind;
+			datas.lyxz = data[0].grainAttribute;
+			datas.dj = data[0].inPrice;
+			//查询已结算数量
+			var conditions = {htbh:check.billNumber};
+			jsglService.getPageInfo(null, null, '0', conditions).then(function(jsdata) {
+				var yjssl = 0;
+				if (jsdata.list != null) {
+					for (var i = 0; i < jsdata.list.length; i++) {
+						if (jsdata.list[i].dataStatus=='1') {
+							yjssl = commonUtilService.accAdd(yjssl, jsdata.list[i].bcjssl);
+						}
+					}
+				}
+				datas.yjssl = yjssl;
+				$uibModalInstance.close(datas);
+			},function(jsdata){
+				console.log(jsdata);
+			});
+		},function(data){
+			console.log(data);
+		});
+	}
+
+	// 关闭模态窗口
+	$scope.cancel = function() {
+		$uibModalInstance.close();
+	}
+
+})

src/main/resources/static/app/business/jsgl/service/jsglService.js

@@ -1,7 +1,7 @@
 "use strict";
 angular.module('app.business').service("jsglService", function($http, $q,$rootScope, APP_CONFIG) {
     // 结算管理:分页查询
-    this.getPageInfoDevice = function(pageNum, pageSize, jslx, search){
+    this.getPageInfo = function(pageNum, pageSize, jslx, search){
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -12,6 +12,8 @@ angular.module('app.business').service("jsglService", function($http, $q,$rootSc
                 jslx: jslx,
                 houseId: search.houseId,
                 warehouseId : search.wareId,
+                ywlx : search.ywlx,
+                htbh : search.htbh,
                 orgId : $rootScope.orgInfo.orgId
             }
         }).then(function successCallback(response) {

src/main/resources/static/app/business/jsgl/view/jsgl-list.html

@@ -52,7 +52,7 @@
                         <thead>
 	                        <tr>
 	                            <th data-hide="phone">序号</th>
-								<th data-class="expand">合同号</th>
+								<th data-class="expand">合同/通知单号</th>
 								<th data-class="expand">仓房名称</th>
 								<th data-class="expand">货位名称</th>
 	                            <th data-class="expand">明细品种</th>
@@ -76,8 +76,8 @@
 								<td>{{data.bcjsje}}</td>
 								<td>{{data.bcjssj}}</td>
 								<td>
-									<a href-void ng-click="edit(data.id, 'show')"><i class="fa fa-info-circle"></i>查看</a>&nbsp;&nbsp;
-                        			<a href-void ng-click="edit(data.id, 'update')" ng-hide="data.dataStatus=='1'"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
+									<a href-void ng-click="edit(data.id, 'show', data.ywlx)"><i class="fa fa-info-circle"></i>查看</a>&nbsp;&nbsp;
+                        			<a href-void ng-click="edit(data.id, 'update', data.ywlx)" ng-hide="data.dataStatus=='1'"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
                         			<a href-void ng-click="remove(data.id)" ng-hide="data.dataStatus=='1'"><i class="fa fa-trash-o"></i>删除</a>
                         		</td>
                         	</tr>

src/main/resources/static/app/business/jsgl/view/jsgl-sl-edit.html

@@ -0,0 +1,241 @@
+<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="jsgl-sl-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()">
+										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+									</a>
+									&nbsp;<strong>散粮入库结算详情</strong>
+									<span class="pull-right font-xs">带*的部分必须填写</span>
+								</header>
+								
+								<header><strong>结算信息</strong></header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">通知单信息<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input class="form-control" type="hidden" ng-model="jsgl.htid" name="htid" />
+                                             	<input class="form-control" type="text" ng-model="jsgl.htbh" name="htbh" ng-disabled="isEdit" 
+                                                ng-click="getDeliveryStorageNotice()" placeholder="请选择出入库通知单" required />
+                                         	</label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">通知单总数量(吨)</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.htzsl" ng-readonly="true"
+                                                name="htzsl" placeholder="" />
+                                            </label>
+                                        </section>
+                                    	<section class="col col-4">
+                                            <label class="label">已结算数量(吨)<span style="color: red;">不含本次</span></label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.yjssl" ng-readonly="true"
+                                                name="yjssl" placeholder="" />
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">仓房名称<span style="color: red;">*</span></label> 
+                                            <label class="select"> 
+                                            	<select ng-model="jsgl.houseId" name="houseId" ng-options="store.storehouseId as store.storehouseName for store in store_tank_list" 
+                                            	ng-change="loadWare(jsgl.houseId)" required ng-disabled="true">
+                                             		<option value="">--请选择--</option><i></i>
+                                             	</select><i></i>
+                                         	</label>
+                                        </section>
+										<section class="col col-4">
+                                            <label class="label">货位名称<span style="color: red;">*</span></label>
+                                            <label class="select"> 
+                                            	<select ng-model="jsgl.warehouseId" ng-disabled="true" name="warehouseId"
+                                             	ng-options="ware.warehouseId as ware.warehouseName for ware in warehouseList" required>
+                                             		<option value="">--请选择--</option><i></i>
+                                             	</select><i></i>
+                                         	</label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">粮油品种<span style="color: red;">*</span></label>
+                                            <label class="select"> 
+                                            	<select ng-model="jsgl.lypz" ng-disabled="true" name="lypz" ng-change="getMxpz()"
+                                             	ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" required >
+                                             		<option value="">--请选择--</option><i></i>
+                                             	</select><i></i>
+                                         	</label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">明细品种<span style="color: red;">*</span></label> 
+                                            <label class="input">
+												<input class="form-control" type="text" ng-model="dicData[jsgl.mxpz]" ng-readonly="true"
+                                                name="yjssl" placeholder="" />
+                                                <input class="form-control" type="hidden" ng-model="jsgl.mxpz" ng-hide="true"
+                                                name="mxpz" placeholder="" />
+											</label>
+                                        </section>
+										<section class="col col-4">
+                                            <label class="label">粮油性质<span style="color: red;">*</span></label>
+                                            <label class="input">
+												<input class="form-control" type="text" ng-model="dicData[jsgl.lyxz]" ng-readonly="true"
+                                                name="yjssl" placeholder="" />
+                                                <input class="form-control" type="hidden" ng-model="jsgl.lyxz" ng-hide="true"
+                                                name="mxpz" placeholder="" />
+											</label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">本次结算数量(吨)<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.bcjssl" ng-readonly="isNotEdit" ng-blur="calculate()"
+                                                name="yjssl" placeholder="" onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">本次结算单价(元/吨)<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                            	<input class="form-control" type="text" ng-model="jsgl.bcjsdj" ng-readonly="isNotEdit" ng-blur="calculate()"
+                                                name="bcjsdj" placeholder="" onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
+                                            </label>
+                                         	</label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">本次结算金额(元)<span style="color: red;">*</span></label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.bcjsje" ng-readonly="isNotEdit"
+                                                name="bcjsje" placeholder="" required />
+                                            </label>
+                                        </section>
+                                    	<section class="col col-4">
+                                            <label class="label">本次结算时间<span style="color: red;">*</span></label> 
+                                            <label class="input"> 
+                                                <input type="text" ng-model="jsgl.bcjssj" ng-disabled="isNotEdit" required
+                                                name="bcjssj" placeholder="" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">本次结算方式<span style="color: red;">*</span></label>
+                                            <label class="select"> 
+                                            	<select ng-model="jsgl.bcjsfs" ng-disabled="isNotEdit" name="bcjsfs" required >
+                                             		<option value="">--请选择--</option>
+                                             		<option value="0">现金</option>
+                                             		<option value="1">转账</option>
+                                             	</select>
+                                         	</label>
+                                        </section>
+                                    </div>
+                                </fieldset>
+                                <header><strong>发票信息</strong></header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">连续发票号码填写</label>
+                                            <label class="input"> 
+                                            	<div>
+                                            	<table border="0">
+                                            	    <tr>
+                                            	        <td>
+                                            	             <input type="text" ng-model="jsgl.fpStart" ng-readonly="isNotEdit" name="fpStart" placeholder="" />
+                                            	        </td>
+                                            	        <td><span>&nbsp;——&nbsp;</span></td>
+                                            	        <td>
+                                            	             <input type="text" ng-model="jsgl.fpEnd" ng-readonly="isNotEdit" name="fpEnd" />
+                                            	        </td>
+                                            	        <td><span style="color: red;">&nbsp;&nbsp;&nbsp;&nbsp;说明:连续发票号码，请填写第一张和最后一张即可</span></td>
+                                            	    </tr>
+                                            	</table>
+                                            	</div>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <section>
+                                        <label class="label">不连续发票号码填写</label>
+                                        <label class="textarea textarea-resizable"> 
+                                          <textarea
+                                            rows="5" ng-model="jsgl.fps" name="fps" ng-disabled="isNotEdit" class="custom-scroll"
+                                            placeholder="多个发票号码填写，请用英文逗号进行间隔。例如:1234567890,123456788">
+                                          </textarea>
+                                        </label>
+                                    </section>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                        <label class="label">发票状态</label>
+                                        <label class="select"> 
+                                        	<select ng-model="jsgl.fpzt" ng-disabled="isNotEdit" name="fpzt">
+                                         		<option value="1">正常</option>
+                                         		<option value="0">作废</option>
+                                         	</select>
+                                     	</label>
+                                    </section>
+                                    </div>
+                                </fieldset>
+                                <header><strong>收/付款信息</strong></header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">收/付款人<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.sfkr" name="sfkr" ng-disabled="isNotEdit" 
+                                                ng-click="getCustomer()" placeholder="请选择客户" required />
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">开户行名称<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="dicData[jsgl.khhmc]" ng-readonly="true" name="khhmc" placeholder="" ng-required="isCustomerEdit" />
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">开户行号<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                                <input type="text" ng-model="jsgl.khhh" ng-readonly="true" ng-required="isCustomerEdit" name="khhh" placeholder="" />
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">银行账号<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.yhzh" ng-readonly="true" name="yhzh" placeholder="" ng-required="isCustomerEdit" />
+                                            </label>
+                                        </section>
+                                        <section class="col col-4" ng-hide="jslx=='1'">
+                                            <label class="label">收款人身份证号</label>
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="jsgl.skrsfzh" ng-readonly="true" name="skrsfzh" placeholder="" />
+                                            </label>
+                                        </section>
+                                        <section class="col col-4" ng-hide="jslx=='1'">
+                                            <label class="label">付款单位<span style="color: red;">*</span></label>
+                                            <label class="input"> 
+                                                <input type="text" ng-model="jsgl.fkdw" name="fkdw" ng-readonly="isNotEdit" required placeholder="" />
+                                            </label>
+                                        </section>
+                                    </div>
+                                </fieldset>
+
+                                <div>
+                                    <footer class="text-align-center">
+                                        <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
+                                        <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save('1')">提交</button>
+                                        <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save('0')">保存</button>
+                                    </footer>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/business/jsgl/view/jsgl-sl-list.html

@@ -0,0 +1,95 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>散粮入库结算管理</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                        <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+							<div class="dt-toolbar">
+								<div class="col-xs-12 col-sm-9">
+									<div class="form-group">
+										<a class="btn btn-primary btn-sm" ng-click="edit()">
+											<span class="fa fa-plus"></span>&nbsp;新&nbsp;增
+										</a>&emsp;
+										<label>
+											<select ng-model="search.houseId" class="form-control input-sm" 
+												ng-options="store.storehouseId as store.storehouseName for store in store_tank_list" 
+												ng-change="loadWare(search.houseId)">
+												<option value="">--仓房名称--</option>
+											</select>&emsp;
+										</label>
+										<label>
+											<select ng-model="search.wareId" class="form-control input-sm" 
+												ng-options="ware.warehouseId as ware.warehouseName for ware in warehouseList">
+												<option value="">--货位名称--</option>
+											</select>&emsp;
+										</label>
+										<a class="btn btn-default btn-sm" ng-click="loadData()">
+										<i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+									</div>
+								</div>
+
+								<div class="col-sm-3 col-xs-6 hidden-xs">
+									<div class="dataTables_length">
+										<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
+															ng-options="num as num for num in [10,25,50,100]"
+															class="form-control input-sm"></select> 条
+										</label>
+									</div>
+								</div>
+							</div>
+
+
+						<table class="table table-striped table-bordered table-hover" width="100%">
+                        <thead>
+	                        <tr>
+	                            <th data-hide="phone">序号</th>
+								<th data-class="expand">合同号</th>
+								<th data-class="expand">仓房名称</th>
+								<th data-class="expand">货位名称</th>
+	                            <th data-class="expand">明细品种</th>
+	                            <th data-class="expand">本次结算数量</th>
+	                            <th data-hide="expand">本次结算单价</th>
+	                            <th data-hide="expand">本次结算金额</th>
+	                            <th data-hide="expand">本次结算时间</th>
+	                            <th data-hide="phone,tablet"> 操作</th>
+	                        </tr>
+                        </thead>
+                        
+                        <tbody>
+                        	<tr ng-repeat="data in pageInfo.list">
+								<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
+								<td>{{data.htbh}}</td>
+								<td>{{storehouseObj[data.houseId].storehouseName}}</td>
+								<td>{{wares[data.warehouseId].warehouseName}}</td>
+								<td>{{dicData[data.mxpz]}}</td>
+								<td>{{data.bcjssl}}</td>
+								<td>{{data.bcjsdj}}</td>
+								<td>{{data.bcjsje}}</td>
+								<td>{{data.bcjssj}}</td>
+								<td>
+									<a href-void ng-click="edit(data.id, 'show')"><i class="fa fa-info-circle"></i>查看</a>&nbsp;&nbsp;
+                        			<a href-void ng-click="edit(data.id, 'update')" ng-hide="data.dataStatus=='1'"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
+                        			<a href-void ng-click="remove(data.id)" ng-hide="data.dataStatus=='1'"><i class="fa fa-trash-o"></i>删除</a>
+                        		</td>
+                        	</tr>
+                        </tbody>
+
+                        </table>
+							<div smart-include="app/layout/partials/page.tpl.html"></div>
+						</div>
+                    	</div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/business/jsgl/view/tzd-zj-model.html

@@ -0,0 +1,53 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">出入库通知单列表</h4>  
+    </div>
+    <div class="modal-body">
+        <div>
+            <div class="widget-body no-padding">  
+                <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                    <table class="table table-striped table-bordered table-hover" width="100%">
+                        <thead>
+                            <tr>
+                                <th> 序号</th>  
+	                            <th> 通知单编号</th>
+	                            <th> 通知单类型</th>
+	                            <th> 合同编号</th>
+	                            <th> 计划编号</th>
+	                            <th> 客户名称</th>
+	                            <th> 计划数量(吨)</th>
+	                            <th> 金额(元)</th>
+	                            <th> 操作</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr ng-repeat="datas in pageInfo.list">
+                                <td>{{$index+1}}</td>
+		                        <td>{{datas.billNumber}}</td>	
+	                            <td>
+                                    <div ng-switch="{{datas.billType}}">
+                                    	<div ng-switch-when="1">入库</div>
+                                    	<div ng-switch-when="3">出库</div>
+                                    </div>
+                                </td>
+                                <td>{{datas.contract}}</td>
+								<td>{{datas.planNumber}}</td>
+                                <td>{{datas.deliveryCustomer}}</td>
+                                <td>{{datas.shipingCount}}</td>
+                                <td>{{datas.moneyQuantity}}</td>
+                                <td>
+                                    <a href-void ng-click="selectData(datas)"><i class="fa fa-edit"></i>选择</a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div smart-include="app/layout/partials/page.tpl.html"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -9,7 +9,7 @@ angular.module('app.business')
         .state('app.business', {
             abstract: true,
             data: {
-                title: '粮食购销'
+                title: '综合业务管理'
             }
         })
         
@@ -188,8 +188,451 @@ angular.module('app.business')
         })
         
         
+        //-----------------------------------------预警管理---------------------------------------
+        .state('app.business.warning', {
+            abstract: true,
+            data: {
+                title: '预警报警'
+            }
+        })
+        // 温度报警
+        .state('app.business.warning.temperature', {
+                url: '/business/warning/temperature',
+                data: {
+                    title: '温度报警列表'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'sptWdbjCtrl',
+                        templateUrl: 'app/supervise/views/tempAlarm-list.html'
+                    }
+                }
+            }
+        )
+		// 湿度报警
+        .state('app.business.warning.humidity', {
+			url: '/business/warning/humidity',
+			data: {
+				title: '湿度报警'
+			},
+			views: {
+				"content@app": {
+					controller: 'sptSdbjCtrl',
+					templateUrl: 'app/supervise/views/humidityWarningThreshold.html'
+				}
+			}
+		})
+		// 结露报警
+        .state('app.business.warning.dewing', {
+			url: '/business/warning/dewing',
+			data: {
+				title: '结露预警'
+			},
+			views: {
+				"content@app": {
+					controller: 'sptJlyjCtrl',
+					templateUrl: 'app/supervise/views/dewingAlarm-list.html'
+				}
+			}
+		})
+		// 库存超限报警
+        .state('app.business.warning.stock', {
+			url: '/business/warning/stock/:isShow/:houseId',
+			data: {
+				title: '库存超限报警'
+			},
+			params:{
+				showType : "WD"
+			},
+			views: {
+				"content@app": {
+					controller: 'stockWarningThresholdCtrl',
+					templateUrl: 'app/supervise/views/stockWarningThreshold.html'
+				}
+			}
+		})
+		//库存空仓报警
+		.state('app.business.warning.emptyPoliceList', {
+                url: '/business/warning/emptyPolice-list/:id',
+                data: {
+                    title: '库存空仓报警'
+                },
+                params:{
+                    isNotEdit : true
+                },
+                views: {
+                    "content@app": {
+                        controller: 'emptyPoliceCtrl as datatables',
+                        templateUrl: 'app/storage/views/numberManage/emptyPolice-list.html'
+                    }
+                }
+            }
+        )
+        // 设备异常报警
+        .state('app.business.warning.AbnormalEquipment', {
+                url: '/business/warning/AbnormalEquipment',
+                data: {
+                    title: '设备异常报警列表'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'AbnormalEquipmentCtrl',
+                        templateUrl: 'app/intelligent/grainDetection/views/AbnormalEquipment-list.html'
+                    }
+                }
+            }
+        )
+        .state('app.business.warning.rotation-warning', {
+            abstract: true,
+            data: {
+                title: '轮换预警管理'
+            }
+        })
+        //预警时间
+        .state('app.business.warning.rotation-warning.plan-warning-time', {
+        	url: '/business/warning/rotation-warning/plan-warning-time',
+        	data: {
+        		title: '预警时间'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'planWarningCtrl as datatables',
+        			templateUrl: 'app/business/plan/views/plan-warning-time-list.html'
+        		}
+        	}
+        })
+        //轮换预警设置
+        .state('app.business.warning.rotation-warning.plan-warning-set', {
+			url: '/business/warning/rotation-warning/plan-warning-set',
+			data: {
+				title: '轮换预警设置'
+			},
+			views: {
+				"content@app": {
+					controller: 'planWarningCtrl as datatables',
+					templateUrl: 'app/business/plan/views/plan-warning-set.html'
+				}
+			}
+		})
+		//预警列表
+        .state('app.business.warning.rotation-warning.plan-warning-list', {
+            url: '/business/warning/rotation-warning/plan-warning-list',
+            data: {
+                title: '预警列表'
+            },
+            views: {
+                "content@app": {
+                    controller: 'planWarningCtrl as datatables',
+                    templateUrl: 'app/business/plan/views/plan-warning-list.html'
+                }
+            }
+        })
+		// 储存超限报警
+        .state('app.business.warning.store', {
+			url: '/business/warning/store/:isShow/:houseId',
+			data: {
+				title: '储存超限报警'
+			},
+			params:{
+				showType : "WD"
+			},
+			views: {
+				"content@app": {
+					controller: 'storeWarningThresholdCtrl',
+					templateUrl: 'app/supervise/views/storeWarningThreshold.html'
+				}
+			}
+		})
+		// 内控预警列表
+        .state('app.business.warning.internalControl', {
+			url: '/business/warning/internalControl/:isShow/:houseId',
+			data: {
+				title: '内控预警列表'
+			},
+			params:{
+				showType : "WD"
+			},
+			views: {
+				"content@app": {
+					controller: 'internalWarningListCtrl',
+					templateUrl: 'app/supervise/views/internalWarningList.html'
+				}
+			}
+		})
+		// 违规预警
+        .state('app.business.warning.violation', {
+			url: '/business/warning/violation',
+			data: {
+				title: '违规预警'
+			},
+			params:{
+				showType : "WD"
+			},
+			views: {
+				"content@app": {
+					controller: 'violationWarningListCtrl',
+					templateUrl: 'app/supervise/views/violationWarningList.html'
+				}
+			}
+		})
+		// 违规预警详情页
+        .state('app.business.warning.violationDetail', {
+			url: '/business/warning/violationDetail/:id/:disabled',
+			data: {
+				title: '违规预警详情'
+			},
+			params:{
+				showType : "WD"
+			},
+			views: {
+				"content@app": {
+					controller: 'violationDetailCtrl',
+					templateUrl: 'app/supervise/views/violationDetail.html'
+				}
+			}
+		})
+
+        // 智能分析报警
+        .state('app.business.warning.intelligentWarn', {
+            url: '/business/warning/intelligentWarn',
+            data: {
+                title: '智能分析报警'
+            },
+            views: {
+                "content@app": {
+                    controller: 'intelligentWarnListCtrl',
+                    templateUrl: 'app/business/alarm/views/intelligentWarnList.html'
+                }
+            }
+        })
+
+        // 摄像头故障数
+        .state('app.business.warning.cameraMalfunction', {
+            url: '/business/warning/cameraMalfunction',
+            data: {
+                title: '摄像头故障'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptSxtgzsCtrl',
+                    templateUrl: 'app/supervise/views/cameraMalfunction-list.html'
+                }
+            }
+        })
+
+        // 测温点故障数
+        .state('app.business.warning.temperaturefunction', {
+            url: '/business/warning/temperaturefunction',
+            data: {
+                title: '测温点故障'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwdgzsCtrl',
+                    templateUrl: 'app/supervise/views/temperaturepoint-list.html'
+                }
+            }
+        })
+        
+        // 检验报告超期预警
+        .state('app.business.warning.jybgcqWarning', {
+            url: '/business/warning/jybgcqWarning',
+            data: {
+                title: '检验报告超期预警'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptJybgcqyjCtrl',
+                    templateUrl: 'app/supervise/views/jybgdcqyj-list.html'
+                }
+            }
+        })
+
+        //架空期预警
+        .state('app.business.warning.jkqWarning', {
+            url: '/business/warning/jkqWarning',
+            data: {
+                title: '架空期预警'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptJkqyjxxCtrl',
+                    templateUrl: 'app/supervise/views/jkqyj-list.html'
+                }
+            }
+        })
+
+        //转圈粮预警
+        .state('app.business.warning.zqlWarning', {
+            url: '/business/warning/zqlWarning',
+            data: {
+                title: '转圈粮预警'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptZqlyjxxCtrl',
+                    templateUrl: 'app/supervise/views/zqlyj-list.html'
+                }
+            }
+        })
+        /*---------------------------------------财务管理---------------------------------------------*/
+        .state('app.business.zcfzb', {
+            url: '/business/zcfzb',
+            data: {
+                title: '资产负债表'
+            },
+            params:{
+                type : 'asset'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwglCtrl',
+                    templateUrl: 'app/supervise/views/cwgl-list.html'
+                }
+            }
+        })
+        
+        .state('app.business.zcfzbView', {
+            url: '/business/zcfzbView/:id/:type',
+            data: {
+                title: '资产负债表详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwglSaveCtrl as datatables',
+                    templateUrl: 'app/supervise/views/cwgl-edit.html'
+                }
+            }
+        })
+        .state('app.business.xjllb', {
+            url: '/business/xjllb',
+            data: {
+                title: '现金流量表'
+            },
+            params:{
+                type : 'cash'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwglCtrl',
+                    templateUrl: 'app/supervise/views/cwgl-list.html'
+                }
+            }
+        })
+        .state('app.business.xjllbView', {
+            url: '/business/xjllbView/:id/:type',
+            data: {
+                title: '现金流量表详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwglSaveCtrl as datatables',
+                    templateUrl: 'app/supervise/views/cwglxjll-edit.html'
+                }
+            }
+        })
+        .state('app.business.lrb', {
+            url: '/business/lrb',
+            data: {
+                title: '利润表'
+            },
+            params:{
+                type : 'profit'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwglCtrl',
+                    templateUrl: 'app/supervise/views/cwgl-list.html'
+                }
+            }
+        })
+        
+        .state('app.business.lrbView', {
+            url: '/business/lrbView/:id/:type',
+            data: {
+                title: '利润表详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'sptCwglSaveCtrl as datatables',
+                    templateUrl: 'app/supervise/views/cwgllrb-edit.html'
+                }
+            }
+        })
+        
+        /*----------------------------------------------客户------------------------------------*/
+        .state('app.business.customer', {
+            abstract: true,
+            data: {
+                title: '客户管理'
+            }
+        })
+        
+        .state('app.business.customer.list', {
+            url: '/business/customer',
+            data: {
+                title: '客户档案管理'
+            },
+            views: {
+                "content@app": {
+                    controller: 'customerCtrl',
+                    templateUrl: 'app/business/customer/views/customer-list.html'
+                }
+            }
+        })
+        .state('app.business.customer.add', {
+                url: '/business/customer/add/:id',
+                data: {
+                    title: '客户档案新增'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'customerSaveCtrl as datatables',
+                        templateUrl: 'app/business/customer/views/customer-edit.html'
+                    }
+                }
+            }
+        )
+        .state('app.business.customer.edit', {
+            url: '/business/customer/edit/:id',
+            data: {
+                title: '客户档案修改'
+            },
+            views: {
+                "content@app": {
+                    controller: 'customerSaveCtrl as datatables',
+                    templateUrl: 'app/business/customer/views/customer-edit.html'
+                }
+            }
+        })
         
         
+        .state('app.business.customer.badrecord', {
+            url: '/business/customer/badrecord',
+            data: {
+                title: '客户不良记录管理'
+            },
+            views: {
+                "content@app": {
+                    controller: 'customerBadrecordCtrl',
+                    templateUrl: 'app/business/customer/views/customerBadrecord-list.html'
+                }
+            }
+        })
+        
+        .state('app.business.customer.blackList', {
+            url: '/business/customer/blackList',
+            data: {
+                title: '客户黑名单管理'
+            },
+            views: {
+                "content@app": {
+                    controller: 'customerBlackListCtrl',
+                    templateUrl: 'app/business/customer/views/customer-blackList.html'
+                }
+            }
+        })
+        
         
         /*------------------------------------------------合同--------------------------------------*/
         .state('app.business.contract', {
@@ -797,7 +1240,8 @@ angular.module('app.business')
         		title: '入库结算管理'
         	},
         	params:{
-        		jslx: '0'
+        		jslx: '0',
+        		ywlx: '1'
         	},
         	views: {
         		"content@app": {
@@ -819,14 +1263,14 @@ angular.module('app.business')
                 }
             }
         })
-
         .state('app.business.ckjslist', {
         	url: '/business/ckjslist',
         	data: {
         		title: '出库结算管理'
         	},
         	params:{
-        		jslx: '1'
+        		jslx: '1',
+        		ywlx: '1'
         	},
         	views: {
         		"content@app": {
@@ -835,7 +1279,6 @@ angular.module('app.business')
         		}
         	}
         })
-
         .state('app.business.ckjslist.edit', {
             url: '/business/ckjslist/edit/:id/:butType',
             data: {
@@ -848,8 +1291,61 @@ angular.module('app.business')
                 }
             }
         })
+        .state('app.business.rkjs-sl-list', {
+        	url: '/business/rkjs-sl-list',
+        	data: {
+        		title: '散粮入库结算管理'
+        	},
+        	params:{
+        		jslx: '0',
+        		ywlx: '0'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'jsglCtrl',
+        			templateUrl: 'app/business/jsgl/view/jsgl-sl-list.html'
+        		}
+        	}
+        })
+        .state('app.business.rkjs-sl-list.edit', {
+            url: '/business/rkjs-sl-list/edit/:id',
+            data: {
+                title: '散粮入库结算详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'jsglSlEditCtrl',
+                    templateUrl: 'app/business/jsgl/view/jsgl-sl-edit.html'
+                }
+            }
+        })
         /************************** 结算管理 end*******************************/
 
+        //---------------------------------------------统计管理-----------------------------------------------------  
+        .state('app.business.gxhttz', {
+            url: '/business/gxhttz',
+            data: {
+                title: '购销合同台账'
+            },
+            views: {
+                "content@app": {
+                    controller: 'purchaseListCtrl',
+                    templateUrl: 'app/business/purchase/views/list.html'
+                }
+		}
+        })
+		.state('app.business.gxhttz-add', {
+            url: '/business/gxhttz-add/:info/:disabled',
+            data: {
+                title: '购销合同台账详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'purchaseAddCtrl',
+                    templateUrl: 'app/business/purchase/views/add.html'
+                }
+            }
+        })
         
         //---------------------------------------------合同收付款-----------------------------------------------------  
         .state('app.business.contract-pay-recevice', {
@@ -2634,7 +3130,410 @@ angular.module('app.business')
                     }
                 }
             })
-      
+      //-----------------------------------------------------智能器材库------------------------------------------------------//
+        // 设备器材管理二级路由
+        .state('app.business.device', {
+            abstract: true,
+            data: {
+                title: '设备器材管理'
+            }
+        })
+        // 设备器材入库
+        .state('app.business.device.deviceStorageList', {
+            url: '/device/deviceStorageList',
+            data: {
+                title: '设备器材入库'
+            },
+            views: {
+                "content@app": {
+                    controller: 'deviceStorageCtrl',
+                    templateUrl: 'app/business/device/views/deviceStorage-list.html'
+                }
+            }
+        })
+        // 详情,编辑
+        .state('app.business.device.deviceStorageList.edit', {
+            url: '/device/deviceStorageList/edit/:id/:isNotEdit',
+            data: {
+                title: '设备器材入库详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'deviceStorageEditCtrl',
+                    templateUrl: 'app/business/device/views/deviceStorage-edit.html'
+                }
+            }
+        })
+        //----------------设备入库登记开始---------------//
+        .state('app.business.deviceInputList', {
+            url: '/deviceInputList',
+            data: {
+                title: '设备入库列表'
+            },
+            views: {
+                "content@app": {
+                    controller: 'deviceInputCtrl',
+                    templateUrl: 'app/business/device/views/deviceInput-list.html'
+                }
+            }
+        })  
+        .state('app.business.deviceInputAdd', {
+        	url: '/deviceInputAdd/:id/:isNotEdit',
+        	data: {
+        		title: '设备入库'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceInputCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
+        		}
+        	}
+        })  
+        .state('app.business.inputEdit', {
+        	url: '/inputEdit/:id/:isNotEdit',
+        	data: {
+        		title: '设备查看'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceInputCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
+        		}
+        	}
+        })  
+        //----------------设备入库登记结束---------------//
+        
+        //----------------器材领用开始---------------//
+        .state('app.business.device.deviceGetList', {
+        	url: '/deviceGetList',
+        	data: {
+        		title: '机械器材领用'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-list.html'
+        		}
+        	}
+        })  
+        .state('app.business.device.deviceGetAdd', {
+        	url: '/deviceGetAdd',
+        	data: {
+        		title: '领用信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-add.html'
+        		}
+        	}
+        })  
+        .state('app.business.device.deviceGetBack', {
+        	url: '/deviceGetBack/:id/:getCount',
+        	data: {
+        		title: '归还信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetBackCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-back.html'
+        		}
+        	}
+        })  
+        .state('app.business.device.deviceChack', {
+        	url: '/deviceChack/:id',
+        	data: {
+        		title: '信息详情'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetBackCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-detail.html'
+        		}
+        	}
+        })  
+        //----------------器材领用结束---------------//
+
+        // 设备器材管理三级路由
+        .state('app.business.device.manage', {
+            abstract: true,
+            data: {
+                title: '设备管理'
+            }
+        })
+        //----------------器材保养开始---------------//
+        .state('app.business.device.manage.deviceKeepList', {
+        	url: '/deviceKeepList',
+        	data: {
+        		title: '器材保养'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceKeepCtrl',
+        			templateUrl: 'app/business/device/views/deviceKeep-list.html'
+        		}
+        	}
+        })  
+        .state('app.business.device.manage.deviceKeepAdd', {
+        	url: '/deviceKeepAdd',
+        	data: {
+        		title: '添加保养信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceKeepAddCtrl',
+        			templateUrl: 'app/business/device/views/deviceKeep-add.html'
+        		}
+        	}
+        }) 
+        .state('app.business.device.manage.deviceKeepMassage', {
+        	url: '/deviceKeepMassage/:id',
+        	data: {
+        		title: '保养信息明细'
+        	},
+        	views: {   
+        		"content@app": {
+        			controller: 'deviceKeepSelCtrl',
+        			templateUrl: 'app/business/device/views/deviceKeep-olist.html'
+        		}
+        	}
+        }) 
+         //----------------器材保养结束---------------//
+        
+         //----------------器材维修开始---------------//
+        .state('app.business.device.manage.deviceRepairList', {
+        	url: '/deviceRepairList',
+        	data: {
+        		title: '器材维修'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceRepairCtrl',
+        			templateUrl: 'app/business/device/views/deviceRepair-list.html'
+        		}
+        	}
+        })  
+        .state('app.business.device.manage.devicerepairAdd', {
+        	url: '/devicerepairAdd',
+        	data: {
+        		title: '添加维修信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceRepairAddCtrl',
+        			templateUrl: 'app/business/device/views/deviceRepair-add.html'
+        		}
+        	}
+        })  
+        .state('app.business.device.manage.deviceRepairMassage', {
+        	url: '/deviceRepairMassage/:id/:isNotEdit',
+        	data: {
+        		title: '维修信息明细'
+        	},
+        	views: {   
+        		"content@app": {
+        			controller: 'deviceRepairSaveCtrl',
+        			templateUrl: 'app/business/device/views/deviceRepair-olist.html'
+        		}
+        	}
+        }) 
+        
+        //----------------器材维修结束---------------//
+        
+        
+        //----------------设备报废开始---------------//
+        .state('app.business.device.manage.deviceOutList', {
+        	url: '/deviceOutList',
+        	data: {
+        		title: '设备报废'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceOutCtrl',
+        			templateUrl: 'app/business/device/views/deviceOut-list.html'
+        		}
+        	}
+        })  
+         //----------------设备报废结束---------------//
+        //----------------台账开始---------------//
+        .state('app.business.device.deviceAccountList', {
+        	url: '/deviceAccountList',
+        	data: {
+        		title: '台账'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceAccountCtrl',
+        			templateUrl: 'app/business/device/views/deviceAccount-list.html'
+        		}
+        	}
+        })
+        
+        .state('app.business.device.accountEdit', {
+        	url: '/accountEdit/:deviceType/:deviceName/:model/:isNotEdit',
+        	data: {
+        		title: '设备台账'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceInputCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceAccount-edit.html'
+        		}
+        	}
+        }) 
+         //----------------台账结束---------------//
+        .state('app.business.device.deviceCheckList', {
+        	url: '/deviceCheckList',
+        	data: {
+        		title: '盘点单'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceCheck-list.html'
+        		}
+        	}
+        })
+        .state('app.business.device.checkAdd', {
+        	url: '/checkAdd',
+        	data: {
+        		title: '新建盘点单'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceCheckAddCtrl',
+        			templateUrl: 'app/business/device/views/deviceAdd.html'
+        		}
+        	}
+        })
+        .state('app.business.device.checkEdit', {
+        	url: '/checkEdit/:checkNumber/:isNotEdit',
+        	data: {
+        		title: '修改盘点单'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceCheckEditCtrl',
+        			templateUrl: 'app/business/device/views/deviceEdit.html'
+        		}
+        	}
+        })
+        //---------------------------------设施管理------------------------------------------------------
+         // 设施管理二级路由
+         .state('app.business.facility', {
+            abstract: true,
+            data: {
+                title: '设施管理'
+            }
+        })
+        //----------------设施基础信息维护开始---------------//
+        .state('app.business.facility.facilityStorageList', {
+            url: '/facilityStorageList',
+            data: {
+                title: '设施基础信息维护'
+            },
+            views: {
+                "content@app": {
+                    controller: 'facilityListCtrl',
+                    templateUrl: 'app/business/facility/views/facility-list.html'
+                }
+            }
+        })  
+        .state('app.business.facility.addFacility', {
+            url: '/addFacility/:isNotEdit/:facility?',
+            data: {
+                title: '新增设施'
+            },
+            views: {
+                "content@app": {
+                    controller: 'addfacilityCtrl',
+                    templateUrl: 'app/business/facility/views/add-facility.html'
+                }
+            }
+        })  
+        
+        //----------------设施基础信息维护结束---------------//
+        //----------------设施保养开始---------------//
+        .state('app.business.facility.facilityKeepList', {
+            url: '/facilityKeepList',
+            data: {
+                title: '设施保养'
+            },
+            views: {
+                "content@app": {
+                    controller: 'facilityKeepListCtrl',
+                    templateUrl: 'app/business/facility/views/facility-keep.html'
+                }
+            }
+        }) 
+        .state('app.business.facility.addFacilityKeep', {
+            url: '/addFacilityKeep/:isNotEdit/:facility?',
+            data: {
+                title: '添加设施保养信息'
+            },
+            views: {
+                "content@app": {
+                    controller: 'addfacilityKeepCtrl',
+                    templateUrl: 'app/business/facility/views/add-facility-keep.html'
+                }
+            }
+        })  
+        
+        //----------------设施保养结束---------------//
+         //----------------设施维修开始---------------//
+         .state('app.business.facility.facilityGetList', {
+            url: '/facilityGetList',
+            data: {
+                title: '设施维修'
+            },
+            views: {
+                "content@app": {
+                    controller: 'facilityGetListCtrl',
+                    templateUrl: 'app/business/facility/views/facility-get-list.html'
+                }
+            }
+        }) 
+        .state('app.business.facility.addFacilityGet', {
+            url: '/addfacilityGet/:isNotEdit/:facility?',
+            data: {
+                title: '添加设施维修信息'
+            },
+            views: {
+                "content@app": {
+                    controller: 'addFacilityGetCtrl',
+                    templateUrl: 'app/business/facility/views/add-facility-get.html'
+                }
+            }
+        })  
+        
+        //----------------设施维修结束---------------//
+        // //----------------设施报废开始---------------//
+        // .state('app.business.facility.facilityScrapList', {
+        //     url: '/facilityScrapList',
+        //     data: {
+        //         title: '设施报废'
+        //     },
+        //     views: {
+        //         "content@app": {
+        //             controller: 'facilityScrapListCtrl',
+        //             templateUrl: 'app/business/facility/views/facility-scraplist.html'
+        //         }
+        //     }
+        // }) 
+        // .state('app.business.facility.addFacilityScrap', {
+        //     url: '/addFacilityScrap',
+        //     data: {
+        //         title: '添加设施报废信息'
+        //     },
+        //     views: {
+        //         "content@app": {
+        //             controller: 'addFacilityScrapCtrl',
+        //             templateUrl: 'app/business/facility/views/add-facility-scrap.html'
+        //         }
+        //     }
+        // })  
+        
+        // //----------------设施报废结束---------------//
         
   //---------------------------------储备粮管理------------------------------------------------------
         

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

@@ -11,7 +11,7 @@ angular.module('app.supervise').controller("purchaseAddCtrl", function ($scope,
         if ($rootScope.previousState_name != '') {
         	$rootScope.back();
         } else {
-        	$state.go("app.cstj.gxhttz");
+        	$state.go("app.business.gxhttz");
         }
     }
 

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

@@ -21,21 +21,21 @@ angular.module('app.supervise').controller("purchaseListCtrl", function ($scope,
 	}
 
 	$scope.addRow = function() {
-		$state.go("app.cstj.gxhttz-add", {
+		$state.go("app.business.gxhttz-add", {
 			info: 0,
 			disabled: 0
 		});
 	}
 	// 编辑
 	$scope.handleEditor = function (info) {
-		$state.go("app.cstj.gxhttz-add", {
+		$state.go("app.business.gxhttz-add", {
 			info: angular.toJson(info),
 			disabled: 0
 		});
 	};
 	// 查看
 	$scope.handleLook = function (info) {
-		$state.go("app.cstj.gxhttz-add", {
+		$state.go("app.business.gxhttz-add", {
 			info: angular.toJson(info),
 			disabled: 1
 		});

src/main/resources/static/app/business/schedule/controller/contractScheduleCtrl.js

@@ -25,7 +25,7 @@ angular.module('app.business').controller("contractScheduleCtrl", function($scop
     // 查看页面
     $scope.showView = function(id, processInstanceId,contractType) {
     	if ($stateParams.SalesStatistics) {
-            $state.go("app.jczcsupervise.decisionSupport.SalesStatistics.contract-schedule.contract-view", {id : id, processInstanceId : processInstanceId});
+            $state.go("app.supervise.decisionSupport.SalesStatistics.contract-schedule.contract-view", {id : id, processInstanceId : processInstanceId});
             return;
 		}
     	if(contractType == 6913){

src/main/resources/static/app/business/schedule/controller/deliveryStorageNoticeScheduleCtrl.js

@@ -25,9 +25,9 @@ angular.module('app.business').controller("deliveryStorageNoticeScheduleCtrl", f
     $scope.showView = function(id, billType, processInstanceId) {
          if ($stateParams.SalesStatistics) {
              if (billType == "1") {
-                 $state.go("app.jczcsupervise.decisionSupport.SalesStatistics.deliveryStorageNotice-schedule.deliveryNotice-view", {id : id, processInstanceId : processInstanceId});
+                 $state.go("app.supervise.decisionSupport.SalesStatistics.deliveryStorageNotice-schedule.deliveryNotice-view", {id : id, processInstanceId : processInstanceId});
              } else if (billType == "3") {
-                 $state.go("app.jczcsupervise.decisionSupport.SalesStatistics.deliveryStorageNotice-schedule.storageNotice-view", {id : id, processInstanceId : processInstanceId});
+                 $state.go("app.supervise.decisionSupport.SalesStatistics.deliveryStorageNotice-schedule.storageNotice-view", {id : id, processInstanceId : processInstanceId});
              }
              return;
          }

src/main/resources/static/app/business/schedule/controller/planScheduleCtrl.js

@@ -19,7 +19,7 @@ angular.module('app.business').controller("planScheduleCtrl", function($scope, $
     $scope.showView = function(id, processInstanceId) {
         // 粮食购销统计 计划执行进度详情
         if ($stateParams.SalesStatistics) {
-            $state.go("app.jczcsupervise.decisionSupport.SalesStatistics.plan-schedule.plan-view",{id : id, processInstanceId : processInstanceId});
+            $state.go("app.supervise.decisionSupport.SalesStatistics.plan-schedule.plan-view",{id : id, processInstanceId : processInstanceId});
             return;
         }
         $state.go("app.business.plan-view",{id : id, processInstanceId : processInstanceId});

src/main/resources/static/app/business/storeWareDetail/service/storeWareDetailService.js

@@ -52,27 +52,8 @@ angular.module('app.business').service("storeWareDetailService", function($rootS
         });
         return d.promise;
     }
-    
-   /* this.getHwhFromDsfjy = function(grainDetailKind, grainGrade, houseId) {
-        var d = $q.defer();
-        $http({
-            method : 'GET',
-            url : APP_CONFIG.baseUrl + '/qualitycheck/getHouseOrWareList',
-            params : {
-            	subTypeDetailed : grainDetailKind,
-				level : grainGrade,
-				houseId : houseId
-            }
-        }).then(function successCallback(response) {
-            // 请求成功执行代码
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            // 请求失败执行代码
-            d.reject("error");
-        });
-        return d.promise;
-    }*/
-     this.getchByfat = function(grainDetailKind, grainGrade) {
+
+    this.getchByfat = function(grainDetailKind, grainGrade) {
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -91,7 +72,7 @@ angular.module('app.business').service("storeWareDetailService", function($rootS
         return d.promise;
     }
      
-     this.getCountBych = function(grainDetailKind, grainGrade,storehouseId,warehouseId) {
+    this.getCountBych = function(grainDetailKind, grainGrade,storehouseId,warehouseId) {
     	 var d = $q.defer();
     	 $http({
     		 method : 'GET',
@@ -110,9 +91,9 @@ angular.module('app.business').service("storeWareDetailService", function($rootS
     		 d.reject("error");
     	 });
     	 return d.promise;
-     }
+    }
     
-     //从库存根据仓房和货位号获取相应信息
+    //从库存根据仓房和货位号获取相应信息
     this.getMassageFromKc = function(houseId,warehouseId,qualitycheckList) {
         var d = $q.defer();
         $http({
@@ -133,8 +114,7 @@ angular.module('app.business').service("storeWareDetailService", function($rootS
         return d.promise;
     }
     
-     this.queryStoreWareDetailInfo = function(id) {
-    //    this.queryStoreWareDetailInfo = function() {
+    this.queryStoreWareDetailInfo = function(id) {
     	var d = $q.defer();
     	$http({
     		method : 'GET',
@@ -152,7 +132,7 @@ angular.module('app.business').service("storeWareDetailService", function($rootS
     	});
     	return d.promise;
     }
-     
+
      //获取剩余数量(合同)
      this.getRemainNumber = function(receiveNotice) {
          var d = $q.defer();
@@ -210,5 +190,24 @@ angular.module('app.business').service("storeWareDetailService", function($rootS
     	 });
     	 return d.promise;
      }
-     
+
+     //获取剩余数量(出库通知单)
+     this.getStoreWareDetailList = function(zid, dataType) {
+    	 var d = $q.defer();
+    	 $http({
+    		 method : 'GET',
+    		 url : APP_CONFIG.businessUrl + '/depot/business/storeWareDetail/getStoreWareDetailList',
+    		 params : {
+    			 zid : zid,
+    			 dataType : dataType
+    		 }
+    	 }).then(function successCallback(response) {
+    		 // 请求成功执行代码
+    		 d.resolve(response.data);
+    	 }, function errorCallback(response) {
+    		 // 请求失败执行代码
+    		 d.reject("error");
+    	 });
+    	 return d.promise;
+     }
 })

src/main/resources/static/app/business/storeWareDetail/views/grainStoreWareDetailModal.html

@@ -28,16 +28,6 @@
 						</select>
 					</label>
 				</section>
-				<!-- <section class="col col-sm-4" ng-hide="wareHidden">
-					<label class="label">油罐名称<span style="color: red;">*</span></label> 
-					<label class="select">
-	                    <select ng-model="storeWareDetail.houseId" name="houseId" required
-							ng-options="tank.storehouseId as tank.storehouseName for tank in tankList"
-							 	ng-change="warehouseChange()" class="form-control" >
-								<option value="">--请选择--</option>
-						</select>
-					</label>
-				</section> -->
 				<section class="col col-sm-4">
 					<label class="label">货位名称<span style="color: red;">*</span></label> 
 					<label class="select"> 
@@ -77,7 +67,7 @@
                          line-height:15px;" id="grainDetailKind-error"></span></em>
                     </label>
 				</section>
-				<section class="col col-sm-4">
+				<section class="col col-sm-4" ng-show="xiaoshou">
 					<label class="label">粮油性质<span style="color: red;">*</span></label>
 		             <label class="select" id="grainAttribute-label">
                           <multi-select-tree
@@ -93,6 +83,22 @@
                          line-height:15px;" id="grainAttribute-error"></span></em>
                      </label>
 				</section>
+				<section class="col col-sm-4" ng-show="shouchu">
+					<label class="label">粮油性质<span style="color: red;">*</span></label>
+		             <label class="select" id="grainAttribute-label">
+                          <multi-select-tree
+                              disabled-tree="isEdit"
+                              data-input-model="grainAttributeTreeData"
+                              data-output-model="storeWareDetail.grainAttribute"
+                              data-default-label="请选择" name="grainAttribute"
+                              multi-select="false"
+                              select-only-leafs="true"
+                              data-callback="selectOnly1Or2(item, selectedItems)" required>
+                          </multi-select-tree>
+                          <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;
+                         line-height:15px;" id="grainAttribute-error"></span></em>
+                     </label>
+				</section>
 			</div>
 			<div class="row">
 			    <section class="col col-sm-4"  ng-show="shouchu">
@@ -244,13 +250,14 @@
                              	<option value="2">调节储备轮换</option>
                              	<option value="3">竞价采购</option>
                              	<option value="4">移库倒仓补库</option>
+                             	<option value="5">兜底</option>
                              </select> 
 		                 </label> 
 				</section>
 			    <section class="col col-sm-4">
 					<label class="label">协议编号<span style="color: red;">*</span></label> 
 		                <label class="input">
-		                  <input class="form-control" type="text" ng-model="storeWareDetail.agreementNumber"  ng-disabled="isEdit"  name="agreementNumber" ng-required="storeWareDetail.incomingType!=4" />
+		                  <input class="form-control" type="text" ng-model="storeWareDetail.agreementNumber"  ng-disabled="isEdit"  name="agreementNumber" ng-required="storeWareDetail.incomingType=='1' || storeWareDetail.incomingType=='2'" />
 		                </label>
 				</section>
 			    <section class="col col-sm-4">

src/main/resources/static/app/business/util/controller/addCustomerModal.js

@@ -117,7 +117,7 @@ angular.module('app.business').controller("addCustomerCtrl", function($scope, $h
     
     // 返回.
    /* $scope.retList = function () {
-    	$state.go('app.basic.customer.list');
+    	$state.go('app.business.customer.list');
     }*/
     // 返回.
     $scope.retList = function () {

src/main/resources/static/app/business/util/controller/customerListModalCtrl.js

@@ -23,6 +23,9 @@ angular.module('app.business').controller("customerListModalCtrl",
             $scope.type = "addBlacklist";
             $scope.searchCondition.isInBlacklist = 0;
         }
+        if (items.classify != undefined && items.classify != null) {
+        	$scope.searchCondition.classify = items.classify;
+        }
     }
     $scope.loadData();
     

src/main/resources/static/app/business/util/controller/grainUtilReceiveNoticeCtrl .js

@@ -46,7 +46,7 @@ angular.module('app.business').controller("grainUtilReceiveNoticeCtrl",
         
     }
     
-    $scope.loadData(1,10,$scope.searchCondition);
+    $scope.loadData();
     
     
     // 翻页
@@ -61,34 +61,20 @@ angular.module('app.business').controller("grainUtilReceiveNoticeCtrl",
 
 	// 勾选一条验收数据
 	$scope.selectData = function(check) {
-//	    var checked = $event.target.checked;
-//	    if(checked){
-//	        $scope.selected.push(check);
-//	    }else{
-//	        var idx = $scope.selected.indexOf(check);
-//	        $scope.selected.splice(idx,1);
-//	    }
-//		$scope.selected.push(check);
 		var data = [];
-		var remainNumber = [];
-//		for (var index = 0; index < $scope.pageInfo.list.length; index++) {
-//			const e = $scope.pageInfo.list[index];
-//			if(e.selected){  //筛选勾上的数据
-//				data.push(e)
-//			}
-//		}  
+		var remainNumber = []; 
 		data.push(check);
 		//在界面上，如果list就是表格所有的数据，勾选那条，那条就会selected就时true
 		//查询使用过的数量，展示剩余数量
-		if(items.cktzd ==null){
-			if(items.ywtype ==1){
+//		if(items.cktzd ==null){
+			if (check.crktype == 1) {
 				  storeWareDetailService.getRkRemainNumber(data).then(function(remainData) {
 					remainNumber = remainData.list;
 					$uibModalInstance.close(remainNumber);
 		          },function(remainData){
 		              console.log(remainData);
 		          });
-			}else if(items.ywtype==2){
+			} else if (check.crktype == 3) {
 				storeWareDetailService.getCkRemainNumber(data).then(function(remainData) {
 					remainNumber = remainData.list;
 					$uibModalInstance.close(remainNumber);
@@ -96,16 +82,16 @@ angular.module('app.business').controller("grainUtilReceiveNoticeCtrl",
 		              console.log(remainData);
 		          });
 			}
-		}else if(items.cktzd !=null && items.cktzd == 0){
+		/*}else if(items.cktzd !=null && items.cktzd == 0){
 			if(items.ywtype ==1){ //求销售和轮换的
-				if(check.ywtype == 3){
+				if(check.ywtype == 1){
 					storeWareDetailService.getRemainNumber(data).then(function(remainData) {
 		            	remainNumber = remainData.list;
 		            	$uibModalInstance.close(remainNumber);
 		            },function(remainData){
 		                console.log(remainData);
 		            });
-				}else if(check.ywtype == 2){
+				}else if(check.ywtype == 2 || check.ywtype == 3){
 					storeWareDetailService.getCkRemainNumber(data).then(function(remainData) {
 						remainNumber = remainData.list;
 						$uibModalInstance.close(remainNumber);
@@ -115,7 +101,7 @@ angular.module('app.business').controller("grainUtilReceiveNoticeCtrl",
 				}
 
 			}
-		}
+		}*/
 	}
 
 	// 关闭模态窗口

src/main/resources/static/app/business/util/views/grainReceiveNotice-list.html

@@ -34,6 +34,7 @@
 	                                    <div ng-switch-when="1">竞买</div>
 		                                <div ng-switch-when="2">竞价销售</div>
 		                                <div ng-switch-when="3">包干</div>
+		                                <div ng-switch-when="4">兜底</div>
 	                                </div>
 	                            </td>
                                 <td>{{receiveNotice.contractNumber}}</td>  

src/main/resources/static/app/home/controller/daibsxCtrl.js

@@ -29,7 +29,7 @@ angular.module('app.system')
         // 安全生产通知链接
         var safeProduceNotifyCtrlScope = $('div[ng-controller="headerCtrl"]').scope();
         $scope.safeProduceNotifyTodo = function () {
-            safeProduceNotifyCtrlScope.switchTopMenu(19, "app.safeproduce.notifyList");
+            safeProduceNotifyCtrlScope.switchTopMenu(19, "app.storage.safeproduce.notifyList");
         };
 
         // ----------------获取药剂采购审批事项数据------------------

src/main/resources/static/app/intelligent/aeration/controller/aerationJobCtrl.js

@@ -4,7 +4,6 @@ angular.module('app.intelligent')
 .controller("aerationJobCtrl", function($scope, $rootScope, $state, $http, $stateParams, 
 		 aerationJobService,archiveService, $filter) {
 
-	
 	//通风作业数据查询
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
 	$scope.aerationJob = {cfbh: ""};
@@ -44,6 +43,8 @@ angular.module('app.intelligent')
 				console.log(data);
 			});
 		}else {
+			$scope.aerationJob.funcType = $stateParams.funcType;//1：代表通风作业开始功能,2：代表通风作业结束功能
+			$scope.funcType = $stateParams.funcType;
 			aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, null).then(function (data) {
 				$scope.pageInfo = data.data;
 			}, function (data) {
@@ -62,24 +63,12 @@ angular.module('app.intelligent')
       	}
  	}
 
+    // 新增、修改、查看页面
+    $scope.edit = function(id, butType, funcType) {
+        $state.go("app.intelligent.aeration.aerationJob-edit", {id: id, butType: butType, funcType: funcType});
+    }
 
-    // 查看页面
-    $scope.showView = function(id) {
-        $state.go("app.intelligent.aeration.aerationJob-view", {id: id});
-    };
-    
-    
-    // 修改页面
-    $scope.editView = function(id) {
-    	$state.go("app.intelligent.aeration.aerationJob-edit", {id: id});
-    };
-    
-    // 新增页面
-    $scope.addView = function() {
-    	$state.go("app.intelligent.aeration.aerationJob-add", {id: 0});
-    };
-    
-   // 删除一条记录.
+    // 删除一条记录.
     $scope.remove = function(id) {
         if (!confirm("确定要删除吗？")) {
             return;
@@ -101,6 +90,8 @@ angular.module('app.intelligent')
     // 防止重复提交标记
     $scope.saveFlag = false;
     
+    $scope.funcType = $stateParams.funcType;
+    
     $scope.aerationJob = {};
    
     //通风作业负责人校验
@@ -137,18 +128,9 @@ angular.module('app.intelligent')
 
     $scope.lwChange = function(){
     	if($scope.aerationJob.tfhpjlw!=null && $scope.aerationJob.tfqpjlw!=null){
-    		
 			//降温幅度
 			var jwl = parseFloat($scope.aerationJob.tfqpjlw) - parseFloat($scope.aerationJob.tfhpjlw);
 			$scope.aerationJob.jwfd = jwl.toFixed(1);
-			//计算降温幅度(%)百分比
-			// if (parseFloat($scope.aerationJob.tfqpjlw)!=0) {
-			// 	//降水幅度(%)，保留1位小数
-			// 	var jwfd = parseFloat(parseFloat(jwl) / parseFloat($scope.aerationJob.tfqpjlw)*100).toFixed(1);
-			// 	$scope.aerationJob.jwfd = jwfd;
-			// } else {
-			// 	$scope.aerationJob.jwfd = 0;
-			// }
     	}
     }
     
@@ -190,7 +172,10 @@ angular.module('app.intelligent')
             $scope.aerationJob.cfmc=parseInt(data.data.cfmc);
             $scope.aerationJob.cflx=parseInt(data.data.cflx);
             $scope.aerationJob.dlxs=parseInt(data.data.dlxs);
-           
+            if ($scope.funcType == '2' && $stateParams.butType == 'update') {
+        		$scope.aerationJob.zyjsxxjlr = $rootScope.userInfo.realName;
+        		$scope.aerationJob.zyjsxxjlsj = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
+        	}
         },function(data){
         });
     };
@@ -218,10 +203,16 @@ angular.module('app.intelligent')
 			$scope.aerationJob.dljsnh = parseFloat(parseFloat(v)/0.01*parseFloat(kcsl)).toFixed(3);
 		}
 	}
-    
-    
- // 保存.
-    
+
+	$scope.zyksxxShowData = function() {
+		if ($scope.zyksxxData) {
+			$scope.zyksxxData = false;
+		} else {
+			$scope.zyksxxData = true;
+		}
+	}
+
+    // 保存.
     var validator = $("#aerationJob-form").validate();
     
     $.validator.addMethod("tfjts",function(value,element, params) {
@@ -230,11 +221,24 @@ angular.module('app.intelligent')
     	return this.optional(element)||(checkNumber.test(value));  
     },"请输入正整数");
     
-    $scope.save = function () {
-    	$scope.aerationJob.tfkssj = $("#tfkssj").val();
-    	$scope.aerationJob.tfjssj = $("#tfjssj").val();
-    	$scope.aerationJob.djrq = $("#djrq").val();
-    	
+    $scope.save = function (funcType, butType) {
+    	if (funcType == '1') {
+    		if (butType == '0') {
+    			$scope.aerationJob.dataStatus = '0';
+    		} else {
+    			$scope.aerationJob.dataStatus = '1';
+    		}
+    		$scope.aerationJob.tfkssj = $("#tfkssj").val();
+    	}
+    	if (funcType == '2') {
+    		if (butType == '0') {
+    			$scope.aerationJob.dataStatus = '2';
+    		} else {
+    			$scope.aerationJob.dataStatus = '3';
+    		}
+    		$scope.aerationJob.tfjssj = $("#tfjssj").val();
+    	}
+
     	if (!$scope.saveFlag) {
     		if (validator.form()) {
     			// 设置saveFlag为true,防止重复提交.
@@ -253,7 +257,6 @@ angular.module('app.intelligent')
     	}
     }
 
-    
     //获取仓房名称
     $scope.houseName = function(){
     	$scope.kcswStr = {unitid : $rootScope.userInfo.orgId};
@@ -269,24 +272,48 @@ angular.module('app.intelligent')
         if ($rootScope.previousState_name != '') {
             $rootScope.back();
         } else {
-            $state.go("app.intelligent.aeration.aerationJob");
+        	if ($stateParams.funcType == 1) {
+        		$state.go("app.intelligent.aeration.aerationJob_ks", {funcType: '1'});
+        	} else {
+        		$state.go("app.intelligent.aeration.aerationJob_js", {funcType: '2'});
+        	}
         }
     }
     
     
-    if($stateParams.id!=0){
+    if($stateParams.id != 0){
     	$scope.loadDataById($stateParams.id);
-    	$scope.isNotEdit = $stateParams.isNotEdit;
-    	//$scope.houseName();
+    	if ($stateParams.funcType == 1) {
+    		$scope.isJsNotEdit = true;
+    		if ($stateParams.butType == 'update') {
+    			$scope.isKsNotEdit = false;
+    			$scope.but_IsNotEdit = true;//保存和提交按钮
+    		} else {
+    			$scope.isKsNotEdit = true;
+    			$scope.but_IsNotEdit = false;//保存和提交按钮
+    		}
+    	} else if ($stateParams.funcType == 2) {//作业结束
+    		$scope.isKsNotEdit = true;
+    		$scope.zyksxxData = false;
+        	if ($stateParams.butType == 'update') {
+        		$scope.isJsNotEdit = false;
+        		$scope.but_IsNotEdit = true;//保存和提交按钮
+        	} else {
+        		$scope.isJsNotEdit = true;
+        		$scope.but_IsNotEdit = false;//保存和提交按钮
+        	}
+        }
     }else{
-    	//$scope.houseName();
-    	$scope.isNotEdit = false;
+    	$scope.isJsNotEdit = true;
+    	$scope.isKsNotEdit = false;
     	$scope.aerationJob.tfzyfzr = $rootScope.userInfo.realName;
     	$scope.aerationJob.djrq = $filter('date')(new Date(), "yyyy-MM-dd");
     	$scope.depotName = $rootScope.orgInfo.orgName;
+    	$scope.aerationJob.zyksxxjlr = $rootScope.userInfo.realName;
+    	$scope.aerationJob.zyksxxjlsj = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
+    	$scope.but_IsNotEdit = true;//保存和提交按钮
     }
 
-    
     //仓房名称改变 获取数据
     $scope.houseChange = function(houseId){
     	if(houseId!=null){

src/main/resources/static/app/intelligent/aeration/service/aerationJobService.js

@@ -12,6 +12,7 @@ angular.module('app.intelligent').service("aerationJobService", function($http,
 				pageSize : pageSize,
 				cfbh : aerationJob==undefined?"":aerationJob.cfbh,
 				createTime : aerationJob==undefined?"":aerationJob.createTime,
+				funcType : aerationJob==undefined?"":aerationJob.funcType,
 				cfmc : cfmc,
 				orgId : $rootScope.userInfo.orgId
 				

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

@@ -0,0 +1,93 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+	<!-- widget grid -->
+	<section widget-grid id="widget-grid">
+
+
+		<div class="row">
+			<article class="col-sm-12">
+
+				<div jarvis-widget id="standard-datatable-widget"
+					data-widget-color="darken" data-widget-editbutton="true">
+					<header>
+						<span class="widget-icon"> <i class="fa fa-table"></i>
+						</span>
+						<h2>通风作业结束列表</h2>
+					</header>
+					<div>
+						<div class="widget-body no-padding">
+							<div id="DataTables_Table_1_wrapper"
+								class="dataTables_wrapper form-inline no-footer">
+								<div class="dt-toolbar">
+									<div class="col-xs-12 col-sm-9">
+										<div class="form-group">
+<!-- 										    <a ng-hide="isArchive" has-permission="703" class="btn btn-primary btn-sm" ng-click="edit(null, 'add', '2')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a> -->
+											&emsp;
+											<label> 仓房名称:&emsp;
+                                                <select ng-model="aerationJob.cfbh" 
+                                                        ng-options="store.storehouseId as store.storehouseName for store in storelist"
+                                                         class="form-control">
+                                                    <option value="">--请选择--</option>
+                                                </select>&emsp;
+                                            </label>
+											<a class="btn btn-default btn-sm" ng-click="loadData()">
+												<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+											</a>
+										</div>
+									</div>
+									<div class="col-sm-3 col-xs-12 hidden-xs">
+                                    <div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+																ng-options="num as num for num in [1,10,25,50,100]"
+																class="form-control input-sm"></select> 条
+											</label>
+									</div>
+                                </div>
+								</div>
+
+								<table class="table table-striped table-bordered table-hover" width="100%">
+									<thead>
+										<tr>
+											<th data-class="expand">序号</th>
+											<th data-class="expand">仓房名称</th>
+											<th data-class="expand">通风开始时间</th>
+											<th data-class="expand">通风结束时间</th>
+											<th data-hide="expand">通风作业负责人</th>
+											<th data-hide="expand">操作</th>
+										</tr>
+									</thead>
+
+									<tbody>
+										<tr ng-repeat="aerationJob in pageInfo.list">
+											<td>{{$index + 1}}</td>
+											<td>{{storehouseObj[aerationJob.cfmc].storehouseName}}</td>
+											<td>{{aerationJob.tfkssj | date:'yyyy-MM-dd'}}</td>
+											<td>{{aerationJob.tfjssj | date:'yyyy-MM-dd'}}</td>
+											<td>{{aerationJob.tfzyfzr}}</td>
+											<td>
+												    <span ng-hide="funcType==2 && aerationJob.dataStatus==3">
+														<a has-permission="704" href-void ng-click="edit(aerationJob.id, 'update', '2')">
+														    <i class="fa fa-info-circle"></i>处理
+													    </a>
+													    <!-- <a has-permission="705"  ng-click="remove(aerationJob.id)">
+															<i class="fa fa-trash-o"></i>删除
+														</a> -->
+												    </span>
+													<a href-void ng-click="edit(aerationJob.id, 'view', '2')">
+													    <i class="fa fa-info-circle"></i>查看
+												    </a>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+								<div smart-include="app/layout/partials/page.tpl.html"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</article>
+		</div>
+
+	</section>
+
+</div>

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

@@ -0,0 +1,93 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+	<!-- widget grid -->
+	<section widget-grid id="widget-grid">
+
+
+		<div class="row">
+			<article class="col-sm-12">
+
+				<div jarvis-widget id="standard-datatable-widget"
+					data-widget-color="darken" data-widget-editbutton="true">
+					<header>
+						<span class="widget-icon"> <i class="fa fa-table"></i>
+						</span>
+						<h2>通风作业开始列表</h2>
+					</header>
+					<div>
+						<div class="widget-body no-padding">
+							<div id="DataTables_Table_1_wrapper"
+								class="dataTables_wrapper form-inline no-footer">
+								<div class="dt-toolbar">
+									<div class="col-xs-12 col-sm-9">
+										<div class="form-group">
+										    <a ng-hide="isArchive" has-permission="703" class="btn btn-primary btn-sm" ng-click="edit(null, 'add', '1')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+											&emsp;
+											<label> 仓房名称:&emsp;
+                                                <select ng-model="aerationJob.cfbh" 
+                                                        ng-options="store.storehouseCode as store.storehouseName for store in storelist"
+                                                         class="form-control">
+                                                    <option value="">--请选择--</option>
+                                                </select>&emsp;
+                                            </label>
+											<a class="btn btn-default btn-sm" ng-click="loadData()">
+												<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+											</a>
+										</div>
+									</div>
+									<div class="col-sm-3 col-xs-12 hidden-xs">
+                                    <div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+																ng-options="num as num for num in [1,10,25,50,100]"
+																class="form-control input-sm"></select> 条
+											</label>
+									</div>
+                                </div>
+								</div>
+
+								<table class="table table-striped table-bordered table-hover" width="100%">
+									<thead>
+										<tr>
+											<th data-class="expand">序号</th>
+											<th data-class="expand">仓房名称</th>
+											<th data-class="expand">通风开始时间</th>
+											<th data-class="expand">通风结束时间</th>
+											<th data-hide="expand">通风作业负责人</th>
+											<th data-hide="expand">操作</th>
+										</tr>
+									</thead>
+
+									<tbody>
+										<tr ng-repeat="aerationJob in pageInfo.list">
+											<td>{{$index + 1}}</td>
+											<td>{{storehouseObj[aerationJob.cfmc].storehouseName}}</td>
+											<td>{{aerationJob.tfkssj | date:'yyyy-MM-dd'}}</td>
+											<td>{{aerationJob.tfjssj | date:'yyyy-MM-dd'}}</td>
+											<td>{{aerationJob.tfzyfzr}}</td>
+											<td>
+													<a href-void ng-click="edit(aerationJob.id, 'view', '1')">
+													    <i class="fa fa-info-circle"></i>查看
+												    </a>
+												    <span ng-show="funcType==1 && aerationJob.dataStatus == 0">
+														<a has-permission="704" href-void ng-click="edit(aerationJob.id, 'update', '1')">
+														    <i class="fa fa-info-circle"></i>修改
+													    </a>
+													    <a has-permission="705"  ng-click="remove(aerationJob.id)">
+															<i class="fa fa-trash-o"></i>删除
+														</a>
+												    </span>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+								<div smart-include="app/layout/partials/page.tpl.html"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</article>
+		</div>
+
+	</section>
+
+</div>

src/main/resources/static/app/intelligent/fumigation/controller/fumHomeWorkCtrl.js

@@ -161,7 +161,16 @@ angular.module('app.intelligent')
 
                 $scope.fumigationProcess.fumigationId = id;
                 $scope.fumigationProcess.operationSupervisor = $scope.fumigation.xzzyfzr;
-
+                $scope.fumigationProcess.djcxz = parseInt($scope.fumigation.yxzcs)+1;
+                $scope.fumigationProcess.createTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
+                $scope.fumigationProcess.cjr = $rootScope.userInfo.realName;
+
+                $scope.drug = data.drugUse;
+                $scope.fumigationProcess.yjlysqbh = $scope.drug.applyNumber;
+                $scope.fumigationProcess.yjmc = $scope.drug.drugName;
+                $scope.fumigationProcess.jx = $scope.drug.drugType;
+                $scope.fumigationProcess.lyhjzl = $scope.drug.totalNumber;
+                
             },function(data){
                 console.log(data);
             });
@@ -213,51 +222,6 @@ angular.module('app.intelligent')
                 return this.optional(element)|| true;
             }
         },"不能填写无，暂无,空等选项！");
-        
-        $scope.countSqts = function() {
-        	var sqksrq = null;
-        	var sqjsrq = null;
-        	$("input[name='bulkStartTime']").each(function(j,item){
-                if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
-                	sqksrq = $filter('date')(item.value.substring(0,10), "yyyy-MM-dd");
-                	sqksrq = sqksrq.split('-');
-                }
-            });
-            $("input[name='bulkEndTime']").each(function(j,item){
-                if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
-                	sqjsrq = $filter('date')(item.value.substring(0,10), "yyyy-MM-dd");
-                	sqjsrq = sqjsrq.split('-');
-                }
-            });
-            if (null != sqksrq && "undefined" != sqksrq && sqjsrq != null && "undefined" != sqjsrq) {
-            	var sqksrq_int = new Date(sqksrq[0], sqksrq[1]-1, sqksrq[2]);
-            	var sqjsrq_int = new Date(sqjsrq[0], sqjsrq[1]-1, sqjsrq[2]);
-            	var day = parseInt(Math.abs(sqjsrq_int-sqksrq_int) / (1000 * 60 * 60 * 24));
-            	$scope.fumigationProcess.perforatedDays = day+1;
-            }
-        }
-        
-        // 自定义验证:实际散气开始日期
-        $.validator.addMethod("sjsqkssj",function(value,element, params) {
-        	//var xzsykssj = $filter('date')($scope.fumigation.fumigationStart, "yyyy-MM-dd HH:mm:ss");
-        	var xzsyjssj = $filter('date')($scope.fumigation.fumigationEnd, "yyyy-MM-dd HH:mm:ss");
-        	//实际散气开始时间
-        	var sjsqkssj = $filter('date')(value, "yyyy-MM-dd HH:mm:ss");
-        	//实际散气结束时间
-        	var sjsqjssj = $filter('date')($scope.fumigationProcess.bulkEndTime, "yyyy-MM-dd HH:mm:ss");
-            if(sjsqkssj < xzsyjssj){
-                return this.optional(element)|| false;
-            }else{
-            	$scope.countSqts();
-                return this.optional(element)|| true;
-            }
-        }, "实际散气开始时间不的早于熏蒸作业施药结束时间，可以等于！");
-
-        // 自定义验证:实际散气结束时间
-        $.validator.addMethod("sjsqjssj",function(value,element, params) {
-        	$scope.countSqts();
-            return this.optional(element)|| true;
-        }, "");
 
         // 返回.
         $scope.retList = function () {
@@ -265,12 +229,24 @@ angular.module('app.intelligent')
         };
 
         // 保存.
-        $scope.save = function () {
+        $scope.save = function (dataStatus) {
             if (!$scope.saveFlag) {
+            	if ($scope.fumigationProcess.totalUseDrugCount > $scope.fumigationProcess.lyhjzl || $scope.fumigationProcess.totalUseDrugCount > $scope.fumigation.jhyyl) {
+            		var flag = confirm("实际使用总量已超过领用合计总量或计划用药量，确定要提交吗？");
+                    if (!flag) {
+                        return;
+                    }
+            	}
                 if (validator.form()) {
                     // 设置saveFlag为true,防止重复提交.
                     $scope.saveFlag = true;
+                    $scope.fumigationProcess.dataStatus = dataStatus;
 
+                    $("input[name='createTime']").each(function(j,item){
+                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                            $scope.fumigationProcess.createTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                        }
+                    });
                     $("input[name='firstUseDrugTime']").each(function(j,item){
                         if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
                             $scope.fumigationProcess.firstUseDrugTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
@@ -488,13 +464,6 @@ angular.module('app.intelligent')
         $scope.loadAddDataById = function(id) {//新增
             fumigationPlanService.getFumigationPlanRecord(id).then(function(data){
                 $scope.fumigation = data.record;
-                $scope.hc_num = $scope.fumigation.zyhc.split("#");
-
-                //处理主要虫害的展示方式
-                for (var i = 0; i< $scope.hc_num.length; i++) {
-                    $scope.hc_num[i] = $rootScope.dicData[$scope.hc_num[i]];
-                }
-                $scope.zyhcs = $scope.hc_num.join("|"); //把数组用“,”隔开，以字符串的方式返回
 
                 $scope.fumigationAfter.fumigationId = id;
                 $scope.fumigationAfter.recordId = $scope.fumigation.id;
@@ -531,6 +500,13 @@ angular.module('app.intelligent')
             var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
             return this.optional(element)||(checkNumber.test(value));
         },"请输入正确的数字类型，最多两位小数！");
+        
+        // 自定义验证，验证正数数字
+        $.validator.addMethod("positiveNumber",function(value,element, params) {
+            //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+            var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
+            return this.optional(element)||(checkNumber.test(value));
+        },"请输入大于0的数字，最多两位小数！");
 
         // 自定义验证，验证数字
         $.validator.addMethod("validInteger",function(value,element, params) {
@@ -551,7 +527,7 @@ angular.module('app.intelligent')
                 return this.optional(element)|| true;
             }
         },"不能填写无，暂无,空等选项！");
-        
+
         // 自定义验证:实际残渣收集作业开始时间
         $.validator.addMethod("sjczsjzykssj",function(value,element, params) {
         	//实际残渣收集作业开始时间
@@ -565,18 +541,72 @@ angular.module('app.intelligent')
             }
         },"实际残残渣收集开始时间不得早于实际散气结束时间！");
 
+        $scope.countSqts = function() {
+        	var sqksrq = null;
+        	var sqjsrq = null;
+        	$("input[name='bulkStartTime']").each(function(j,item){
+                if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                	sqksrq = $filter('date')(item.value.substring(0,10), "yyyy-MM-dd");
+                	sqksrq = sqksrq.split('-');
+                }
+            });
+            $("input[name='bulkEndTime']").each(function(j,item){
+                if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                	sqjsrq = $filter('date')(item.value.substring(0,10), "yyyy-MM-dd");
+                	sqjsrq = sqjsrq.split('-');
+                }
+            });
+            if (null != sqksrq && "undefined" != sqksrq && sqjsrq != null && "undefined" != sqjsrq) {
+            	var sqksrq_int = new Date(sqksrq[0], sqksrq[1]-1, sqksrq[2]);
+            	var sqjsrq_int = new Date(sqjsrq[0], sqjsrq[1]-1, sqjsrq[2]);
+            	var day = parseInt(Math.abs(sqjsrq_int-sqksrq_int) / (1000 * 60 * 60 * 24));
+            	$scope.fumigationProcess.perforatedDays = day+1;
+            }
+        }
+
+        // 自定义验证:实际散气开始日期
+        $.validator.addMethod("sjsqkssj",function(value,element, params) {
+        	//实际施药结束时间
+        	var xzsyjssj = $filter('date')($scope.fumigation.fumigationEnd, "yyyy-MM-dd HH:mm:ss");
+        	//实际散气开始时间
+        	var sjsqkssj = $filter('date')(value, "yyyy-MM-dd HH:mm:ss");
+            if(sjsqkssj < xzsyjssj){
+                return this.optional(element)|| false;
+            }else{
+            	$scope.countSqts();
+                return this.optional(element)|| true;
+            }
+        }, "实际散气开始时间不的早于熏蒸作业施药结束时间，可以等于！");
+
+        // 自定义验证:实际散气结束时间
+        $.validator.addMethod("sjsqjssj",function(value,element, params) {
+        	$scope.countSqts();
+            return this.optional(element)|| true;
+        }, "");
+        
         // 返回.
         $scope.retList = function () {
             $rootScope.back();
         };
 
         // 保存.
-        $scope.save = function () {
+        $scope.save = function (datastatus) {
             if (!$scope.saveFlag) {
                 if (validator.form()) {
                     // 设置saveFlag为true,防止重复提交.
                     $scope.saveFlag = true;
 
+                    $scope.fumigationAfter.dataStatus = datastatus;
+                    $("input[name='bulkStartTime']").each(function(j,item){
+                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                            $scope.fumigationProcess.bulkStartTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                        }
+                    });
+                    $("input[name='bulkEndTime']").each(function(j,item){
+                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                            $scope.fumigationProcess.bulkEndTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                        }
+                    });
                     $("input[name='checkInsectCageTime']").each(function(j,item){
                         if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
                             $scope.fumigationAfter.checkInsectCageTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
@@ -597,7 +627,7 @@ angular.module('app.intelligent')
                     //$scope.fumigationAfter.recordId = $stateParams.homeWorkId;
                     $scope.fumigationAfter.createTime = $filter('date')($scope.fumigationAfter.createTime, "yyyy-MM-dd HH:mm:ss");
 
-                    homeWorkService.saveFumigationAfterDate($scope.fumigationAfter).then(function(data){
+                    homeWorkService.saveFumigationAfterDate($scope.fumigationAfter, $scope.fumigationProcess).then(function(data){
                         if(data.status == "success"){
                             alert("保存成功！");
                             $scope.retList();

src/main/resources/static/app/intelligent/fumigation/service/fumHomeWorkService.js

@@ -126,13 +126,14 @@ angular.module('app.intelligent').service("homeWorkService", function($http, $q,
     };
 
     // 新增/修改熏蒸善后数据
-    this.saveFumigationAfterDate = function (fumigationAfter) {
+    this.saveFumigationAfterDate = function (fumigationAfter, fumigationProcess) {
         var d = $q.defer();
         $http({
             method : 'POST',
             url : APP_CONFIG.depotStorageUrl + '/storage/fumigationAfter/saveFumigationAfterDate',
             params : {
-                fumigationAfter : fumigationAfter
+            	fumigationProcess : fumigationProcess,
+            	fumigationAfter : fumigationAfter
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkAfter-edit.html

@@ -90,8 +90,8 @@
                                                 <th>
                                                     <section>
                                                         <label class="input">
-                                                            <input class="form-control" type="text" ng-model="zyhcs"
-                                                                   ng-readonly="true" name="zyhcs">
+                                                            <input class="form-control" type="text" ng-model="fumigation.zyhc"
+                                                                   ng-readonly="true" name="zyhc">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -124,24 +124,34 @@
                                                     <label class="label" style="margin-top: 50%;text-align: center;">散气情况</label>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">实际散气开始时间</label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">熏蒸作业终止日期：(同散气起始日期)</label>
                                                 </th>
                                                 <th>
                                                     <section>
                                                         <label class="input">
-                                                            <input type="text" class="form-control" ng-model="fumigationProcess.bulkStartTime" name="bulkStartTime"
-                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="true">
+                                                            <input type="text" class="form-control" ng-model="fumigation.fumigationEnd" name="fumigationEnd" ng-disabled="true">
                                                         </label>
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">实际散气结束时间</label>
+                                                    <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>
                                                     <section>
                                                         <label class="input">
-                                                            <input type="text" class="form-control" ng-model="fumigationProcess.bulkEndTime" name="bulkEndTime"
-                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="true">
+                                                            <input type="text" class="form-control" ng-model="fumigationProcess.bulkStartTime" name="bulkStartTime" id="bulkStartTime"
+                                                                   onClick="WdatePicker({lang:'zh-cn', maxDate:'#F{$dp.$D(\'bulkEndTime\')}', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" sjsqkssj=true required>
+                                                        </label>
+                                                    </section>
+                                                </th>
+                                                <th>
+                                                    <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>
+                                                    <section>
+                                                        <label class="input">
+                                                            <input type="text" class="form-control" ng-model="fumigationProcess.bulkEndTime" name="bulkEndTime" id="bulkEndTime"
+                                                                   onClick="WdatePicker({lang:'zh-cn', minDate:'#F{$dp.$D(\'bulkStartTime\')}', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" sjsqjssj=true required>
                                                         </label>
                                                     </section>
                                                 </th>
@@ -152,10 +162,12 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedDays"
-                                                                   ng-readonly="true" name="perforatedDays" />
+                                                                   ng-readonly="true" name="perforatedDays" validInteger="true" required />
                                                         </label>
                                                     </section>
                                                 </th>
+                                            </tr>
+                                            <tr>
                                                 <th>
                                                     <label label class="label" style="margin-top: 9px;text-align: center;">密闭时间(天)</label>
                                                 </th>
@@ -163,12 +175,10 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.closedTime"
-                                                                   ng-readonly="true" name="closedTime">
+                                                                   ng-readonly="isNotEdit" name="closedTime" validInteger="true" />
                                                         </label>
                                                     </section>
                                                 </th>
-                                            </tr>
-                                            <tr>
                                                 <th>
                                                     <label label class="label" style="margin-top: 9px;text-align: center;">CT值</label>
                                                 </th>
@@ -176,7 +186,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.ctValue"
-                                                                   ng-readonly="true" name="ctValue">
+                                                                   ng-readonly="isNotEdit" name="ctValue" positiveNumber="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -187,7 +197,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedBefore"
-                                                                   ng-readonly="true" name="perforatedBefore" validNumber="true" />
+                                                                   ng-readonly="isNotEdit" name="perforatedBefore" positiveNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -198,10 +208,12 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedEnd"
-                                                                   ng-readonly="true" name="perforatedEnd" validNumber="true" />
+                                                                   ng-readonly="isNotEdit" name="perforatedEnd" positiveNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
+                                            </tr>
+                                            <tr>
                                                 <th>
                                                     <label label class="label" style="margin-top: 9px;text-align: center;">散气方法<span style="color: red;">*</span></label>
                                                 </th>
@@ -209,12 +221,10 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.bulkGasType"
-                                                                   ng-readonly="true" name="bulkGasType" />
+                                                                   ng-readonly="isNotEdit" name="bulkGasType" required />
                                                         </label>
                                                     </section>
                                                 </th>
-                                            </tr>
-                                            <tr>
                                                 <th>
                                                     <label label class="label" style="margin-top: 9px;text-align: center;">药剂残留率(ppm)</label>
                                                 </th>
@@ -222,7 +232,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.drugResidueRate"
-                                                                   ng-readonly="true" name="drugResidueRate" validNumber="true" />
+                                                                   ng-readonly="isNotEdit" name="drugResidueRate" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -233,7 +243,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedApprover"
-                                                                   ng-readonly="true" name="perforatedApprover" />
+                                                                   ng-readonly="isNotEdit" name="perforatedApprover" setState="true" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -244,12 +254,10 @@
 						                            <section>
 						                                <label class="input">
 						                                    <input class="form-control" type="text" ng-model="fumigationProcess.remark"
-						                                     ng-readonly="true" name="remark" />
+						                                     ng-readonly="isNotEdit" name="remark" />
 						                                </label>
 						                            </section>
 						                        </th>
-						                        <th></th>
-						                        <th></th>
                                             </tr>
                                         </table>
 
@@ -536,7 +544,8 @@
                                 </fieldset>
                                 <footer class="text-align-center" >
                                     <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
-                                    <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">保存</button>
+                                    <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save(0)">保存</button>
+                                    <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save(1)">提交</button>
                                 </footer>
                                 <div id="dtBox"></div><!-- 时间控件：有时分秒 -->
                             </form>

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkAfter-list.html

@@ -60,7 +60,7 @@
                                         <td style="text-align:center;">{{ dicData[afterPlan.drugname] }}</td>
                                         <td style="text-align:center;">{{ afterPlan.createtime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
-                                            <a href-void has-permission="609" ng-click="getAddAndEdit('edit',afterPlan.id, afterPlan.recordid)"><i class=""></i>修改</a>
+                                            <a href-void has-permission="609" ng-hide="afterPlan.datastatus=='1'" ng-click="getAddAndEdit('edit',afterPlan.id, afterPlan.recordid)"><i class=""></i>修改</a>
 <!--                                             <a href-void has-permission="610" ng-click="removeDetail(afterPlan.id,afterPlan.recordid)"><i class=""></i>删除</a> -->
                                             <a href-void ng-click="getAddAndEdit('detail',afterPlan.id)"><i class=""></i>详情</a>
                                         </td>

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-edit.html

@@ -30,7 +30,7 @@
                     <table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0" >
                       <!--第一个tr开始 -->
                       <tr>
-                        <th rowspan="3" width="10%">
+                        <th rowspan="5" width="10%">
                           <label class="label" style="margin-top: 50%; text-align: center">作业基本情况</label>
                         </th>
                         <th width="15%">
@@ -88,8 +88,8 @@
                         <th>
                           <section>
                             <label class="input">
-                              <input class="form-control" type="text" ng-model="fumigation.fumigationStart"
-                                ng-readonly="true" name="fumigationStart" required />
+                              <input class="form-control" type="text" ng-model="fumigation.sykssj"
+                                ng-readonly="true" name="sykssj" required />
                             </label>
                           </section>
                         </th>
@@ -99,13 +99,45 @@
                         <th>
                           <section>
                             <label class="input">
-                              <input class="form-control" type="text" ng-model="fumigation.fumigationEnd"
-                                ng-readonly="true" name="fumigationEnd" required />
+                              <input class="form-control" type="text" ng-model="fumigation.syjssj"
+                                ng-readonly="true" name="syjssj" required />
                             </label>
                           </section>
                         </th>
                       </tr>
                       <tr>
+                          <th>
+                              <label class="label" style="margin-top: 9px; text-align: center">粮食性质</label>
+                          </th>
+                          <th>
+                              <section>
+                                  <label class="input">
+                                      <input class="form-control" type="text" ng-model="dicData[fumigation.lyxz]" ng-disabled="true" name="lyxz" />
+                                  </label>
+                              </section>
+                          </th>
+                          <th>
+                              <label class="label" style="margin-top: 9px; text-align: center">主要虫害</label>
+                          </th>
+                          <th>
+                              <section>
+                                  <label class="input">
+                                      <input class="form-control" type="text" ng-model="fumigation.zyhc" ng-disabled="true" name="zyhc" />
+                                  </label>
+                              </section>
+                          </th>
+                          <th>
+                              <label class="label" style="margin-top: 9px; text-align: center">害虫密度（头/kg）</label>
+                          </th>
+                          <th>
+                              <section>
+                                  <label class="input">
+                                      <input class="form-control" type="text" ng-model="fumigation.ckmd" ng-disabled="true" name="ckmd" />
+                                  </label>
+                              </section>
+                          </th>
+                      </tr>
+                      <tr>
                         <th>
                           <label class="label" style="margin-top: 9px; text-align: center">熏蒸作业负责人</label>
                         </th>
@@ -119,48 +151,139 @@
                         <th>
                           <label class="label" style="margin-top: 9px; text-align: center">熏蒸作业人员</label>
                         </th>
-                        <th>
+                        <th colspan="3">
                           <section>
                             <label class="input">
                               <input class="form-control" type="text" ng-model="fumigationProcess.xzczry" ng-disabled="isNotEdit" name="xzczry" />
                             </label>
                           </section>
                         </th>
-                        <th></th>
-                        <th></th>
+                      </tr>
+                      <tr>
+                          <th>
+                              <label class="label" style="margin-top: 9px; text-align: center">创建人</label>
+                          </th>
+                          <th>
+                              <section>
+                                  <label class="input">
+                                      <input class="form-control" type="text" ng-model="fumigationProcess.cjr" ng-disabled="true" name="cjr" />
+                                  </label>
+                              </section>
+                          </th>
+                          <th>
+                              <label class="label" style="margin-top: 9px; text-align: center">创建时间</label>
+                          </th>
+                          <th>
+                              <section>
+                                  <label class="input">
+                                      <input type="text" class="form-control" ng-model="fumigationProcess.createTime" name="createTime"
+                                onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" required />
+                                  </label>
+                              </section>
+                          </th>
+                          <th></th>
+                          <th></th>
                       </tr>
                     </table>
                 </fieldset>
 
+				<header>
+                  <h3>
+                    <strong>熏蒸方式</strong>
+                  </h3>
+                </header>
+                <fieldset>
+                    <table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0" >
+                        <tr>
+                          <th rowspan="2" style="text-align: center"><label style="margin-top: 12%;text-align: center">熏蒸方式</label></th>
+                          <th><label style="text-align: center">常规熏蒸</label></th>
+                          <th><label style="text-align: center">环流熏蒸</label></th>
+                          <th><label style="text-align: center">环流熏蒸与内环流技术结合</label></th>
+                        </tr>
+                        <tr>
+                          <td style="text-align: center">
+                              <label class="select" style="text-align: left;" ng-if="fumigation.xzfs=='5245'">
+								  <select ng-model="fumigation.xzfsxl" ng-options="enum.enumid as enum.enumname for enum in dicDataList[5245]" ng-disabled="true">
+								  </select>
+							  </label>
+						  </td>
+                          <td style="text-align: center">
+                              <label class="select" style="text-align: left;" ng-if="fumigation.xzfs=='5246'" ng-disabled="true">
+								  <select ng-model="fumigation.xzfsxl" ng-options="enum.enumid as enum.enumname for enum in dicDataList[5246]">
+								  </select>
+							  </label>
+                          </td>
+                          <td style="text-align: center">
+                              <label class="select" style="text-align: left;" ng-if="fumigation.xzfs=='5248'" ng-disabled="true">
+								  <select ng-model="fumigation.xzfsxl" ng-options="enum.enumid as enum.enumname for enum in dicDataList[5248]">
+								  </select>
+							  </label>
+                          </td>
+                        </tr>
+                    </table>
+                </fieldset>
                 <header>
                   <h3>
-                    <strong>计划施药情况</strong>
+                    <strong>施药情况</strong>
                   </h3>
                 </header>
                 <fieldset>
                     <table class="table table-striped table-bordered table-hover">
-                      <thead>
                         <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">堆粮单位用药量(g/m3)</th>
-                          <th data-class="expand" style="text-align: center">空间单位用药量(g/m3)</th>
-                          <th data-class="expand" style="text-align: center">总用药量(kg)</th>
+                            <th><label class="label" style="text-align: center;">药剂领用申请编号</label></th>
+                            <th><label class="label" style="text-align: center;">{{fumigationProcess.yjlysqbh}}</label></th>
+                            <th><label class="label" style="text-align: center;">药剂名称</label></th>
+                            <th><label class="label" style="text-align: center;">{{dicData[fumigationProcess.yjmc]}}</label></th>
+                            <th><label class="label" style="text-align: center;">剂型</label></th>
+                            <th><label class="label" style="text-align: center;">{{dicData[fumigationProcess.jx]}}</label></th>
                         </tr>
-                      </thead>
-                      <tbody>
                         <tr>
-                          <td style="text-align: center">{{ dicData[fumigation.yjmc] }}</td>
-                          <td style="text-align: center">{{ dicData[fumigation.jx] }}</td>
-                          <td style="text-align: center">{{ fumigation.nd }}</td>
-                          <td style="text-align: center">{{ fumigation.syff }}</td>
-                          <td style="text-align: center">{{ fumigation.lddwyyl }}</td>
-                          <td style="text-align: center">{{ fumigation.kjdwyyl }}</td>
-                          <td style="text-align: center">{{ fumigation.zyyl }}</td>
+                            <th><label class="label" style="text-align: center;">领用合计总量</label></th>
+                            <th><label class="label" style="text-align: center;">{{fumigationProcess.lyhjzl}}</label></th>
+                            <th><label class="label" style="text-align: center;">计划用药量</label></th>
+                            <th><label class="label" style="text-align: center;">{{fumigation.jhyyl}}</label></th>
+                            <th><label class="label" style="text-align: center;">实际使用总量(kg)<apan style="color: red;">*</apan></label></th>
+                            <th>
+                                <label class="input" style="text-align: center;">
+                                    <input class="form-control" type="text" ng-model="fumigationProcess.totalUseDrugCount" ng-readonly="isNotEdit" name="totalUseDrugCount" required />
+                                </label>
+                            </th>
+                        </tr>
+                        <tr>
+                            <th><label class="label" style="text-align: center;">施药方式</label></th>
+                            <th>
+                                <label class="label" style="text-align: center;">
+                                    <div ng-switch="fumigation.syff">
+	                                    <div ng-switch-when="0">潮解法</div>
+	                                    <div ng-switch-when="1">仓外发生器</div>
+	                                    <div ng-switch-when="2">钢瓶气</div>
+	                                    <div ng-switch-default>{{fumigation.syff}}</div>
+	                                   </div>
+                                </label>
+                            </th>
+                            <th><label class="label" style="text-align: center;">堆量单位用药量(g/m³)<apan style="color: red;">*</apan></label></th>
+                            <th>
+                                <label class="label" style="text-align: center;">
+                                    <label class="input" style="text-align: center;">
+	                                    <input type="text" ng-model="fumigationProcess.heapMedication" name="heapMedication" ng-readonly="isNotEdit" required />
+	                                </label>
+                                </label>
+                            </th>
+                            <th><label class="label" style="text-align: center;">空间单位用药量(g/m3)<apan style="color: red;">*</apan></label></th>
+                            <th>
+                                <label class="input" style="text-align: center;">
+                                    <input type="text" ng-model="fumigationProcess.spaceMedication" name="spaceMedication" ng-readonly="isNotEdit" required />
+                                </label>
+                            </th>
+                        </tr>
+                        <tr>
+                            <th><label class="label" style="text-align: center;">浓度(%)<apan style="color: red;">*</apan></label></th>
+                            <th colspan="5">
+                                <label class="input" style="text-align: center;">
+                                    <input type="text" ng-model="fumigationProcess.concentration" name="concentration" ng-readonly="isNotEdit" required />
+                                </label>
+                            </th>
                         </tr>
-                      </tbody>
                     </table>
                 </fieldset>
 
@@ -983,8 +1106,8 @@
                         </th>
                       </tr>
                     </table>
-                    <table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0">
-                      <!-- 散气情况 -->
+                    <!-- <table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0">
+                      散气情况
                       <tr>
                         <th rowspan="3" width="10%">
                           <label class="label" style="margin-top: 50%; text-align: center" >散气情况</label>
@@ -1128,54 +1251,12 @@
                         <th></th>
                         <th></th>
                       </tr>
-
-                      <!-- 创建信息 -->
-                      <tr ng-hide="!isNotEdit">
-                        <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >创建信息</label
-                          >
-                        </th>
-                        <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >创建时间</label
-                          >
-                        </th>
-                        <th colspan="2">
-                          <section>
-                            <label label class="input" style="margin-top: 9px">
-                              {{ fumigationProcess.createTime | date:'yyyy-MM-dd
-                              HH:mm:ss' }}
-                            </label>
-                          </section>
-                        </th>
-                        <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >创建人</label
-                          >
-                        </th>
-                        <th colspan="2">
-                          <section>
-                            <label label class="input" style="margin-top: 9px">
-                              {{userInfoData[fumigationProcess.creater]}}
-                            </label>
-                          </section>
-                        </th>
-                      </tr>
-                  </table>
+                  </table> -->
                 </fieldset>
                 <footer class="text-align-center">
                   <button type="button" class="btn btn-default"ng-click="retList()">取消</button>
-                  <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">保存</button>
+                  <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save('0')">保存</button>
+                  <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save('1')">提交</button>
                 </footer>
                 <div id="dtBox"></div>
                 <!-- 时间控件：有时分秒 -->

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-list.html

@@ -62,7 +62,9 @@
                                         <td style="text-align:center;">{{ dicData[processPlan.drugname] }}</td>
                                         <td style="text-align:center;">{{ processPlan.createtime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
+                                            <span ng-show="processPlan.datastatus=='0'">
                                             <a ng-hide="isArchive" has-permission="605" href-void ng-click="getAddAndEdit('edit',processPlan.id, processPlan.recordid)"><i class=""></i>修改</a>
+                                            </span>
 <!--                                             <a ng-hide="isArchive" has-permission="606" href-void ng-click="removeDetail(processPlan.id,processPlan.fumigationId)"><i class=""></i>删除</a> -->
                                             <a href-void ng-click="getAddAndEdit('detail',processPlan.id, processPlan.recordid)"><i class=""></i>详情</a>
                                         </td>

src/main/resources/static/app/intelligent/fumigation/views/plan/forRecord-edit.html

@@ -24,452 +24,393 @@
 
 								<fieldset>
 									<table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
+										<header>
+										    <h5>熏蒸方案信息</h5>
+										</header>
 										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
 											<tr>
-												<th width='15%'>
-													<label class="label" style="margin-top: 9px;text-align: center;">申请日期</label>
+											    <th width='15%'>
+													<label class="label" style="text-align: center;">单位名称</label>
 												</th>
 												<th width='15%'>
-													<section >
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.createTime"
-																   ng-readonly="true">
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.dwmc}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">熏蒸方案制定人</label>
+													<label class="label" style="text-align: center;">单位负责人</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.xzfazd" name="xzfazd">
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.dwfzr}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">熏蒸方案起草人</label>
+													<label class="label" style="text-align: center;">联系电话</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.xzfaqcr" name="xzfaqcr">
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.dwlxdh}}</label>
 												</th>
 											</tr>
 											<tr>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">制定人联系电话</label>
+												<th width='15%'>
+													<label class="label" style="margin-top: 9px;text-align: center;">熏蒸作业地点</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.contactPhone" name="contactPhone">
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.xzzydd}}</label>
 												</th>
 												<th width='15%'>
-													<label class="label" style="margin-top: 9px;text-align: center;">熏蒸作业地点</label>
+													<label class="label" style="text-align: center;">熏蒸方案负责人</label>
 												</th>
 												<th width='15%'>
-													<section >
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.xzzydd" ng-readonly="true">
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.xzfafzr}}</label>
 												</th>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">熏蒸施药开始时间<span style="color: red;">*</span></label>
+												<th width='15%'>
+													<label class="label" style="text-align: center;">联系电话</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.fumigationStart" name="fumigationStart"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" validDrugTime=true>
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.fafzrlxdh}}</label>
 												</th>
 											</tr>
 											<tr>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">熏蒸施药结束时间<span style="color: red;">*</span></label>
+													<label class="label" style="text-align: center;">熏蒸方案起草人</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.fumigationEnd" name="fumigationEnd"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" validDrugTime=true>
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.xzfaqcr}}</label>
 												</th>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">预计散气开始时间<span style="color: red;">*</span></label>
+												<th width='15%'>
+													<label class="label" style="text-align: center;">起草人联系电话</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.gasStart" name="gasStart"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.qcrlxdh}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">预计散气结束时间<span style="color: red;">*</span></label>
+													<label class="label" style="text-align: center;">熏蒸作业开始日期<span style="color: red;">*</span></label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.gasEnd" name="gasEnd"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.fumigationStart}}</label>
 												</th>
+											</tr>
 											<tr>
-											    <th>
-													<label class="label" style="margin-top: 9px;text-align: center;">预计残渣收集开始时间<span style="color: red;">*</span></label>
+												<th>
+													<label class="label" style="text-align: center;">施药开始时间</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.residueStart" name="residueStart"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.sykssj}}</label>
 												</th>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">预计残收集结束时间<span style="color: red;">*</span></label>
+											    <th>
+													<label class="label" style="text-align: center;">施药结束时间</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.residueEnd" name="residueEnd"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.syjssj}}</label>
 												</th>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">常规熏蒸方式</label>
+												<th width='15%'>
+													<label class="label" style="text-align: center;">熏蒸作业终止日期：(同散气起始日期)</label>
 												</th>
 												<th width='15%'>
-													<section>
-														<label class="select">
-															<select ng-model="fumForRecord.cgxzfs" name="cgxzfs" ng-disabled="true">
-																<option value=""></option>
-																<option value="0">粮面潮解</option>
-																<option value="1">布袋埋藏</option>
-																<option value="2">探管</option>
-																<option value="3">综合施药</option>
-															</select><i></i>
-														</label>
-													</section>
+													<label class="label">{{fumForRecord.fumigationEnd}}</label>
 												</th>
+											</tr>
+										</table>
+										<header>
+										    <h5>熏蒸药剂信息</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
+											<thead>
 											<tr>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">环流熏蒸方式</label>
+												<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;">领取数量(kg)</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>
+											</tr>
+											</thead>
+											<tbody>
+											<tr>
+												<td style="text-align: center;">{{dicData[fumForRecord.yjmc]}}</td>
+												<td style="text-align: center;">{{fumForRecord.sccj}}</td>
+												<td style="text-align: center;">{{fumForRecord.scrq}}</td>
+												<td style="text-align: center;">{{fumForRecord.yxq}}</td>
+												<td style="text-align: center;">{{fumForRecord.lqsl}}</td>
+												<td style="text-align: center;">{{fumForRecord.yjlqr}}</td>
+												<td style="text-align: center;">{{fumForRecord.yjlqsj}}</td>
+												<td style="text-align: center;">{{fumForRecord.yjbz}}</td>
+											</tr>
+											</tbody>
+										</table>
+										<header>
+										    <h5>熏蒸 / 预熏蒸</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover" style="padding: 0;">
+										    <tr>
+										        <th>
+													<label class="label" style="text-align: center;">熏蒸对象</label>
+												</th>
+										    	<th>
+													<label class="label" style="text-align: center;">{{fumForRecord.cfmc}}</label>
+												</th>
+										        <th>
+													<label class="label" style="text-align: center;">熏蒸类型</label>
+												</th>
+										        <th>
+													<label class="label" style="text-align: center;">
+													    <div ng-switch="fumForRecord.xzlx">
+													        <div ng-switch-when="1">熏蒸</div>
+													        <div ng-switch-when="2">预熏蒸</div>
+													        <div ng-switch-when="3">空仓熏蒸</div>
+													        <div ng-switch-default>{{fumForRecord.syff}}</div>
+													    </div>
+													</label>
+												</th>
+										    </tr>
+										</table>
+										<table ng-show="fumForRecord.xzlx != '2'" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
+											<tr>
+												<th style="width: 16%;">
+													<label class="label" style="text-align: center;">仓型</label>
 												</th>
-												<th width='15%'>
-													<section>
-														<label class="select">
-															<select ng-model="fumForRecord.hlxzfs" name="hlxzfs" ng-disabled="true">
-																<option value=""></option>
-																<option value="0">固定式布置形式</option>
-																<option value="1">移动式布置形式</option>
-															</select><i></i>
-														</label>
-													</section>
+												<th style="width: 16%;">
+													<label class="label" style="text-align: center;">{{fumForRecord.cflx}}</label>
 												</th>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">环流熏蒸与内环流技术结合</label>
+												<th style="width: 16%;">
+													<label class="label" style="text-align: center;">粮食品种</label>
 												</th>
-												<th width='15%'>
-													<section>
-														<label class="select">
-															<select ng-model="fumForRecord.hlxzynhljsjh" name="hlxzynhljsjh" ng-disabled="true">
-																<option value=""></option>
-																<option value="0">分别使用_固定式</option>
-																<option value="1">分别使用_移动式</option>
-																<option value="2">二合一应用_单向控制</option>
-																<option value="3">二合一应用_双向控制</option>
-															</select><i></i>
-														</label>
-													</section>
+												<th style="width: 16%;">
+													<label class="label" style="text-align: center;">{{dicData[fumForRecord.lspz]}}</label>
 												</th>
-												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">害虫检测单号<span style="color: red;">*</span></label>
+												<th style="width: 16%;">
+													<label class="label" style="text-align: center;">粮油性质</label>
 												</th>
-												<th width='15%'>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.hcjcdh" ng-readonly="true">
-														</label>
-													</section>
+												<th style="width: 16%;">
+													<label class="label" style="text-align: center;">{{dicData[fumForRecord.lyxz]}}</label>
 												</th>
 											</tr>
-											<!--第一个tr结束 -->
-											<!--第二个tr开始 -->
-										</table>
-										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
 											<tr>
-												<th width='10%' rowspan="2">
-													<label class="label" style="margin-top: 15%;text-align: center;">熏蒸对象</label>
+												<th>
+													<label class="label" style="text-align: center;">粮食数量（吨）</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">仓房名称</label>
+													<label class="label" style="text-align: center;">{{fumForRecord.lssl}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">粮食品种</label>
+													<label class="label" style="text-align: center;">入库年月</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">数量(吨)</label>
+													<label class="label" style="text-align: center;">{{fumForRecord.rkrq}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">粮油性质</label>
+													<label class="label" style="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>
+													<label class="label" style="text-align: center;">{{fumForRecord.scnf}}</label>
 												</th>
 											</tr>
 											<tr>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.cfmc"
-																   ng-readonly="true" name="cfmc" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;">堆装方式</label>
 												</th>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="dicData[fumForRecord.lspz]"
-																   ng-readonly="true" name="lspz" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;">{{fumForRecord.dzfs}}</label>
 												</th>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.lssl"
-																   ng-readonly="true" name="lssl" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;">已熏蒸次数</label>
 												</th>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="dicData[fumForRecord.lyxz]"
-																   ng-readonly="true" name="lyxz" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;">{{fumForRecord.yxzcs}}</label>
 												</th>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="zyhcs" ng-readonly="true" name="zyhcs" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;">虫害检测单号</label>
 												</th>
-												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.ckmd"
-																   ng-readonly="true" name="ckmd" style="text-align: center;">
-														</label>
-													</section>
+												<th >
+													<label class="label" style="text-align: center;">{{fumForRecord.hcjcdh}}</label>
 												</th>
 											</tr>
-										</table>
-
-										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
 											<tr>
-												<th width='10%' rowspan="2">
-													<label class="label" style="margin-top: 15%;text-align: center;">药剂信息</label>
+												<th>
+													<label class="label" style="text-align: center;">害虫种类</label>
+												</th>
+												<th>
+													<label class="label" style="text-align: center;">{{fumForRecord.zyhc}}</label>
+												</th>
+												<th>
+													<label class="label" style="text-align: center;">发现时间</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">药剂名称</label>
+													<label class="label" style="text-align: center;">{{fumForRecord.hcfxsj}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">剂型</label>
+													<label class="label" style="text-align: center;">虫害密度(头/kg)</label>
+												</th>
+												<th >
+													<label class="label" style="text-align: center;">{{fumForRecord.ckmd}}</label>
 												</th>
+											</tr>
+											<tr>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">领取数量(kg)</label>
+													<label class="label" style="text-align: center;">发生部位</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">浓度</label>
+													<label class="label" style="text-align: center;">{{fumForRecord.fsbw}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">堆粮单位用药量(g/m3)</label>
+													<label class="label" style="text-align: center;">计划用药量(kg)</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">空间单位用药量(g/m3)</label>
+													<label class="label" style="text-align: center;">{{fumForRecord.jhyyl}}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">总用药量(kg)</label>
+													<label class="label" style="text-align: center;">施药方式</label>
 												</th>
-												<th style="width: 9%;">
-													<label class="label" style="margin-top: 9px;text-align: center;">施药方式</label>
+												<th >
+													<label class="label" style="text-align: center;">
+													    <div ng-switch="fumForRecord.syff">
+						                                    <div ng-switch-when="0">潮解法</div>
+						                                    <div ng-switch-when="1">仓外发生器</div>
+						                                    <div ng-switch-when="2">钢瓶气</div>
+						                                    <div ng-switch-default>{{fumForRecord.syff}}</div>
+					                                    </div>
+													</label>
 												</th>
 											</tr>
 											<tr>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="dicData[fumForRecord.yjmc]"
-																   ng-readonly="true" name="yjmc" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;margin-top: 4%;">熏蒸方式</label>
 												</th>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="dicData[fumForRecord.jx]"
-																   ng-readonly="true" name="reagentType" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;margin-top: 4%;">{{dicData[fumForRecord.xzfs]}}</label>
 												</th>
-												<th>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.lqsl" name="lqsl"
-																   style="text-align: center;" ng-disabled="isNotSave" required />
-														</label>
-													</section>
+												<th colspan="4">
+													<label class="select" style="text-align: left;">
+													    <select ng-model="fumForRecord.xzfsxl" ng-options="enum.enumid as enum.enumname for enum in dicDataList[fumForRecord.xzfs]">
+													    
+													    </select>
+													</label>
 												</th>
-												<th>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.nd" name="nd"
-																   style="text-align: center;" ng-disabled="isNotSave" required />
-														</label>
-													</section>
+											</tr>
+										</table>
+										<table ng-show="fumForRecord.xzlx=='2'" class="table table-striped table-bordered table-hover" style="padding: 0;">
+										    <tr>
+										        <th>
+													<label class="label" style="text-align: center;">计划用药量(kg)</label>
 												</th>
-												<th>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.lddwyyl" name="lddwyyl"
-																   style="text-align: center;" ng-disabled="isNotSave" required>
-														</label>
-													</section>
+										    	<th>
+													<label class="label">{{fumForRecord.jhyyl}}</label>
 												</th>
-												<th>
-													<section>
-														<label class="input">
-															<input type="text" ng-model="fumForRecord.kjdwyyl" name="kjdwyyl"
-																   style="text-align: center;" ng-disabled="isNotSave" required>
-														</label>
-													</section>
+										        <th>
+													<label class="label" style="text-align: center;">施药方式</label>
+												</th>
+										        <th>
+													<label class="label" style="text-align: center;">
+													    <div ng-switch="fumForRecord.syff">
+						                                    <div ng-switch-when="0">潮解法</div>
+						                                    <div ng-switch-when="1">仓外发生器</div>
+						                                    <div ng-switch-when="2">钢瓶气</div>
+						                                    <div ng-switch-default>{{fumForRecord.syff}}</div>
+					                                    </div>
+													</label>
 												</th>
+										    </tr>
+										    <tr>
 												<th>
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.zyyl"
-																   ng-readonly="true" name="zyyl" style="text-align: center;">
-														</label>
-													</section>
+													<label class="label" style="text-align: center;margin-top: 2%;">熏蒸方式</label>
 												</th>
 												<th>
-													<section>
-														<label class="select">
-															<select ng-model="fumForRecord.syff" name="syff" ng-disabled="true">
-																<option value="">--请选择--</option>
-																<option value="0">潮解法</option>
-																<option value="1">仓外发生器</option>
-																<option value="2">钢瓶气</option>
-															</select><i></i>
-														</label>
-													</section>
+													<label class="label" style="text-align: center;margin-top: 2%;">{{dicData[fumForRecord.xzfs]}}</label>
+												</th>
+												<th colspan="4">
+													<label class="select" style="text-align: center;">
+													    <select ng-model="fumForRecord.xzfsxl" ng-options="enum.enumid as enum.enumname for enum in dicDataList[fumForRecord.xzfs]">
+													    
+													    </select>
+													</label>
 												</th>
 											</tr>
 										</table>
-									</table>
-								</fieldset>
-
-								<header >
-									<h3>
-										<strong>熏蒸施药人员</strong>
-									</h3>
-								</header>
-								<fieldset >
-									<table class="table table-striped table-bordered table-hover"  >
-										<thead>
-										<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>
-										</tr>
-										</thead>
-
-										<tbody>
-										<tr ng-repeat="record in addedDetail">
-											<td style="text-align:center;"><input type="text" ng-disabled="isNotSave" name="personnelName" ng-model="record.personnelName" required/></td>
-											<td style="text-align:center;"><input type="text" ng-disabled="isNotSave" name="professionalQualification" ng-model="record.professionalQualification"/></td>
-											<td style="text-align:center;"><input type="text" ng-disabled="isNotSave" name="physicalCondition" ng-model="record.physicalCondition"/></td>
-											<td style="text-align:center;"><input type="text" ng-disabled="isNotSave" name="workTask" ng-model="record.workTask"/></td>
-											<td style="text-align:center;"><input type="text" ng-disabled="isNotSave" name="outside" ng-model="record.outside"/></td>
-										</tr>
-										</tbody>
-									</table>
-								</fieldset>
-
-								<fieldset>
-									<table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
-										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
-											<tr>
-												<th width='10%'>
-													<label class="label" style="margin-top: 15px;text-align: center;">申请企业意见<span style="color: red;">*</span></label>
-												</th>
-												<th colspan="5">
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumForRecord.enterpriseOpinion" name="enterpriseOpinion" required>
-														</label>
-													</section>
+										<header>
+										    <h5>其他信息</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover" style="padding: 0;">
+										    <tr>
+										        <th style="width: 14%;">
+													<label class="label" style="text-align: center;">警戒距离</label>
+												</th>
+										    	<th colspan="6">
+													<label class="label">
+														东： {{fumForRecord.east}}   m     /      南： {{fumForRecord.south}} m    /     西：{{fumForRecord.west}}  m     /     北：{{fumForRecord.north}}  m
+													</label>
+												</th>
+										    </tr>
+										    <tr>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">空气呼吸器信息</label>
+												</th>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">使用套数</label>
+												</th>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">
+													    {{fumForRecord.kqhxqsyts}}
+													</label>
+												</th>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">品牌型号</label>
+												</th>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">
+													    {{fumForRecord.kqhxqppxh}}
+													</label>
+												</th>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">校验日期</label>
+												</th>
+												<th style="width: 14%;">
+													<label class="label" style="text-align: center;">
+													    {{fumForRecord.kqhxqjyrq}}
+													</label>
 												</th>
 											</tr>
-											<tr ng-show="isShow">
-												<th width='10%'>
-													<label class="label" style="margin-top: 15px;text-align: center;">备案机关意见</label>
+											<tr>
+										        <th style="width: 14%;">
+													<label class="label" style="text-align: center;">包装物及药剂残渣处理说明</label>
 												</th>
-												<th colspan="5">
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-readonly="true" ng-model="fumForRecord.organsOpinion" name="organsOpinion">
-														</label>
-													</section>
+										    	<th colspan="6">
+													<label class="label">{{fumForRecord.bzwjyjczclsm}}</label>
 												</th>
+										    </tr>
+										</table>
+										<header>
+										    <h5>熏蒸作业人员信息</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover"  >
+											<thead>
+											<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;">是否经专业培训</th>
+												<th data-class="expand" style="text-align:center;">是否为外请</th>
 											</tr>
-											<tr ng-show="isShow">
-												<th width='10%'>
-													<label class="label" style="margin-top: 15px;text-align: center;">审批人</label>
-												</th>
-												<th colspan="2">
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-readonly="true" ng-model="fumForRecord.outPerson" name="outPerson">
-														</label>
-													</section>
-												</th>
-												<th width='10%'>
-													<label class="label" style="margin-top: 15px;text-align: center;">审批时间</label>
-												</th>
-												<th colspan="2">
-													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-readonly="true" ng-model="fumForRecord.outForrecordTime" name="outForrecordTime">
-														</label>
-													</section>
-												</th>
+											</thead>
+	
+											<tbody>
+											<tr ng-repeat="record in addedDetail">
+												<td style="text-align:center;">{{record.rylx}}</td>
+												<td style="text-align:center;">{{record.personnelName}}</td>
+												<td style="text-align:center;">{{record.zw}}</td>
+												<td style="text-align:center;">{{record.professionalQualification}}</td>
+												<td style="text-align:center;">{{record.workTask}}</td>
+												<td style="text-align:center;">{{record.physicalCondition}}</td>
+												<td style="text-align:center;">{{record.sfjzypx}}</td>
+												<td style="text-align:center;">{{record.outside}}</td>
 											</tr>
-											<!--第一个tr结束 -->
+											</tbody>
 										</table>
 									</table>
 								</fieldset>
+
 								<footer class="text-align-center" >
 									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
 									<button type="button" class="btn btn-primary" ng-hide="isNotSave" ng-click="save('getSubmit')">提交</button>

src/main/resources/static/app/intelligent/fumigation/views/plan/forRecord-list.html

@@ -64,23 +64,10 @@
                                         <td style="text-align:center;">{{ forRecordApprove.xzzydh }}</td>
                                         <td style="text-align:center;">{{ forRecordApprove.createTime | date:'yyyy-MM-dd'}}</td>
                                         <td style="text-align:center;">{{ forRecordApprove.cfmc }}</td>
-                                        <td style="text-align:center;">{{ forRecordApprove.fumigationStart | date:'yyyy-MM-dd'}}</td>
-                                        <td style="text-align:center;">{{ forRecordApprove.fumigationEnd | date:'yyyy-MM-dd'}}</td>
+                                        <td style="text-align:center;">{{ forRecordApprove.sykssj}}</td>
+                                        <td style="text-align:center;">{{ forRecordApprove.syjssj}}</td>
                                         </td>
                                         <td style="text-align:center;">
-<!--                                            <span ng-if="forRecordApprove.stateType=='6'">-->
-<!--                                                <a has-permission="597" href-void ng-click="getAddAndEdit('detail',forRecordApprove.id)"><i class=""></i>查看</a>-->
-<!--                                                <a has-permission="597" href-void ng-click="getAddAndEdit('edit',forRecordApprove.id)"><i class=""></i>修改</a>-->
-<!--                                                <a has-permission="598" href-void ng-click="removeDetail(forRecordApprove.planIds,forRecordApprove.id)"><i class=""></i>删除</a>-->
-<!--                                                <a  href-void ng-click="getSubmit(forRecordApprove.planIds,forRecordApprove.id)">-->
-<!--                                                    <i class="fa fa-pencil-square"></i>备案-->
-<!--                                                </a>-->
-<!--                                            </span>-->
-<!--                                            <span ng-if="forRecordApprove.stateType=='7'">-->
-<!--                                                <a  href-void ng-click="getAddAndEdit('isEdit',forRecordApprove.id)">-->
-<!--                                                    <i class="fa fa-pencil-square"></i>备案中-->
-<!--                                                </a>-->
-<!--                                            </span>-->
                                             <span ng-if="!(forRecordApprove.stateType=='7' || forRecordApprove.stateType=='6')">
                                                 <a href-void ng-click="getAddAndEdit('details',forRecordApprove.id)">
                                                    <i class="fa fa-info-circle"></i>备案详情

src/main/resources/static/app/intelligent/fumigation/views/plan/pesticide-list-modal.html

@@ -14,6 +14,7 @@
                    <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>
@@ -26,16 +27,14 @@
                           <td style="text-align:center;">{{ plan.xzzydh }}</td>
                           <td style="text-align:center;">{{ storehouseObj[plan.houseId].storehouseName }}</td>
                           <td style="text-align:center;">
-                              <span ng-if="plan.cgxzfs != ''">
-                                  常规熏蒸
-                              </span>
-                              <span ng-if="plan.hlxzfs != ''">
-                                  环流熏蒸
-                              </span>
-                              <span ng-if="plan.hlxzynhljsjh != ''">
-                                  环流熏蒸与内环流技术结合
-                              </span>
+                              <div ng-switch="plan.xzlx">
+							       <div ng-switch-when="1">熏蒸</div>
+							       <div ng-switch-when="2">预熏蒸</div>
+							       <div ng-switch-when="3">空仓熏蒸</div>
+							       <div ng-switch-default>{{plan.xzlx}}</div>
+							  </div>
                           </td>
+                          <td style="text-align:center;">{{ dicData[plan.xzfs] }}</td>
                           <td style="text-align:center;">{{ plan.xzfazd  }}</td>
                           <td style="text-align:center;">{{ plan.createTime | date:'yyyy-MM-dd'}}</td>
                           <td>

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

@@ -25,7 +25,7 @@ angular.module('app.intelligent').controller("humitureDetectionCtrl", function (
     $scope.loadData();
 
     // 详情(层温)
-    $scope.grainDetectionDetail = function (humitureDetection) {
+    $scope.grainDetectionDetail = function (humitureDetection, zsfs) {
         var params = [];
         params.vCfCode = humitureDetection.storehouse; // 仓房编码
         params.time = humitureDetection.time; // 检测时间
@@ -37,10 +37,49 @@ angular.module('app.intelligent').controller("humitureDetectionCtrl", function (
         params.min = humitureDetection.min; // 最低粮温
         params.avg = humitureDetection.avg; // 平均粮温
         params.id = humitureDetection.id;
+        params.zsfs = zsfs;
+        /*if (zsfs == "1") {
+        	$uibModal.open({
+                size: 'lg',
+                templateUrl: 'app/intelligent/grainDetection/views/humitureDetection-model2.html',
+                controller: 'humitureDetectionModel2',
+                resolve: {
+                    // 传入参数
+                    items: function () {
+                        // 这个值会被模态框的控制器获取到
+                        return params;
+                    }
+                }
+
+            });
+        } else {
+        	$uibModal.open({
+                size: 'lg',
+                templateUrl: 'app/intelligent/grainDetection/views/humitureDetection-model.html',
+                controller: 'humitureDetectionModel',
+                resolve: {
+                    // 传入参数
+                    items: function () {
+                        // 这个值会被模态框的控制器获取到
+                        return params;
+                    }
+                }
+
+            });
+        }*/
+        var pageurl;
+        var ctrlurl;
+        if (zsfs == '1') {
+        	pageurl = 'app/intelligent/grainDetection/views/humitureDetection-model2.html';
+        	ctrlurl = 'humitureDetectionModel2';
+        } else {
+        	pageurl = 'app/intelligent/grainDetection/views/humitureDetection-model.html';
+        	ctrlurl = 'humitureDetectionModel';
+        }
         $uibModal.open({
             size: 'lg',
-            templateUrl: 'app/intelligent/grainDetection/views/humitureDetection-model.html',
-            controller: 'humitureDetectionModel',
+            templateUrl: pageurl,
+            controller: ctrlurl,
             resolve: {
                 // 传入参数
                 items: function () {
@@ -50,9 +89,7 @@ angular.module('app.intelligent').controller("humitureDetectionCtrl", function (
             }
 
         });
-
-
-    };
+    }
 
     // 所有仓检测
     $scope.allStoreGrainTemperatureDetection = function () {

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

@@ -61,7 +61,8 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
             data: {
                 vDatatime: items.time == undefined ? "" : items.time,
                 vCfCode: items.vCfCode == undefined ? "" : items.vCfCode,
-                lqId: items.id
+                lqId: items.id,
+                zsfs: items.zsfs
             },
             success: function (data) {
                 td_type_5 = Object.keys(data.data[0]).length; // 温度表格单行温度值的数量
@@ -166,7 +167,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
     // 点温
     $scope.pointTemp = function () {
         // 点温表格
-        temperatureRecordService.findByTempTable(items.id).then(function (data) {
+        temperatureRecordService.findByTempTable(items.id, items.zsfs).then(function (data) {
             var detailList = data.data;
             var trNum = 0;
             /**

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

@@ -0,0 +1,511 @@
+"use strict";
+angular.module('app.intelligent').controller("humitureDetectionModel2", function ($scope, $state, $rootScope, $uibModalInstance, items, temperatureRecordService, $filter, $uibModal, keeperService, APP_CONFIG, $timeout, Word, Excel) {
+
+    $scope.orgId = $rootScope.depotInfo.orgId;
+    $scope.id = items.id;
+    $scope.vCfCode = items.vCfCode; // 仓房编码
+    $scope.time = items.time; // 检测时间
+    $scope.intemp = items.intemp; // 仓内温
+    $scope.inh = items.inh; // 仓内湿
+    $scope.outtemp = items.outtemp; // 仓外温
+    $scope.outh = items.outh; // 仓外湿
+    $scope.max = items.max; // 最高粮温
+    $scope.min = items.min; // 最低粮温
+    $scope.avg = items.avg; // 平均粮温 'yyyy-MM-dd HH:mm:ss'
+    $scope.tableTime = $filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss'); // 制表时间
+
+    // 合并列计算
+    $scope.calculateMethod = function () {
+        /**
+         * 1.静态-定长
+         *  仓名-平均温: td_type_1=8
+         *  处理意见和备注: td_type_2=4
+         *  检验员: td_type_3=6
+         * 2.动态-变长
+         *  层均温: td_type_4=N*2
+         *  层温表格: td_type_5=N
+         */
+        var td_type_1 = 8;
+        var td_type_2 = 4;
+        var td_type_3 = 6;
+        var td_type_4 = 1;// 层数
+        $scope.td_type_4_true = false;
+        var td_type_5 = 1;//温度表格单行温度值的数量
+        // 放行标志
+        $scope.td_type_5_avg_true = false;
+        $scope.td_type_5_avg_p_true = false;
+        var td_type_5_d = 0;// 温度表格行数总大小
+        // 每条测温数据对应的各层最高温、最低温、平均温
+        $.ajax({
+            type: "GET",
+            dataType: "json",
+            // async:true;   //异步
+            async: false,  //同步
+            url: APP_CONFIG.intelligentUrl + '/intelligents/temperatureRecord/findByHouseAndTime',
+            data: {
+                vDatatime: items.time == undefined ? "" : items.time,
+                vCfCode: items.vCfCode == undefined ? "" : items.vCfCode,
+                lqId: items.id
+            },
+            success: function (data) {
+                td_type_4 = data.data.length * 2; // 层数
+            }
+        });
+        // 行/列
+        $.ajax({
+            type: "GET",
+            dataType: "json",
+            // async:true;   //异步
+            async: false,  //同步
+            url: APP_CONFIG.intelligentUrl + '/intelligents/temperatureRecord/findByHouseAndTimes',
+            data: {
+                vDatatime: items.time == undefined ? "" : items.time,
+                vCfCode: items.vCfCode == undefined ? "" : items.vCfCode,
+                lqId: items.id,
+                zsfs: items.zsfs
+            },
+            success: function (data) {
+                td_type_5 = Object.keys(data.data[0]).length; // 温度表格单行温度值的数量
+                td_type_5_d = data.data.length; // 温度表格行数总大小
+            }
+        });
+        // 获取最长列(td)
+        var max = Math.max(td_type_1, td_type_2, td_type_3, td_type_4, td_type_5);
+        // 计算合并列
+        if (max > td_type_1) {
+            // +2 分配给两个td
+            $scope.td_type_1 = (max - td_type_1) + 2;
+        }
+        if (max > td_type_2) {
+            $scope.td_type_2 = (max - td_type_2) + 2;
+        }
+        if (max > td_type_3) {
+            // +3 分配给3个td
+            $scope.td_type_3 = (max - td_type_3) + 3;
+        }
+        if (max > td_type_4) {
+            $scope.td_type_4 = max - td_type_4;
+            $scope.td_type_4_true = true;
+        }
+        // 温度表格合并计算
+        $scope.td_type_5_avg = 1;
+        $scope.td_type_5_avg_p = 1;
+        if (max > td_type_5) {
+            // 温度表格平均分配到层以外的其他列(td)
+            var td_type_5_t = max - td_type_5; // 获取比最大小几
+            // 判断是否可以每人得到一个
+            var td_type_5_r = td_type_5_t % td_type_5; // 取余
+            if (td_type_5_t > td_type_5) { // 没人大于一个就分
+                if (td_type_5_r == 0) { // 整除
+                    $scope.td_type_5_avg = td_type_5_t / td_type_5 + 1; // 平均分,加1把自己算上
+                    // 放行标志
+                    $scope.td_type_5_avg_true = true;
+                } else { // 不能整除
+                    var td_type_5_d = td_type_5_t - td_type_5_r; // 减掉多余
+                    $scope.td_type_5_avg = td_type_5_d / (td_type_5 - 1) + 1; // 减掉多余的在平均分(平均-1),少分一份
+                    $scope.td_type_5_avg_p = $scope.td_type_5_avg + td_type_5_r + 1; // 余数给一个人加上plus
+                    // 放行标志
+                    $scope.td_type_5_avg_true = true;
+                    $scope.td_type_5_avg_p_true = true;
+                }
+            } else { // 不够分,直接plus
+                $scope.td_type_5_avg_p = td_type_5_r + 1; // 加的1为自己
+                // 放行标志
+                $scope.td_type_5_avg_p_true = true;
+            }
+        }
+        /**
+         * 检测员,保管员,主管科长
+         * @type {number}
+         */
+        // 声明合并变量
+        var td_type_3_t = $scope.td_type_3 % 3; // 计算临时变量,并获取余数
+        var td_type_3_s = 1; // 将余数分配,主管科长
+        var td_type_3_avg = 1; // 可平均分配变量
+        var td_type_3_r = 1; // 去除余数,可平均分配值变量
+        if (td_type_3_t == 0) { // 可平均分配
+            var avg_avg_avg = $scope.td_type_3 / 3;
+            $scope.td_type_avg_1 = avg_avg_avg; // 检测员
+            $scope.td_type_avg_2 = avg_avg_avg; // 保管员
+            $scope.td_type_avg_3 = avg_avg_avg; // 主管科长
+        } else { // 不可平均分配
+            td_type_3_r = $scope.td_type_3 - td_type_3_t; // 获取可平均分配值
+            td_type_3_avg = td_type_3_r / 3; // 检测员,保管员可平均分配值
+            td_type_3_s = td_type_3_avg + td_type_3_t;// 主管科长(余数+平均)
+
+            $scope.td_type_avg_1 = td_type_3_avg; // 检测员可平均分配值
+            $scope.td_type_avg_2 = td_type_3_avg; // 保管员可平均分配值
+            $scope.td_type_avg_3 = td_type_3_s; // 主管科长(余数+平均)
+        }
+    };
+
+    // 动态表格
+    $scope.layersAvgTemp = function () {
+        // 层均温动态表格
+        temperatureRecordService.findByHouseAndTime(items.vCfCode, items.time, items.id).then(function (data) {
+            var dataLayerList = data.data;
+            //根据返回数据算出层均温这行单元格的个数
+            var eachTdWidth = 100 / (dataLayerList.length * 2) + '%';
+            if (dataLayerList != null && dataLayerList.length > 0) {
+                // for (var layer in dataLayerList) {
+                var layernumber = 1;
+                for (var i = 0; i < dataLayerList.length; i++) {
+                    // var layernumber = dataLayerList[layer].layernumber;
+                    var lavg = dataLayerList[i].lavg;
+                    $("#layersAvgTemp").eq(0).append(
+                        "<td style=\"text-align: center;width:" + eachTdWidth + "\">"
+                        + layernumber + '层均温' + "</td>" +
+                        "<td style=\"text-align: center;width:" + eachTdWidth + "\">"
+                        + lavg + "</td>"
+                    );
+                    layernumber++;
+                }
+            }
+        });
+    };
+
+    // 点温
+    $scope.pointTemp = function () {
+        // 点温表格
+        temperatureRecordService.findByHouseAndTimes(null, null, items.id, items.zsfs).then(function (data) {
+            var detailList = data.data;
+            var trNum = 0;
+            /**
+             *  $scope.td_type_5_avg_true = true;
+             $scope.td_type_5_avg_p_true = true;
+             $scope.td_type_5_avg $scope.td_type_5_avg_p
+             */
+            // 高低温报警
+//            var tallTemp = $rootScope.warningValueList[$scope.vCfCode] == undefined
+//                ? 100 : $rootScope.warningValueList[$scope.vCfCode].high == undefined
+//                    ? 100 : $rootScope.warningValueList[$scope.vCfCode].high; // 一般不超过3000℃
+//            var lowTemp = $rootScope.warningValueList[$scope.vCfCode] == undefined
+//                ? -274 : $rootScope.warningValueList[$scope.vCfCode].low == undefined
+//                    ? -274 : $rootScope.warningValueList[$scope.vCfCode].low; // 绝对0度为-273.15℃
+
+            var key_z = 1;
+            // 天津库要求1层为最底层最大层数.
+            for (var i = 0; i < detailList.length; i++) {
+            	var le = detailList[i];
+            	$("#t_body").append("<tr></tr>");
+            	for (var j = 0; j < le.length; j++) {
+            		$("#t_body tr").eq(i).append(
+                            "<td style=\"border: 1px solid #000;text-align: center;\">"
+                            + le[j] + "</td>"
+                        );
+            	}
+            }
+            
+        });
+    };
+
+    $scope.shallowCircularPointTemp = function () {
+        // 浅圆仓点温表格
+        temperatureRecordService.shallowCircularPointTempTable(items.id).then(function (data) {
+            /**
+             * 浅圆仓数据,x不用值永远为 1.
+             * detailList (xyz)
+             *  第一级 为 1-n 层(层号 z)
+             *  y 为 列
+             */
+            var detailMap = data.data;
+            var xIny = 12; // 每行多少列
+            var trNum = 0; // td位置初始化
+            var gs = 1; // 初始化每层数据量
+
+            var layerNumber = Object.keys(detailMap).length; // z层数
+
+            var yNumber = detailMap[1].length; // 单层大小(y列数)
+
+            // 计算分几列
+            var groups = Math.ceil(yNumber / xIny); // 向正无穷取整
+
+            var gs1 = 0; // 初始化每层数据数据
+
+            /**
+             * 计算合并
+             *  已确定初始化 每行 xIny=12列
+             */
+            var td_type_1 = 8; // 仓房名称 定长
+            var td_type_2 = 4; // 处理意见 定长
+            var td_type_3 = 6; // 检测员 定长
+            // 行 xIny = 12 需要加层号行+1
+            var xInyP = xIny + 1;
+            // 层均温 变长 为 layerNumber z层和参数位 需 *2
+            var layerNumberV = layerNumber * 2;
+            if (layerNumberV > xInyP) {
+                $scope.td_type_1 = (layerNumberV - td_type_1) + 2;
+                $scope.td_type_2 = (layerNumberV - td_type_2) + 2;
+                $scope.td_type_3 = (layerNumberV - td_type_3) + 3;
+                $scope.td_type_5_avg = layerNumberV - xIny;
+            } else {
+                $scope.td_type_1 = (xInyP - td_type_1) + 2;
+                $scope.td_type_2 = (xInyP - td_type_2) + 2;
+                $scope.td_type_3 = (xInyP - td_type_3) + 3;
+                $scope.td_type_5_avg = xIny - layerNumberV;
+            }
+            /**
+             * 检测员,保管员,主管科长
+             * @type {number}
+             */
+            // 声明合并变量
+            var td_type_3_t = $scope.td_type_3 % 3; // 计算临时变量,并获取余数
+            var td_type_3_s = 1; // 将余数分配,主管科长
+            var td_type_3_avg = 1; // 可平均分配变量
+            var td_type_3_r = 1; // 去除余数,可平均分配值变量
+            if (td_type_3_t == 0) { // 可平均分配
+                var avg_avg_avg = $scope.td_type_3 / 3;
+                $scope.td_type_avg_1 = avg_avg_avg; // 检测员
+                $scope.td_type_avg_2 = avg_avg_avg; // 保管员
+                $scope.td_type_avg_3 = avg_avg_avg; // 主管科长
+            } else { // 不可平均分配
+                td_type_3_r = $scope.td_type_3 - td_type_3_t; // 获取可平均分配值
+                td_type_3_avg = td_type_3_r / 3; // 检测员,保管员可平均分配值
+                td_type_3_s = td_type_3_avg + td_type_3_t;// 主管科长(余数+平均)
+
+                $scope.td_type_avg_1 = td_type_3_avg; // 检测员可平均分配值
+                $scope.td_type_avg_2 = td_type_3_avg; // 保管员可平均分配值
+                $scope.td_type_avg_3 = td_type_3_s; // 主管科长(余数+平均)
+            }
+            /**
+             *  $scope.td_type_5_avg_true = true;
+             $scope.td_type_5_avg_p_true = true;
+             $scope.td_type_5_avg $scope.td_type_5_avg_p
+             */
+            // 高低温报警
+            var tallTemp = $rootScope.warningValueList[$scope.vCfCode] == undefined
+                ? 100 : $rootScope.warningValueList[$scope.vCfCode].high == undefined
+                    ? 100 : $rootScope.warningValueList[$scope.vCfCode].high; // 一般不超过3000℃
+            var lowTemp = $rootScope.warningValueList[$scope.vCfCode] == undefined
+                ? -274 : $rootScope.warningValueList[$scope.vCfCode].low == undefined
+                    ? -274 : $rootScope.warningValueList[$scope.vCfCode].low; // 绝对0度为-273.15℃
+
+            // 先把tr初始化多个,已存在2个(groups向上取整*层数+groups向上取整-html初始化的2个)
+            var trMath = groups * layerNumber + groups - 2;
+            for (var a = 0; a < trMath; a++) {
+                $("#t_body").append("<tr></tr>");
+            }
+
+            // 放入层号字样
+            for (var i = 0; i < groups; i++) { // 分多批显示
+                $("#t_body tr").eq(trNum).append(
+                    "<td colspan='" + $scope.td_type_5_avg + "' style=\"border: 1px solid #000;text-align: center;width:5%;\">"
+                    + '层号' + "</td>"
+                );
+
+                // 每列显示12条
+                for (var z = 0; z < xIny; z++) {
+                    if (gs <= yNumber) { // 每层数据个数分散添加
+                        $("#t_body tr").eq(trNum).append(
+                            "<td style=\"border: 1px solid #000;text-align: center;\">"
+                            + gs + "</td>"
+                        );
+                        gs++;
+                    } else {
+                        // 不够长补空列
+                        $("#t_body tr").eq(trNum).append(
+                            "<td style=\"border: 1px solid #000;text-align: center;\">" + "</td>"
+                        );
+                    }
+                }
+                // 添加层编号
+                var zr = layerNumber; // 初始获取层,倒叙获取数据
+                for (var j = 1; j <= layerNumber; j++) {
+                    trNum++; // 下一个tr 添加 td
+                    $("#t_body tr").eq(trNum).prepend(
+                        "<td colspan='" + $scope.td_type_5_avg + "' style=\"border:1 solid #000;text-align: center;\">" + j + "</td>"
+                    );
+                    // 填充数据
+                    if (i === 0) {
+                        gs1 = 0;
+                    } else {
+                        gs1 = i * xIny;
+                    }
+                    for (var k = 0; k < xIny; k++) {
+
+                        if (gs1 < yNumber) {
+                            var temp = detailMap[zr][gs1].temp;
+
+                            // 过滤高低温设备异常报警
+                            if (temp == 250) { // 250设备异常
+                                $("#t_body tr").eq(trNum).append(
+                                    "<td style=\"border:0 none;text-align: center;color: red;\">"
+                                    + '-100' + "</td>"
+                                );
+                            } else {
+                                if (temp >= tallTemp) { // 高温报警
+                                    $("#t_body tr").eq(trNum).append(
+                                        "<td style=\"border:0 none;text-align: center;color: red;\">"
+                                        + "<acronym title=\"粮温高限报警为: " + tallTemp + "℃\">"
+                                        + temp + "</td>"
+                                    );
+                                } else if (temp <= lowTemp) { // 低温报警
+                                    $("#t_body tr").eq(trNum).append(
+                                        "<td style=\"border:0 none;text-align: center;color: blue;\">"
+                                        + "<acronym title=\"粮温低限报警为: " + lowTemp + "℃\">"
+                                        + temp + "</td>"
+                                    );
+                                } else if (temp == $scope.max) { // 低温报警
+                                    $("#t_body tr").eq(trNum).append(
+                                        "<td style=\"border:0 none;text-align: center;color: red;\">"
+                                        + "<acronym title=\"整仓最高温为: " + temp + "℃\">"
+                                        + temp + "</td>"
+                                    );
+                                } else if (temp == $scope.min) { // 低温报警
+                                    $("#t_body tr").eq(trNum).append(
+                                        "<td style=\"border:0 none;text-align: center;color: blue;\">"
+                                        + "<acronym title=\"整仓最低温为: " + temp + "℃\">"
+                                        + temp + "</td>"
+                                    );
+                                } else { // 正常值
+                                    $("#t_body tr").eq(trNum).append(
+                                        "<td style=\"border:0 none;text-align: center;\">"
+                                        + temp + "</td>"
+                                    );
+                                }
+                            }
+                        } else {
+                            $("#t_body tr").eq(trNum).append(
+                                "<td style=\"border:0 none;text-align: center;\">" + "</td>"
+                            );
+                        }
+                        gs1++;
+                    }
+                    zr--;
+                }
+                trNum++; // 下一个tr 添加 td
+            }
+
+        });
+    };
+
+    /*
+     * 区分浅圆仓与其它仓粮情表格显示点温
+     * 判断仓房类型是否为浅圆仓 (enumid = 2973 , enumname = 浅圆仓)
+     */
+    // 用仓房code 获取仓房类型字典id编码
+    var dictionaryId = $rootScope.storeHouseCodeObj[$scope.vCfCode].storehouseType;
+    // 字典id编码获取仓房字典名称
+    var dictionaryName = $rootScope.dicData[dictionaryId];
+    // 是否为浅圆仓
+    if (dictionaryId === 2973 && dictionaryName === '浅圆仓') // 是浅圆仓
+    {
+
+        // 层温
+        $scope.layersAvgTemp();
+        // 浅圆仓点温 shallowCircular
+        $scope.shallowCircularPointTemp();
+    }
+    else // 非浅圆仓
+    {
+        // 计算非浅圆仓合并列
+        $scope.calculateMethod();
+        // 层温
+        $scope.layersAvgTemp();
+        // 非浅圆仓点温
+        $scope.pointTemp();
+    }
+    // 仓房展示
+    $scope.vCfCode3DShow = function () {
+        var params = items;
+        params.vCfCode = items.vCfCode; // 仓房编码
+        // params.time = items.time; // 检测时间
+        params.id = items.id;
+        $uibModal.open({
+            size: 'lg',
+            templateUrl: 'app/intelligent/grainDetection/views/humitureDetection3D.html',
+            controller: 'humitureDetection3DCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+    // 粮情趋势(图)
+    $scope.vCfCodeGrainSituationTrend = function () {
+        var params = [];
+        params.vCfCode = items.vCfCode; // 仓房编码
+        params.time = items.time; // 检测时间
+        $uibModal.open({
+            size: 'lg',
+            templateUrl: 'app/intelligent/grainInspect/views/grainSituationTrend-model.html',
+            controller: 'grainSituationTrendModelCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+    // 粮情对比
+    $scope.vCfCodeGSituationComparison = function () {
+        var params = [];
+        params.vCfCode = items.vCfCode; // 仓房编码
+        params.time = items.time; // 检测时间
+        $uibModal.open({
+            size: 'lg',
+            templateUrl: 'app/intelligent/grainInspect/views/grainSituationComparison-model.html',
+            controller: 'grainSituationComparisonModelCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+    // 所有点粮情对比
+    $scope.vCfCodePointAllGrainComparison = function () {
+        var params = [];
+        params.vCfCode = items.vCfCode; // 仓房编码
+        params.time = items.time; // 检测时间
+        params.id = items.id;
+        $uibModal.open({
+            size: 'lg',
+            templateUrl: 'app/intelligent/grainInspect/views/grainPointAllComparison-model.html',
+            controller: 'grainPointAllComparisonModelCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+
+    // 导出excel
+    $scope.exportToExcel = function (tableId) {
+        var excelTime = $filter('date')(new Date(), "yyyyMMddhhmmss");
+        var exportHref = Excel.tableToExcel(tableId, 'worksheetName');
+        $timeout(function () {
+            // IE
+            if (window.navigator.msSaveOrOpenBlob) {
+                var base64Data = atob(exportHref.split(',')[1]);
+                var n = base64Data.length;
+                var u8arr = new Uint8Array(n);
+                while (n--) {
+                    u8arr[n] = base64Data.charCodeAt(n)
+                }
+                var blob = new Blob([u8arr]);
+                // excel
+                window.navigator.msSaveOrOpenBlob(blob, excelTime + '.' + 'xls');
+            } else {
+                // Chrome
+                window.location = exportHref;
+            }
+        }, 100);
+    };
+
+    // 关闭模态窗口
+    $scope.cancel = function () {
+        $uibModalInstance.close();
+    };
+
+});

src/main/resources/static/app/intelligent/grainDetection/service/temperatureRecordService.js

@@ -50,7 +50,7 @@ angular.module('app.intelligent').service("temperatureRecordService", function($
     };
 
     // 根据仓号和检测时间获取数据
-    this.findByHouseAndTimes = function (vCfCode, vDatatime, id) {
+    this.findByHouseAndTimes = function (vCfCode, vDatatime, id, zsfs) {
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -58,7 +58,8 @@ angular.module('app.intelligent').service("temperatureRecordService", function($
             params : {
                 vDatatime : vDatatime == undefined ? "":vDatatime,
                 vCfCode : vCfCode == undefined ? "":vCfCode,
-                lqId: id
+                lqId: id,
+                zsfs: zsfs
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码
@@ -71,13 +72,14 @@ angular.module('app.intelligent').service("temperatureRecordService", function($
     };
 
     // 非浅圆仓列表
-    this.findByTempTable = function (id) {
+    this.findByTempTable = function (id, zsfs) {
         var d = $q.defer();
         $http({
             method : 'GET',
             url : APP_CONFIG.intelligentUrl + '/intelligents/temperatureRecord/findByTempTable',
             params : {
-                id: id
+                id: id,
+                zsfs: zsfs
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

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

@@ -124,7 +124,8 @@
                                             <a href-void ng-click="onlyStoreGrainTemperatureDetection(humitureDetection.storehouse)"><i class=""></i>{{storeHouseCodeObj[humitureDetection.storehouse].storehouseName}}检测</a>
                                         </td>
                                         <td style="text-align:center;">
-                                            <a href-void ng-click="grainDetectionDetail(humitureDetection)"><i class=""></i>详情</a>
+                                            <a href-void ng-click="grainDetectionDetail(humitureDetection)"><i class=""></i>详情1&nbsp;&nbsp;&nbsp;</a>
+                                            <a href-void ng-click="grainDetectionDetail(humitureDetection, '1')"><i class=""></i>详情2&nbsp;&nbsp;&nbsp;</a>
                                         </td>
                                     </tr>
                                     </tbody>

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

@@ -0,0 +1,137 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">温湿度检测详情</h4>
+    </div>
+    <div class="modal-body">
+        <div style="width: 100%;margin-top:-15px;text-align: left;">
+            <!--<a class="btn btn-default btn-sm" ng-click="vCfCodeGrainSituationTrend()"> <i class="fa fa-search"></i>&nbsp;粮情趋势</a>
+            <a class="btn btn-default btn-sm" ng-click="vCfCodeGSituationComparison()"> <i class="fa fa-search"></i>&nbsp;粮情对比</a>-->
+            <!--只有平方仓显示-->
+            <a ng-if="storeHouseCodeObj[vCfCode].storehouseType === 2971" class="btn btn-default btn-sm" ng-click="vCfCode3DShow()"> <i class="fa fa-language"></i>&nbsp;仓房展示</a>
+            <a class="btn btn-default btn-sm"
+               href="3Dlc/index.html?orgId={{orgId}}&vCfCode={{vCfCode}}&id={{id}}&libraryType=0" target="_blank"> <i
+                    class="fa fa-search"></i>&nbsp;三维图展示</a>
+            <!--<a class="btn btn-default btn-sm" ng-click="vCfCodePointAllGrainComparison()"> <i class="fa fa-search"></i>&nbsp;所有点粮情对比</a>-->
+        </div>
+        <div style="width: 100%;margin-top:-30px;text-align: right;">
+            <!--<a class="btn btn-primary btn-sm" href-void ng-click="exportToWord('#print')">
+                <span class="glyphicon glyphicon-export"></span>导出Word
+            </a>&nbsp;-->
+            <a class="btn btn-primary btn-sm" href-void ng-click="exportToExcel('#print')">
+                <span class="glyphicon glyphicon-export"></span>导出Excel
+            </a>&nbsp;
+            <a class="btn btn-primary btn-sm" onclick="Print('#print')">
+                <span class="fa fa-print"></span>&nbsp;打&nbsp;印
+            </a>
+        </div>
+        <!--温度表格-->
+        <div id="print" style="width: 100%;margin: 0 auto">
+            <!--startprint1-->
+            <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: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>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">{{dicData[storehouseCode[vCfCode].pz]}}</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">储粮性质</td>
+            		<td style="border: 1px solid #000;text-align: center;width:13%;">{{dicData[storehouseCode[vCfCode].hwxz]}}</td>
+            		<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 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>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">
+            			<div ng-if="intemp==250">
+                        	<span ng-if="orgId==161">-</span>
+                            <span ng-if="orgId!=161" style="color: red;">-100</span>
+                        </div>
+                        <div ng-if="intemp!=250">{{intemp}}</div>
+            		</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">仓湿</td>
+            		<td style="border: 1px solid #000;text-align: center;width:13%;">
+            			<div ng-if="inh==250">
+                            <span ng-if="orgId==161">-</span>
+                            <span ng-if="orgId!=161" style="color: red;">-1</span>
+                        </div>
+                        <div ng-if="inh!=250">{{inh}}</div>
+            		</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">气温</td>
+            		<td style="border: 1px solid #000;text-align: center;width:10%;">
+            			<div ng-if="outtemp==250">
+                            <span style="color: red;">-100</span>
+                        </div>
+                        <div ng-if="outtemp!=250">{{outtemp}}</div>
+            		</td>
+            	</tr>
+            	<tr>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">气湿</td>
+            		<td style="border: 1px solid #000;text-align: center;width:19%;">
+            			<div ng-if="outh==250">
+                            <span style="color: red;">-1</span>
+                        </div>
+                        <div ng-if="outh!=250">{{outh}}</div>
+            		</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">最高温</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">
+            			<div ng-if="max==250">
+                            <span style="color: red;">-100</span>
+                        </div>
+                        <div ng-if="max!=250">{{max}}</div>
+            		</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">最低温</td>
+            		<td style="border: 1px solid #000;text-align: center;width:13%;">
+            			<div ng-if="min==250">
+                            <span style="color: red;">-100</span>
+                        </div>
+                        <div ng-if="min!=250">{{min}}</div>
+            		</td>
+            		<td style="border: 1px solid #000;text-align: center;width:9.5%;">平均温</td>
+            		<td style="border: 1px solid #000;text-align: center;width:10%;">
+            			<div ng-if="avg==250">
+                            <span style="color: red;">-100</span>
+                        </div>
+                        <div ng-if="avg!=250">{{avg}}</div>
+            		</td>
+            	</tr>
+            	</tbody>
+			</table>
+            <table border="1" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0">
+                <tr id="layersAvgTemp" style="font-size: 10px;"></tr>
+            </table>
+            <table border="1" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0;">
+                <tbody id="t_body" style="font-size: 10px;">
+                </tbody>
+            </table>
+            <table border="1" class="table table-bordered" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0; text-align: center;">
+                <tbody id="t_body2" style="font-size: 10px;">
+                <tr>
+                    <td class="text-center" style="width:10%">处理意见</td>
+                    <td colspan="{{td_type_2 % 2 == 0 ? td_type_2/2:(td_type_2 + 1)/2}}" class="text-center" style="width:40%"></td>
+                    <td class="text-center" style="width:10%"> 备注</td>
+                    <td colspan="{{td_type_2 % 2 == 0 ? td_type_2/2:(td_type_2 + 1)/2-1}}" class="text-center" style="width:40%"></td>
+                </tr>
+                </tbody>
+            </table>
+            <table border="1" class="table table-bordered" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0;text-align: center;">
+                <tbody id="t_body3" style="font-size: 10px;">
+                <tr>
+                    <td class="text-center" style="width:10%">检测员</td>
+                    <td colspan="{{td_type_avg_1}}" class="text-center"></td>
+                    <td class="text-center" style="width:10%">保管员</td>
+                    <td colspan="{{td_type_avg_2}}" class="text-center"></td>
+                    <td class="text-center" style="width: 10%;">主管科长</td>
+                    <td colspan="{{td_type_avg_3}}" class="text-center"></td>
+                </tr>
+                </tbody>
+            </table>
+            <!--endprint1-->
+        </div>
+    </div>
+</div>

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

@@ -571,67 +571,45 @@ angular.module('app.intelligent',['ui.router']).config(function($stateProvider)
             }
         })
         /*-------通风作业------*/
-        //通风参数值设置列表
-        .state('app.intelligent.aeration.aerationJob', {
-            url: '/intelligent/aeration/aerationJob',
+        //通风作业开始列表
+        .state('app.intelligent.aeration.aerationJob_ks', {
+            url: '/intelligent/aeration/aerationJob_ks/:funcType',
             data: {
-                title: '通风作业'
+                title: '通风作业开始'
             },
             views: {
                 "content@app": {
                     controller: 'aerationJobCtrl',
-                    templateUrl: 'app/intelligent/aeration/views/aerationJob-list.html'
+                    templateUrl: 'app/intelligent/aeration/views/aerationJob-ks-list.html'
                 }
             }
         })
-
-
-        //通风作业新增
-        .state('app.intelligent.aeration.aerationJob-add', {
-                url: '/intelligent/aeration/aerationJob-add/:id',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'aerationJobEditCtrl',
-                        templateUrl: 'app/intelligent/aeration/views/aerationJob-edit.html'
-                        //templateUrl: 'app/storage/aeration/views/aerationSummary-edit.html'
-                    }
+        //通风作业结束列表
+        .state('app.intelligent.aeration.aerationJob_js', {
+            url: '/intelligent/aeration/aerationJob_js/:funcType',
+            data: {
+                title: '通风作业结束'
+            },
+            views: {
+                "content@app": {
+                    controller: 'aerationJobCtrl',
+                    templateUrl: 'app/intelligent/aeration/views/aerationJob-js-list.html'
                 }
             }
-        )
+        })
+
 
-        // 通风作业-修改
+        //通风作业新增、修改、查看
         .state('app.intelligent.aeration.aerationJob-edit', {
-                url: '/intelligent/aeration/aerationJob-edit/:id',
+                url: '/intelligent/aeration/aerationJob-add/:id/:butType/:funcType',
                 data: {
-                    title: '修改'
-                },
-                params: {
-                    "isNotEdit" : false
-                },
-                views: {
-                    "content@app": {
-                        controller: 'aerationJobEditCtrl',
-                        templateUrl: 'app/intelligent/aeration/views/aerationJob-edit.html'
-                    }
-                }
-            }
-        )
-        // 通风作业-查看
-        .state('app.intelligent.aeration.aerationJob-view', {
-                url: '/intelligent/aeration/aerationJob-view/:id',
-                data: {
-                    title: '查看'
-                },
-                params: {
-                    "isNotEdit" : true
+                    title: '详情'
                 },
                 views: {
                     "content@app": {
                         controller: 'aerationJobEditCtrl',
                         templateUrl: 'app/intelligent/aeration/views/aerationJob-edit.html'
+                        //templateUrl: 'app/storage/aeration/views/aerationSummary-edit.html'
                     }
                 }
             }

src/main/resources/static/app/layout/partials/header.tpl.html

@@ -40,81 +40,72 @@
 								首页</a>
 							<i class="nav-feng-line"></i>
 						</div>
-						 <div has-func="1" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==1]">
-							<a href-void ng-click="switchTopMenu(1,'app.system.user')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/xitgl-icon.png" /></i>
-								系统管理</a>
-                            <i class="nav-feng-line"></i>
-						</div>
-						<div has-func="2" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==2]">
-							<a href-void ng-click="switchTopMenu(2,'app.basic.index')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/jicsj-icon.png" /></i>
-								基本信息</a>
-							<i class="nav-feng-line"></i>
-						</div>
-						<div has-func="18" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==18]">
-							<a href-void ng-click="switchTopMenu(18, 'app.risk.warning.temperature')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/liangkyw-icon.png" /></i>
-								风险管理</a>
-							<i class="nav-feng-line"></i>
-						</div>
 						<div has-func="8" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==8]">
 							<a href-void ng-click="switchTopMenu(8, 'app.business.index')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/liangkyw-icon.png" /></i>
-								粮食购销</a>
+								综合业务</a>
+							<i class="nav-feng-line"></i>
+						</div>
+						<div has-func="124" class="nav-li" role="presentation">
+							<a href="javaScript:void(0)" ng-click="crk()">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>
+								出入库</a>
 							<i class="nav-feng-line"></i>
 						</div>
 						<div has-func="19" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==19]">
 							<a href-void ng-click="switchTopMenu(19,'app.storage.index')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/cangcyw.png" /></i>
-								仓储保管</a>
+								仓储业务</a>
 							<i class="nav-feng-line"></i>
 						</div>
 						<div has-func="17" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==17]">
 							<a href-void ng-click="switchTopMenu(17,'app.camera.index')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
-								安全生产</a>
+								智能安防</a>
 							<i class="nav-feng-line"></i>
 						</div>
-						<div has-func="" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==495]">
-							<a href-void ng-click="switchTopMenu(495, 'app.cstj.account.keepDetailedAccount')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/liangkyw-icon.png" /></i>
-								财税统计</a>
+						<div has-func="18" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==18]">
+							<a href-void ng-click="switchTopMenu(18,'app.supervise.cameraPT')">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
+								粮库决策</a>
 							<i class="nav-feng-line"></i>
 						</div>
-						 <div has-func="124" class="nav-li" role="presentation">
-							<a href="javaScript:void(0)" ng-click="crk()">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>
-								出入库</a>
-							<i class="nav-feng-line"></i>
-						</div> 
-						
 						<!-- <div has-func="324" class="nav-li" role="presentation">
 							<a href="{{financeUrl}}" target="_blank">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/cwgl-icon.png" /></i>
 								财务管理</a>
 							<i class="nav-feng-line"></i>
 						</div> -->
-						
-						<div has-func="218" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==218]">
-							<a href-void ng-click="switchTopMenu(218,'app.intelligent.index')">
-								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
-								智能仓房</a>
-							<i class="nav-feng-line"></i>
-						</div>
 						<div has-func="23" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==23]">
 							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')">
 								<i class="nav-icon"><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
 								查询追溯</a>
                             <i class="nav-feng-line"></i>
 						</div>
+						<div has-func="218" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==218]">
+							<a href-void ng-click="switchTopMenu(218,'app.intelligent.index')">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
+								智能仓房</a>
+							<i class="nav-feng-line"></i>
+						</div>
 						<div has-func="439" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==439]">
 							<a href-void ng-click="switchTopMenu(439,'app.archive.storage.foodSituation')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/gdsj-icon.png" /></i>
 								归档数据</a>
 							<i class="nav-feng-line"></i>
-						</div>  
-						
+						</div>
+						<div has-func="2" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==2]">
+							<a href-void ng-click="switchTopMenu(2,'app.basic.index')">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/jicsj-icon.png" /></i>
+								基础数据</a>
+							<i class="nav-feng-line"></i>
+						</div>
+						<div has-func="1" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==1]">
+							<a href-void ng-click="switchTopMenu(1,'app.system.user')">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/xitgl-icon.png" /></i>
+								系统管理</a>
+                            <i class="nav-feng-line"></i>
+						</div>
 						<!-- <div has-func="20" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==20]">
 							<a href-void ng-click="switchTopMenu(20,'app.act')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/lcgl.png" /></i>

src/main/resources/static/app/monitor/controller/cameraPlayNewCtrl.js

@@ -0,0 +1,173 @@
+angular.module('app.camera')
+    .controller("cameraPlayNewCtrl", function($scope, $rootScope, $http, $state,cameraService, nvrService, enumService, FileUploader, APP_CONFIG) {
+    
+	var g_iWndIndex = 0; //可以不用设置这个变量，有窗口参数的接口中，不用传值，开发包会默认使用当前选择窗口
+	var g_oLocalConfig = null; //本地配置
+    $scope.init = function () {
+        WebVideoCtrl.I_InitPlugin({
+	        bWndFull: true,     //是否支持单窗口双击全屏，默认支持 true:支持 false:不支持
+	        iWndowType: 2,//窗口初始化默认比例
+	        //鼠标单机窗口事件，获取窗口号
+	        cbSelWnd: function (xmlDoc) {
+	            //窗口号
+	        	g_iWndIndex = parseInt($(xmlDoc).find("SelectWnd").eq(0).text(), 10);
+	        	console.log("当前选择的窗口编号：" + g_iWndIndex);
+	            //var szInfo = "当前选择的窗口编号：" + g_iWndIndex;
+	            //showCBInfo(szInfo);
+	        },
+	        //窗口放大
+	        cbDoubleClickWnd: function (iWndIndex, bFullScreen) {
+	        	console.log("当前放大的窗口编号：" + iWndIndex);
+	            if (!bFullScreen) {            
+	            	console.log("当前还原的窗口编号：" + iWndIndex);
+	            }
+	            //showCBInfo(szInfo);
+	        },
+	        //窗口回放
+	        cbEvent: function (iEventType, iParam1, iParam2) {
+				if (2 == iEventType) {// 回放正常结束
+					console.log("窗口" + iParam1 + "回放结束！");
+	            } else if (-1 == iEventType) {
+	            	console.log("设备" + iParam1 + "网络错误！");
+	            } else if (3001 == iEventType) {
+	                clickStopRecord(g_szRecordType, iParam1);
+	            }
+	        },
+	        //初始化界面
+	        cbInitPluginComplete: function () {
+				WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin").then(() => {
+	                // 检查插件是否最新
+	                WebVideoCtrl.I_CheckPluginVersion().then((bFlag) => {
+	                    if (bFlag) {
+	                        alert("检测到新的插件版本，双击开发包目录里的HCWebSDKPlugin.exe升级！");
+	                    }
+	                });
+	            }, () => {
+	                alert("插件初始化失败，请确认是否已安装插件；如果未安装，请双击开发包目录里的HCWebSDKPlugin.exe安装！");
+	            });
+	        }
+    	});
+    }
+    
+    $scope.init();
+    
+    //全屏
+    function clickFullScreen() {
+        WebVideoCtrl.I_FullScreen(true).then(() => {
+        	console.log("全屏成功");
+        }, (oError) => {
+        	console.log("全屏失败！", oError.errorCode, oError.errorMsg);
+        });
+    }
+
+    //登录
+    function clickLogin() {
+        var szIP = $("#loginip").val(),
+            szPort = $("#port").val(),
+            szUsername = $("#username").val(),
+            szPassword = $("#password").val();
+
+        if ("" == szIP || "" == szPort) {
+            return;
+        }
+
+        var szDeviceIdentify = szIP + "_" + szPort;//当前摄像头IP+端口
+
+        WebVideoCtrl.I_Login(szIP, 1, szPort, szUsername, szPassword, {
+            timeout: 3000,
+            success: function (xmlDoc) {            
+            	console.log(szDeviceIdentify + " 登录成功！");
+                $("#ip").prepend("<option value='" + szDeviceIdentify + "'>" + szDeviceIdentify + "</option>");
+                setTimeout(function () {
+                    $("#ip").val(szDeviceIdentify);
+                    setTimeout(function() {
+                        getChannelInfo();
+                    }, 1000);
+                    getDevicePort();
+                }, 10);
+            },
+            error: function (oError) {
+                if (ERROR_CODE_LOGIN_REPEATLOGIN === status) {
+                    showOPInfo(szDeviceIdentify + " 已登录过！");
+                } else {
+                    showOPInfo(szDeviceIdentify + " 登录失败！", oError.errorCode, oError.errorMsg);
+                }
+            }
+        });
+    }
+    
+    // 退出
+    function clickLogout() {
+        var szDeviceIdentify = $("#ip").val();
+
+        if (null == szDeviceIdentify) {
+            return;
+        }
+
+        WebVideoCtrl.I_Logout(szDeviceIdentify).then(() => {
+            showOPInfo(szDeviceIdentify + " " + "退出成功！");
+       }, () => {
+        showOPInfo(szDeviceIdentify + " " + "退出失败！");
+       });
+    }
+    
+    //开始预览
+    function clickStartRealPlay(iStreamType) {
+        var oWndInfo = WebVideoCtrl.I_GetWindowStatus(g_iWndIndex),
+            szDeviceIdentify = $("#ip").val(),
+            iRtspPort = parseInt($("#rtspport").val(), 10),
+            iChannelID = parseInt($("#channels").val(), 10),
+            bZeroChannel = $("#channels option").eq($("#channels").get(0).selectedIndex).attr("bZero") == "true" ? true : false,
+            szInfo = "";
+
+        if ("undefined" === typeof iStreamType) {
+            iStreamType = parseInt($("#streamtype").val(), 10);
+        }
+
+        if (null == szDeviceIdentify) {
+            return;
+        }
+        var startRealPlay = function () {
+            WebVideoCtrl.I_StartRealPlay(szDeviceIdentify, {
+                iStreamType: iStreamType,
+                iChannelID: iChannelID,
+                bZeroChannel: bZeroChannel,
+                success: function () {
+                    szInfo = "开始预览成功！";
+                    showOPInfo(szDeviceIdentify + " " + szInfo);               
+                },
+                error: function (oError) {
+                    showOPInfo(szDeviceIdentify + " 开始预览失败！", oError.errorCode, oError.errorMsg);
+                }
+            });
+        };
+       
+        if (oWndInfo != null) {// 已经在播放了，先停止
+            WebVideoCtrl.I_Stop({
+                success: function () {
+                    startRealPlay();
+                }
+            });
+        } else {
+            startRealPlay();
+        }
+    }
+
+    // 停止预览
+    function clickStopRealPlay() {
+        var oWndInfo = WebVideoCtrl.I_GetWindowStatus(g_iWndIndex),
+            szInfo = "";
+
+        if (oWndInfo != null) {
+            WebVideoCtrl.I_Stop({
+                success: function () {
+                    szInfo = "停止预览成功！";
+                    showOPInfo(oWndInfo.szDeviceIdentify + " " + szInfo);
+                },
+                error: function (oError) {
+                    showOPInfo(szDeviceIdentify + " 停止预览失败！", oError.errorCode, oError.errorMsg);
+                }
+            });
+        }
+    }
+})

src/main/resources/static/app/monitor/group/module.js

@@ -6,7 +6,7 @@ angular.module('app.cameraGroup', ['ui.router','app.alert', 'ui.bootstrap', 'dat
         .state('app.cameraGroup', {
             abstract: true,
             data: {
-                title: '安全生产 / 视频监控在线监测'
+                title: '智能安防'
             }
         })
         .state('app.cameraGroup.list', {

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

@@ -54,7 +54,7 @@ angular.module('app.camera', ['ui.router', 'datatables', 'datatables.bootstrap']
             .state('app.camera', {
                 abstract: true,
                 data: {
-                    title: '安全生产/ 视频监控在线监测'
+                    title: '智能安防'
                 }
             })
             .state('app.camera.list', {
@@ -114,12 +114,15 @@ angular.module('app.camera', ['ui.router', 'datatables', 'datatables.bootstrap']
                     "content@app": {
                         controller: 'cameraPlayCtrl as datatables',
                         templateUrl: 'app/monitor/views/camera-play.html'
+                        	//controller: 'cameraPlayNewCtrl as datatables',
+                        	//templateUrl: 'app/monitor/views/camera-new-play.html'
                     }
                 },
                 resolve: {
                     scripts: function(lazyScript){
                         return lazyScript.register([
                             'bower_components/jquery-jsencrypt/jsencrypt.min.js','bower_components/jquery-jsencrypt/jsWebControl-1.0.0.min.js'
+                            //'bower_components/jquery-jsencrypt/webVideoCtrl.js','bower_components/jquery-jsencrypt/jsVideoPlugin-1.0.0.min.js'
                         ]);
                     }
                 }
@@ -193,425 +196,4 @@ angular.module('app.log', ['ui.router', 'datatables', 'datatables.bootstrap'])
 	                }
 	            }
 	        })
-	});
-
-angular.module('app.safeproduce', ['ui.router', 'datatables', 'datatables.bootstrap'])
-.config(function ($stateProvider) {
-    $stateProvider
-        .state('app.safeproduce', {
-            abstract: true,
-            data: {
-                title: '安全生产 / 安全管理'
-            }
-        })
-        //----------------安全生产开始---------------//
-            .state('app.safeproduce.list', {
-                url: '/safeproduce/list/:type/:layerType',
-                data: {
-                    title: '安全生产管理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeproduceCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-list.html'
-                    }
-                }
-            })
-
-            // 安全风险等级管控
-            .state('app.safeproduce.safeRiskLevelCtrl', {
-                url: '/safeproduce/riskLevelCtrl',
-                data: {
-                    title: '安全风险分级管控'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceRiskCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-list.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeRiskAdd', {
-                url: '/safeproduce/riskLevelCtrl/:id/:isNotEdit',
-                data: {
-                    title: '安全风险分级管控编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceRiskCtrlSave',
-                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html'
-                    }
-                }
-            })
-            // 安全隐患跟踪处理
-            .state('app.safeproduce.safeDangerHandle', {
-                url: '/safeproduce/dangerHandle',
-                data: {
-                    title: '安全隐患跟踪处理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceDangerHandle',
-                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-list.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeProduceDangerHandleSave', {
-                url: '/safeproduce/dangerHandle/:id/:isNotEdit',
-                data: {
-                    title: '安全隐患跟踪处理编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceDangerHandleSave',
-                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-edit.html'
-                    }
-                }
-            })
-
-            /*--------------安全生产通知---------------*/
-            .state('app.safeproduce.notifyList', {
-                url: '/safeproduce/list',
-                data: {
-                    title: '安全生产通告'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceNotifyCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-list.html'
-                    }
-                }
-            })
-
-            .state('app.safeproduce.notifyAdd', {
-                url: '/safeproduce/add/:id/:isNotEdit/:topRow',
-                data: {
-                    title: '安全生产通知编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceNotifySaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-edit.html'
-                    }
-                }
-            })
-
-            .state('app.safeproduce.notifyView', {
-                url: '/safeproduce/view/:id/:isNotEdit',
-                data: {
-                    title: '安全生产通知查看'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceNotifySaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-view.html'
-                    }
-                }
-            })
-            /*--------------法律规章信息库---------------*/
-            .state('app.safeproduce.rulelibrary', {
-                url: '/rulelibrary/list',
-                data: {
-                    title: '法律规章信息库'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'rulelibraryCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/ruleLibrary.html'
-                    }
-                }
-            })
-            // 安全事故管理
-            .state('app.safeproduce.safeAccidentManageList', {
-                url: '/safeproduce/safeAccidentManageList',
-                data: {
-                    title: '安全生产事故管理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeAccidentManageCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeAccidentManage-list.html'
-                    }
-                }
-            })
-            // 编辑
-            .state('app.safeproduce.safeAccidentManageList.edit', {
-                url: '/safeproduce/safeAccidentManageEdit/:id/:isNotEdit',
-                data: {
-                    title: '安全事故管理编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeAccidentManageSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeAccidentManage-edit.html'
-                    }
-                }
-            })
-            // ---------------------备案及实施情况的管理------------------- //
-            // 三级路由--备案管理
-            .state('app.safeproduce.recordManage', {
-                abstract: true,
-                data: {
-                    title: '备案管理'
-                }
-            })
-            // ----------安全检查---------//
-            // 三级路由--安全检查
-            .state('app.safeproduce.safeCheck', {
-                abstract: true,
-                data: {
-                    title: '安全检查'
-                }
-            })
-            //日常检查
-            .state('app.safeproduce.safeCheck.dailyList', {
-                url: '/safeproduce/safeCheck/dailyList',
-                data: {
-                    title: '日常检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'dailyListCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-list.html'
-                    }
-                }
-            })
-             //日常检查新增
-             .state('app.safeproduce.safeCheck.dailyList.add', {
-                url: '/safeproduce/safeCheck/dailyList/add/:id/:isNotEdit',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'dailyListAddCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-add.html'
-                    }
-                }
-            })
-            //日常检查修改
-             .state('app.safeproduce.safeCheck.dailyList.edit', {
-                url: '/safeproduce/safeCheck/dailyList/edit/:id/:isNotEdit',
-                data: {
-                    title: '修改'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'dailyListAddCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-add.html'
-                    }
-                }
-            })
-
-            // 节前安全检查
-            .state('app.safeproduce.safeCheck.fbelist', {
-                url: '/safeproduce/safeCheck/fbelist',
-                data: {
-                    title: '节前安全检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-list.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeCheck.fbelist.add', {
-                url: '/safeproduce/safeCheck/fbeadd/add/:id/:isNotEdit',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeCheck.fbelist.edit', {
-                url: '/safeproduce/safeCheck/fbeedit/edit/:id/:isNotEdit',
-                data: {
-                    title: '修改'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeCheck.fbelist.view', {
-                url: '/safeproduce/safeCheck/fbeedit/view/:id/:isNotEdit',
-                data: {
-                    title: '查看'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
-                    }
-                }
-            })
-
-            // 风雨雪三查
-            .state('app.safeproduce.safeCheck.wrslist', {
-                url: '/safeproduce/safeCheck/wrslist',
-                data: {
-                    title: '风雨雪三查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-list.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeCheck.wrslist.add', {
-                url: '/safeproduce/safeCheck/wrslist/add/:id/:isNotEdit',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeCheck.wrslist.edit', {
-                url: '/safeproduce/safeCheck/wrslist/edit/:id/:isNotEdit',
-                data: {
-                    title: '修改'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
-                    }
-                }
-            })
-            .state('app.safeproduce.safeCheck.wrslist.view', {
-                url: '/safeproduce/safeCheck/wrslist/view/:id/:isNotEdit',
-                data: {
-                    title: '查看'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
-                    }
-                }
-            })
-
-            // 五温检查
-            .state('app.safeproduce.safeCheck.ttplist', {
-                url: '/safeproduce/safeCheck/ttplist/:houseId',
-                data: {
-                    title: '五温检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'threetempCheckCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-threetempcheck-list.html'
-                    }
-                },
-                resolve: {
-                    scripts: function(lazyScript){
-                        return lazyScript.register([
-                            'build/vendor.graphs.js'
-                        ]);
-                    }
-                }
-            })
-
-            // 其他检查
-            .state('app.safeproduce.safeCheck.otherchecklist', {
-                url: '/safeproduce/safeCheck/otherchecklist',
-                data: {
-                    title: '其他检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'foodotherCheckCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-foodothercheck-list.html'
-                    }
-                },
-                resolve: {
-                    scripts: function(lazyScript){
-                        return lazyScript.register([
-                            'build/vendor.graphs.js'
-                        ]);
-                    }
-                }
-            })
-            
-            // 虫害检测
-	        .state('app.safeproduce.safeCheck.insectPestDetectionList', {
-	                url: '/safeproduce/safeCheck/insectPestDetectionList/:show/:vCfCode',
-	                data: {
-	                    title: '虫害检测列表'
-	                },
-	                views: {
-	                    "content@app": {
-	                        controller: 'insectPestDetectionNewCtrl',
-	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetection-list.html'
-	                    }
-	                }
-	            }
-	        )
-	        // 虫害手工录入
-	        .state('app.safeproduce.safeCheck.insectPestDetectionEdit', {
-	                url: '/safeproduce/safeCheck/insectPestDetectionEdit/:id/:butType',
-	                data: {
-	                    title: '虫害检测数据'
-	                },
-	                views: {
-	                    "content@app": {
-	                        controller: 'insectPestEditNewCtrl',
-	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetection-edit.html'
-	                    }
-	                }
-	            }
-	        )
-	        // 虫害检测图表展示
-	        .state('app.safeproduce.safeCheck.insectPestDetectionList.chart', {
-	                url: '/safeproduce/safeCheck/insectPestDetectionList/chart',
-	                data: {
-	                    title: '虫害检测图表'
-	                },
-	                views: {
-	                    "content@app": {
-	                        controller: 'insectPestDetectionChartNew',
-	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetectionChart.html'
-	                    }
-	                }
-	            }
-	        )
-
-            //安全隐患排查治理
-            .state('app.safeproduce.safeManage', {
-                url: '/safeproduce/safeManage/safeManageList',
-                data: {
-                    title: '安全隐患排查治理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeManageCtrl',
-                        templateUrl: 'app/storage/safe-manage/views/safeManage-list.html'
-                    }
-                }
-            })
-
-            .state('app.safeproduce.safeManage.edit', {
-                url: '/safeproduce/safeManage/safeManageEdit/:id/:butType',
-                data: {
-                    title: '安全隐患排查治理详情'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeManageEditCtrl',
-                        templateUrl: 'app/storage/safe-manage/views/safeManage-edit.html'
-                    }
-                }
-            })
-});
+	});

src/main/resources/static/app/monitor/qualityDlag/module.js

@@ -8,7 +8,7 @@ angular.module('app.qualityDlag', ['ui.router', 'ui.bootstrap', 'datatables', 'd
         .state('app.qualityDlag', {
             abstract: true,
             data: {
-                title: '安全生产 / 视频监控在线监测 / 质量诊断'
+                title: '智能安防 / 质量诊断'
             }
         })
         .state('app.qualityDlag.playList', {

src/main/resources/static/app/monitor/record/module.js

@@ -9,13 +9,13 @@ angular.module('app.cameraRecord', ['ui.router','app.alert', 'ui.bootstrap', 'da
         .state('app.cameraRecord', {
             abstract: true,
             data: {
-                title: '安全生产/ 视频监控在线监测'
+                title: '智能安防'
             }
         })
         .state('app.cameraRecord.list', {
             url: '/cameraRecord/list',// 传参 : id/:name/:pwd
             data: {
-                title: '录像管理'
+                title: '回放通道'
             },
             views: {
                 "content@app": {

src/main/resources/static/app/monitor/setting/module.js

@@ -9,7 +9,7 @@ angular.module('app.cameraSetting', ['ui.router','app.alert']).config(function (
         .state('app.cameraSetting', {
             abstract: true,
             data: {
-                title: '安全生产 / 视频监控在线监测 / 配置管理'
+                title: '智能安防 / 配置管理'
             }
         })
         .state('app.cameraSetting.set', {

src/main/resources/static/app/monitor/views/camera-new-play.html

@@ -0,0 +1,17 @@
+<META HTTP-EQUIV="pragma" CONTENT="no-cache">
+<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+<META HTTP-EQUIV="expires" CONTENT="0">
+<meta HTTP-EQUIV="Expires" content="0" />
+<div style="float:left;">
+    <div id="divPlugin" style="width:1000px;height:550px;"></div>
+</div>
+<div style="float:left;">
+    <ul id="myTab1" class="nav nav-tabs bordered">
+        <li class="active" id="qiye-li">
+            <a href="#trees" data-toggle="tab" aria-expanded="true">摄像头列表</a>
+        </li>
+        <li class="" id="geren-li">
+            <a href="#operat" data-toggle="tab" aria-expanded="false">操作</a>
+        </li>
+    </ul>
+</div>

src/main/resources/static/app/storage/changestorage/service/changeStoreRopService.js

@@ -47,7 +47,7 @@ angular.module('app.basic').service("changeStoreRopService", function($http, $q,
         
         return d.promise;
     }
-    this.getPageInfoRop = function(pageNum, pageSize, orgId, changehouseNo, applyTimeA, applyTimeB) {
+    this.getPageInfoRop = function(pageNum, pageSize, orgId, changehouseNo, applyTimeA, applyTimeB,  dcch, dchwh, drch, drhwh) {
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -58,7 +58,11 @@ angular.module('app.basic').service("changeStoreRopService", function($http, $q,
                 orgId : orgId, //单位ID
                 changehouseNo : changehouseNo, //倒仓业务单号
                 applyTimeA : applyTimeA, //申请日期
-                applyTimeB : applyTimeB //申请日期
+                applyTimeB : applyTimeB, //申请日期
+                dcch : dcch, //倒出仓号
+                dchwh : dchwh, //倒出货位号
+                drch : drch, //倒入仓号
+                drhwh : drhwh //倒入货位号
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/storage/changestorage/views/ChangeStoreSee.html

@@ -71,8 +71,8 @@
 											<td>{{storehouseObj[changestorage.outStorehouse].storehouseName}}</td>
 											<td>{{storehouseObj[changestorage.intoStorehouse].storehouseName}}</td>
 											<td>{{dicData[changestorage.foodWar]}}</td>
-											<td>{{changestorage.goalNumber}}</td>
-											<td>{{changestorage.foodNumber}}</td>
+											<td>{{changestorage.goalNumber/1000 | number : 3}}</td>
+											<td>{{changestorage.foodNumber/1000 | number : 3}}</td>
 											<td>{{changestorage.foodStatus}}</td>
 											<td>{{changestorage.createTime | date :'yyyy-MM-dd'}}</td>
 											<td>

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

@@ -90,17 +90,17 @@ angular.module('app.storage')
 
         //新增
         $scope.addDailyList=function () {
-            $state.go('app.safeproduce.safeCheck.dailyList.add',{id:0,isNotEdit:false});
+            $state.go('app.storage.safeproduce.safeCheck.dailyList.add',{id:0,isNotEdit:false});
         };
 
         //修改
         $scope.showEditFbe=function (id) {
-            $state.go('app.safeproduce.safeCheck.dailyList.edit',{id:id,isNotEdit:false});
+            $state.go('app.storage.safeproduce.safeCheck.dailyList.edit',{id:id,isNotEdit:false});
         };
 
         // 查看页面
         $scope.showViewOut = function(id) {
-            $state.go('app.safeproduce.safeCheck.dailyList.add',{id:id,isNotEdit:true});
+            $state.go('app.storage.safeproduce.safeCheck.dailyList.add',{id:id,isNotEdit:true});
         }
 
         // 根据id删除信息
@@ -263,7 +263,7 @@ angular.module('app.storage')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.safeproduce.safeCheck.dailyList');
+                        $state.go('app.storage.safeproduce.safeCheck.dailyList');
                     } else {
                         alert("保存失败！");
                     }

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

@@ -83,15 +83,15 @@ angular.module('app.storage')
 
         // 显示增加页面
         $scope.showAddFbe=function () {
-            $state.go('app.safeproduce.safeCheck.fbelist.add', {id:0,isNotEdit:false});
+            $state.go('app.storage.safeproduce.safeCheck.fbelist.add', {id:0,isNotEdit:false});
         };
         //修改编辑页面
         $scope.showEditFbe = function (id) {
-            $state.go('app.safeproduce.safeCheck.fbelist.edit', {id:id,isNotEdit:false});
+            $state.go('app.storage.safeproduce.safeCheck.fbelist.edit', {id:id,isNotEdit:false});
         };
         // 查看页面
         $scope.showViewFbe = function(id) {
-            $state.go('app.safeproduce.safeCheck.fbelist.view', {id:id,isNotEdit:true});
+            $state.go('app.storage.safeproduce.safeCheck.fbelist.view', {id:id,isNotEdit:true});
         };
 
         // 根据id删除信息
@@ -169,7 +169,7 @@ angular.module('app.storage')
                         if ($rootScope.previousState_name != '') {
                             $rootScope.back();
                         } else {
-                            $state.go('app.safeproduce.safeCheck.fbelist');
+                            $state.go('app.storage.safeproduce.safeCheck.fbelist');
                         }
                     } else {
                         alert("保存失败！");

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

@@ -37,7 +37,17 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 
 	// 获取列表数据
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	if ($stateParams.findPage != null && $stateParams.findPage != "") {
+		var findP = angular.fromJson($stateParams.findPage);
+		$scope.pageInfo.pageNum = findP.pageNum;
+		$scope.pageInfo.pageSize = findP.pageSize;
+	}
 	$scope.search = {ch:"", hwh:"", lspz:"", lsxz:"", startDate:"", endDate:"", wjh:"", zy:""};
+	if ($stateParams.findSearch != null && $stateParams.findSearch != "") {
+		$scope.search = angular.fromJson($stateParams.findSearch);
+		$("#startDate").val($scope.search.startDate);
+		$("#endDate").val($scope.search.endDate);
+	}
 	if($stateParams.houseId != "" && $stateParams.houseId != null){
 		$scope.search.ch = $stateParams.houseId;
 	}
@@ -245,12 +255,14 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 					}
 				}
 				account.id === data.obj.id;
-				$state.go('app.cstj.account.houseKeepAccount.houseKeepAccountEdit',{account:angular.toJson(account), butType:butType});
+				$state.go('app.storage.account.houseKeepAccount.houseKeepAccountEdit',{account:angular.toJson(account), butType:butType,
+					findPage: angular.toJson($scope.pageInfo), 
+					findSearch: angular.toJson($scope.search)});
 			},function(data){
 		        console.log(data);
 		    });
 		} else { //明细账
-			$state.go('app.cstj.account.keepDetailedAccount',{account:angular.toJson(account), type:butType});
+			$state.go('app.storage.account.keepDetailedAccount',{account:angular.toJson(account), type:butType});
 		}
 	}
 
@@ -261,7 +273,7 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 
 	//返回保管总账列表
 	$scope.returnTotal = function() {
-		$state.go('app.cstj.account.keepTotalAccount');
+		$state.go('app.storage.account.keepTotalAccount');
 	}
 
 	//返回粮库决策
@@ -312,10 +324,10 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 			//初始分仓保管账表对象数据
 			$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
 			$scope.fcbgz.rq = rq;
+			$scope.account.houseId = $scope.fcbgz.ch; //仓房
+			$scope.account.wareId = $scope.fcbgz.hwh; //货位
 			if ($stateParams.butType == 0) { //记账
 				//初始化数据记账表对象数据
-				$scope.account.houseId = $scope.fcbgz.ch; //仓房
-				$scope.account.wareId = $scope.fcbgz.hwh; //货位
 				$scope.account.recordUnite = $scope.fcbgz.lqgs; //粮权归属
 				$scope.account.lspz = $scope.fcbgz.pz; //粮食品种
 				$scope.account.hwxz = $scope.fcbgz.hwxz; //货物性质
@@ -383,10 +395,11 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 	
 	//返回
     $scope.retList = function () {
-		if ($rootScope.previousState_name != '') {
-        	$rootScope.back();
-        } else {
-        	$state.go('app.cstj.account.houseKeepAccount');
-        }
+//		if ($rootScope.previousState_name != '') {
+//        	$rootScope.back();
+//        } else {
+        	$state.go('app.storage.account.houseKeepAccount', {account: null, type: null, 
+    			findPage: $stateParams.findPage, findSearch: $stateParams.findSearch});
+//        }
     }
 });

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

@@ -17,9 +17,20 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 
 	// 获取列表数据
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	if ($stateParams.findPage != null && $stateParams.findPage != "") {
+		var findP = angular.fromJson($stateParams.findPage);
+		$scope.pageInfo.pageNum = findP.pageNum;
+		$scope.pageInfo.pageSize = findP.pageSize;
+	}
 	$scope.search = {ch:"", hwh:"", lspz:"", lsxz:"", startDate:"", endDate:"", wjh:"", zy:""};
-			$scope.isArchive = false;
-			$scope.isArchiveHouse = 0;
+	if ($stateParams.findSearch != null && $stateParams.findSearch != "") {
+		$scope.search = angular.fromJson($stateParams.findSearch);
+		$("#startDate").val($scope.search.startDate);
+		$("#endDate").val($scope.search.endDate);
+	}
+
+	$scope.isArchive = false;
+	$scope.isArchiveHouse = 0;
 	$scope.loadData = function() {
 		//归档用
 		if($stateParams.dataState == "archive"){
@@ -57,8 +68,8 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 					$scope.search.hwh = $scope.fcbgz.hwh;
 					$scope.search.lspz = parseInt($scope.fcbgz.pz);
 					$scope.search.hwxz = parseInt($scope.fcbgz.hwxz);
-					$scope.search.startDate = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");
-					$scope.search.endDate = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");
+					$scope.search.startDate = $filter('date')($scope.fcbgz.rqs, "yyyy-MM-dd");
+					$scope.search.endDate = $filter('date')($scope.fcbgz.rqs, "yyyy-MM-dd");
 					$scope.search.wjh = $scope.fcbgz.wjh;
 					$scope.search.zy = $scope.fcbgz.zy;
 				} else {
@@ -88,8 +99,8 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 				$scope.search.hwh = $scope.fcbgz.hwh;
 				$scope.search.lspz = parseInt($scope.fcbgz.pz);
 				$scope.search.hwxz = parseInt($scope.fcbgz.hwxz);
-				$scope.search.startDate = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");
-				$scope.search.endDate = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");
+				$scope.search.startDate = $filter('date')($scope.fcbgz.rqs, "yyyy-MM-dd");
+				$scope.search.endDate = $filter('date')($scope.fcbgz.rqs, "yyyy-MM-dd");
 				$scope.search.wjh = $scope.fcbgz.wjh;
 				$scope.search.zy = $scope.fcbgz.zy;
 			} else {
@@ -109,7 +120,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 				console.log(data);
 			});
 
-			$scope.loadWare(null);
+			$scope.loadWare($scope.search.ch);
 		}
 		//加载打印区域的数据
 		keepAccountService.getPageInfo(null, null, $scope.search).then(function(data){
@@ -153,7 +164,10 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 		 * type 操作类型：0：记账，1：审核，2：查看
 		 * 此处是记账功能，所以type写死为0
 		 */
-		$state.go('app.cstj.account.keepVoucher.edit', {account: angular.toJson(event), type: 0});
+		event = angular.toJson(event);
+		$state.go('app.storage.account.keepDetailedAccount.edit', {account: event, type: 0, 
+			findPage: angular.toJson($scope.pageInfo), 
+			findSearch: angular.toJson($scope.search)});
 	}
 	// 翻页
 	$scope.goPage = function(pageNum) {
@@ -181,57 +195,8 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 	    }
 	};
 	
-})
-//记账凭证列表
-.controller('keepVoucherCtrl', function($scope, $state,	 $stateParams, $rootScope, warehouseService, keepVoucherService) {
-
-	// 获取列表数据
-	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.search = {ch:"", hwh:""};
-
-	// 获取货位列表
-	$scope.loadWare = function() {
-		if ($scope.search.ch != null && $scope.search.ch != "") {
-			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.search.ch, "0").then(function(data){
-				//$scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
-				$scope.warelist = data.wareList;  //下拉列表数据
-			},function(data){
-				console.log(data);
-			});
-		} else {
-			$scope.warelist = null;
-			$scope.search.hwh = null;
-		}
-	}
-
-	$scope.loadData = function () {
-		keepVoucherService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
-			$scope.pageInfo = data;
-		}, function (data) {
-			console.log(data);
-		});
-	}
-	$scope.loadData();
-
-	// 翻页
-	$scope.goPage = function(pageNum) {
-		$scope.pageInfo.pageNum = pageNum;
-		$scope.loadData();
-	}
-
-	//页面跳转
-	$scope.edit = function(account, type) {
-		$state.go('app.cstj.account.keepVoucher.edit',{account:angular.toJson(account), type:type});
-	}
-
-	//打印
-	$scope.print = function() {
-		$("#print").printArea();
-	}
-
-})
-//记账凭证详情(保管明细账记账)
-.controller('keepVoucherEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService) {
+})//记账凭证详情(跟保管明细账记账同一个页面)
+.controller('keepDetailedAccountEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService) {
 
 	/*----初始化页面数据------start----*/
 	/**
@@ -303,7 +268,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 	$scope.submit = function () {
 		keepVoucherService.submit($scope.accountInfo).then(function (data) {
 			alert(data.msg);
-			$state.go('app.cstj.account.keepVoucher');
+			$scope.retList();
 		}, function (data) {
 			console.log(data);
 		});
@@ -311,7 +276,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 
 	//取消按钮
 	$scope.retList = function () {
-		$state.go('app.cstj.account.keepVoucher');
+		$state.go('app.storage.account.keepDetailedAccount', {findPage: $stateParams.findPage, findSearch: $stateParams.findSearch});
 	}
 
 });

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

@@ -6,7 +6,17 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 
 	// 获取列表数据
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	if ($stateParams.findPage != null && $stateParams.findPage != "") {
+		var findP = angular.fromJson($stateParams.findPage);
+		$scope.pageInfo.pageNum = findP.pageNum;
+		$scope.pageInfo.pageSize = findP.pageSize;
+	}
 	$scope.search = {lspz:"", lsxz:"", startDate:"", endDate:""};
+	if ($stateParams.findSearch != null && $stateParams.findSearch != "") {
+		$scope.search = angular.fromJson($stateParams.findSearch);
+		$("#startDate").val($scope.search.startDate);
+		$("#endDate").val($scope.search.endDate);
+	}
 	$scope.loadData = function() {
 		if($scope.search.lsxz != undefined && $scope.search.lsxz != ""){
 			$scope.search.lsxz = $scope.search.lsxz[0].id;
@@ -109,12 +119,14 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 
 				account.id === data.obj.id;
 
-				$state.go('app.cstj.account.keepTotalAccount.keepTotalAccountEdit',{account:angular.toJson(account), butType:butType});
+				$state.go('app.storage.account.keepTotalAccount.keepTotalAccountEdit',{account:angular.toJson(account), butType:butType,
+					findPage: angular.toJson($scope.pageInfo), 
+					findSearch: angular.toJson($scope.search)});
 			},function(data){
 		        console.log(data);
 		    });
 		} else { //分仓账
-			$state.go('app.cstj.account.houseKeepAccount',{account:angular.toJson(account), type:butType});
+			$state.go('app.storage.account.houseKeepAccount',{account:angular.toJson(account), type:butType});
 		}
 	}
 	//打印
@@ -202,10 +214,6 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 	
 	//返回
     $scope.retList = function () {
-		if ($rootScope.previousState_name != '') {
-        	$rootScope.back();
-        } else {
-        	$state.go('app.cstj.account.keepTotalAccount');
-        }
+    	$state.go('app.storage.account.keepTotalAccount', {findPage: $stateParams.findPage, findSearch: $stateParams.findSearch});
     }
 });

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

@@ -0,0 +1,147 @@
+"use strict";
+
+//记账凭证列表
+angular.module('app.storage').controller('keepVoucherCtrl', 
+		function($scope, $state, $stateParams, $rootScope, warehouseService, keepVoucherService) {
+
+	// 获取货位列表
+	$scope.loadWare = function() {
+		if ($scope.search.ch != null && $scope.search.ch != "") {
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.search.ch, "0").then(function(data){
+				//$scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
+				$scope.warelist = data.wareList;  //下拉列表数据
+			},function(data){
+				console.log(data);
+			});
+		} else {
+			$scope.warelist = null;
+			$scope.search.hwh = null;
+		}
+	}
+
+	// 获取列表数据
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	if ($stateParams.findPage != null && $stateParams.findPage != "") {
+		var findP = angular.fromJson($stateParams.findPage);
+		$scope.pageInfo.pageNum = findP.pageNum;
+		$scope.pageInfo.pageSize = findP.pageSize;
+	}
+	$scope.search = {ch:"", hwh:""};
+	if ($stateParams.findSearch != null && $stateParams.findSearch != "") {
+		$scope.search = angular.fromJson($stateParams.findSearch);
+		$scope.loadWare();
+	}
+
+	$scope.loadData = function () {
+		keepVoucherService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+			$scope.pageInfo = data;
+		}, function (data) {
+			console.log(data);
+		});
+	}
+	$scope.loadData();
+
+	// 翻页
+	$scope.goPage = function(pageNum) {
+		$scope.pageInfo.pageNum = pageNum;
+		$scope.loadData();
+	}
+
+	//页面跳转
+	$scope.edit = function(account, type) {
+		$state.go('app.storage.account.keepVoucher.edit',{account:angular.toJson(account), butType:type,
+			findPage: angular.toJson($scope.pageInfo), 
+			findSearch: angular.toJson($scope.search)});
+	}
+
+	//打印
+	$scope.print = function() {
+		$("#print").printArea();
+	}
+
+})
+//记账凭证详情(跟保管明细账记账同一个页面)
+.controller('keepVoucherEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService) {
+
+	/*----初始化页面数据------start----*/
+	/**
+	 * type判断说明如下：
+	 * 操作类型：0：记账，1：审核，2：查看
+	 */
+	if ($stateParams.butType != "0") {
+		//查询后台已保存的数据
+		$scope.accountInfo = angular.fromJson($stateParams.account);
+
+		if ($stateParams.butType == 1) {//审核功能加载
+			$scope.accountInfo.shr = $rootScope.userInfo.realName;
+			$scope.accountInfo.shsj = $filter('date')(new Date(), "yyyy-MM-dd");
+		} else if ($stateParams.butType == "2") {
+			$scope.isNotEdit = true;
+		}
+	} else {//记账的默认加载方式如下
+		$scope.accountObj = angular.fromJson($stateParams.account);
+		$scope.accountInfo = {};
+		//查询这个保管明细账数据有没有记过账，有就按照修改走，没有就按新数据走
+		keepVoucherService.findByCondition($scope.accountObj.dataid).then(function (data) {
+			$scope.jz_list = data;
+			if ($scope.jz_list.length > 0) {
+				$scope.accountInfo.id = $scope.jz_list[0].id;
+			}
+			$scope.accountInfo.orgId = $scope.accountObj.unitid;
+			$scope.accountInfo.ch = $scope.accountObj.ch;
+			$scope.accountInfo.hwh = $scope.accountObj.hwh;
+			$scope.accountInfo.lkmc = $rootScope.orgInfo.orgName;
+			$scope.accountInfo.rq = $scope.accountObj.rq;
+			$scope.accountInfo.yDataid = $scope.accountObj.dataid;
+			$scope.accountInfo.lyxz = $rootScope.dicData[$scope.accountObj.hwxz];
+			$scope.accountInfo.lypz = $rootScope.dicData[$scope.accountObj.pz];
+			$scope.accountInfo.lydj = $rootScope.dicData[$scope.accountObj.dj];
+			$scope.accountInfo.sf = $scope.accountObj.bpsf;
+			$scope.accountInfo.zz = $scope.accountObj.bpzz;
+			$scope.accountInfo.lqss = $scope.accountObj.lqgs;
+			if ($scope.accountObj.srsl > 0) {
+				$scope.accountInfo.ywlx = "入库";
+				$scope.accountInfo.sjsl = $scope.accountObj.srsl;
+			} else {
+				$scope.accountInfo.ywlx = "出库";
+				$scope.accountInfo.sjsl = $scope.accountObj.zcsl;
+			}
+			$scope.accountInfo.ccfs = "散装储存";
+			$scope.accountInfo.glfs = "直储";
+			$scope.accountInfo.rcfs = "机械方式";
+			$scope.accountInfo.rcfs = "机械方式";
+			$scope.accountInfo.jzr = $rootScope.userInfo.realName; //记账人
+			$scope.accountInfo.jzsj = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
+			//通过仓房ID带出的保管员
+			keeperService.getKeeperNamesByHouseId($scope.accountObj.ch).then(function (data) {
+				$scope.accountInfo.bgy = data.keeperNames;
+			}, function (data) {
+				console.log(data);
+			});
+		}, function (data) {
+			console.log(data);
+		});
+
+
+		//记账时，审核人、审核时间、审核意见不可见
+		$scope.sh_th = true;
+		$scope.sh_th = true;
+	}
+	/*----初始化页面数据------end----*/
+
+	//提交按钮
+	$scope.submit = function () {
+		keepVoucherService.submit($scope.accountInfo).then(function (data) {
+			alert(data.msg);
+			$scope.retList();
+		}, function (data) {
+			console.log(data);
+		});
+	}
+
+	//取消按钮
+	$scope.retList = function () {
+		$state.go('app.storage.account.keepVoucher', {findPage: $stateParams.findPage, findSearch: $stateParams.findSearch});
+	}
+
+});

src/main/resources/static/app/storage/controller/numberManage/sheetCtrl.js

@@ -67,7 +67,7 @@ angular.module('app.business').controller("sheetCtrl", function($scope,$rootScop
     // 查看页面
     $scope.showView = function(id) {
         if($stateParams.jumpType == "DT"){//动态粮情统计
-            $state.go("app.jczcsupervise.decisionSupport.dynamicFoodDetail",{id : id});
+            $state.go("app.supervise.decisionSupport.dynamicFoodDetail",{id : id});
         }else if($stateParams.jumpType == "KC"){//库存统计
             $state.go("app.supervise.storage.inventoryDetails",{id : id});
         }else{