结算管理

.gitignore

@@ -36,3 +36,4 @@ yarn-error.log*
 *.sln
 *.sw?
 云南智能化粮库系统使用手册.pdf
+/target/

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

@@ -0,0 +1,138 @@
+"use strict";
+//器材信息
+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.top_title = "入库结算列表";
+    } else if ($scope.jslx == "1") {
+    	$scope.top_title = "出库结算列表";
+    }
+     $scope.pageInfo = {pageNum : 1, pageSize : 10};
+     $scope.search = {houseId:null, wareId: null};
+	 $scope.loadData = function() {
+		 jsglService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $stateParams.jslx, $scope.search).then(function(data){
+			 $scope.pageInfo = data;
+	     },function(data){
+	         console.log(data);
+	     });
+	 }
+	 $scope.loadData();
+
+	 $scope.loadWare = function(houseId) {
+		//按照单位获取单位下的仓房信息
+		if (null == houseId) {
+			$scope.warehouseList = null;
+		} else {
+			var orgId = $rootScope.orgInfo.orgId;
+			warehouseService.getStorehouse(orgId, houseId, "0").then(function(data){
+				$scope.warehouseList = data.wareList;  //下拉列表数据
+			},function (data) {
+				console.log(data);
+			});
+		}
+	}
+	// 翻页
+    $scope.goPage = function(pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    }
+
+	//新增、查看、修改
+    $scope.edit = function(id, butType) {
+    	$state.go('app.business.rkjslist.edit',{id:id, butType:butType, jslx: $stateParams.jslx});
+    }
+
+    //删除
+    $scope.remove = function(id) {
+    	if (!confirm("确定要删除吗？")) {
+            return;
+        }
+    	jsglService.remove(id).then(function(data){
+    		$scope.loadData();
+	    },function(data){
+	         console.log(data);
+	    });
+    }
+
+})
+.controller("jsglEditCtrl", function($scope, $http, $filter, $state, $rootScope, $stateParams, APP_CONFIG, jsglService, warehouseService) {
+    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.retList = function () {
+        if ($rootScope.previousState_name != '') {
+        	$rootScope.back();
+        } else {
+        	if ($scope.jslx=="0") {
+        		$state.go('app.business.rkjslist');
+        	} else if ($scope.jslx=="1") {
+        		$state.go('app.business.ckjslist');
+        	}
+        }
+    }
+
+    //保存(0:保存,1:提交)
+    $scope.save = function(czlx) {
+    	$scope.jsgl.dataStatus = czlx;
+    	jsglService.saveData($scope.jsgl).then(function(data){
+			if (data.status == "200") {
+				alert("操作成功！");
+			} else {
+				alert("操作失败！");
+			}
+			if ($scope.jslx=="0") {
+        		$state.go('app.business.rkjslist');
+        	} else if ($scope.jslx=="1") {
+        		$state.go('app.business.ckjslist');
+        	}
+	    },function(data){
+	        console.log(data);
+	    });
+    }
+})

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

@@ -1,74 +0,0 @@
-"use strict";
-//器材信息
-angular.module('app.business')
-    .controller("rkjsCtrl", function($scope, $http, $state, $rootScope, jsglService, $stateParams, APP_CONFIG) {
-    // 获取列表数据
-     $scope.pageInfo = {pageNum : 1, pageSize : 10};
-     $scope.search = {houseId:null, wareId: null};
-	 $scope.loadData = function() {
-		 jsglService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, '0', $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(id, butType) {
-    	$state.go('app.business.rkjslist.edit',{id:id, butType:butType});
-    }
-
-    //删除
-    $scope.remove = function(id) {
-    	if (!confirm("确定要删除吗？")) {
-            return;
-        }
-    	jsglService.remove(id).then(function(data){
-    		$scope.loadData();
-	    },function(data){
-	         console.log(data);
-	    });
-    }
-
-})
-.controller("rkjsEditCtrl", function($scope, $http, $state, $rootScope, jsglService, $stateParams, APP_CONFIG) {
-    var id = $stateParams.id;
-    var butType = $stateParams.butType;
-    var isNotEdit = false;//大多数文本框
-    var isEdit = false;//少数要控制的文本框
-    
-	// 获取列表数据
-	$scope.loadData = function() {
-		jsglService.findBykey($stateParams.id).then(function(data){
-			$scope.jsgl = data;
-	    },function(data){
-	        console.log(data);
-	    });
-	}
-
-	if (null != id) {
-    	if (butType == "show") {//查看
-    		isNotEdit = true;
-    		isEdit = true;
-        } else {
-        	isEdit = true;
-        }
-    	$scope.loadData();
-    }
-	
-	// 返回.
-    $scope.retList = function () {
-        if ($rootScope.previousState_name != '') {
-        	$rootScope.back();
-        } else {
-        	$state.go('app.business.rkjslist');
-        }
-    }
-})

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

@@ -1,93 +0,0 @@
-<!-- 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">
-										<label>
-											<select ng-model="search.houseId" class="form-control input-sm" 
-												ng-options="store.storehouseId as store.storehouseName for store in storelist" 
-												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 warelist">
-												<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>{{warehouseObj[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 has-permission="517" href-void ng-click="edit(data.id, 'update')"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
-                        			<a has-permission="518" href-void ng-click="remove(data.id)"><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/rkjs-edit.html

@@ -12,7 +12,7 @@
 									<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>
+									&nbsp;<strong>{{top_title}}</strong>
 									<span class="pull-right font-xs">带*的部分必须填写</span>
 								</header>
 								
@@ -22,7 +22,7 @@
                                         <section class="col col-4">
                                             <label class="label">合同信息<span style="color: red;">*</span></label>
                                             <label class="select"> 
-                                            	<select ng-model="jsgl.htid" ng-disabled="isNotEdit" name="htid"
+                                            	<select ng-model="jsgl.htid" ng-disabled="isEdit" name="htid"
                                              	ng-options="enum.enumid as enum.enumname for enum in dicDataList[5498]" required >
                                              		<option value="">--请选择合同--</option><i></i>
                                              	</select><i></i>
@@ -47,7 +47,7 @@
                                         <section class="col col-4">
                                             <label class="label">仓房名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                            	<select ng-model="jsgl.houseId" ng-disabled="isNotEdit" name="houseId" 
+                                            	<select ng-model="jsgl.houseId" ng-disabled="true" name="houseId" ng-change="loadWare(jsgl.houseId)"
                                              	ng-options="store.storehouseId as store.storehouseName for store in store_tank_list" required >
                                              		<option value="">--请选择--</option><i></i>
                                              	</select><i></i>
@@ -56,8 +56,8 @@
 										<section class="col col-4">
                                             <label class="label">货位名称<span style="color: red;">*</span></label>
                                             <label class="select"> 
-                                            	<select ng-model="jsgl.warehouseId" ng-disabled="isNotEdit" name="warehouseId" 
-                                             	ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required >
+                                            	<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>
@@ -65,8 +65,8 @@
                                         <section class="col col-4">
                                             <label class="label">粮油品种<span style="color: red;">*</span></label>
                                             <label class="select"> 
-                                            	<select ng-model="jsgl.lypz" ng-disabled="isNotEdit" name="lypz" 
-                                             	ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required >
+                                            	<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>
@@ -118,11 +118,23 @@
                                     	<section class="col col-4">
                                             <label class="label">本次结算时间<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input type="text" ng-model="jsgl.bcjssl" ng-readonly="isNotEdit" required
+                                                <input type="text" ng-model="jsgl.bcjssj" ng-readonly="isNotEdit" required
                                                 name="yjssl" 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>
@@ -130,22 +142,44 @@
                                         <section class="col col-12">
                                             <label class="label">连续发票号码填写<span style="color: red;">*</span></label>
                                             <label class="input"> 
-                                                <input type="text" ng-model="jsgl.fpStart" ng-readonly="isNotEdit" required
-                                                name="fpStart" placeholder="" />
-                                            </label>——
-                                            <label class="input"> 
-                                                <input type="text" ng-model="jsgl.fpEnd" ng-readonly="isNotEdit" required
-                                                name="fpEnd" /><span style="color: red;">说明:连续发票号码，请填写第一张和最后一张即可</span>
+                                            	<div>
+                                            	<table border="0">
+                                            	    <tr>
+                                            	        <td>
+                                            	             <input type="text" ng-model="jsgl.fpStart" ng-readonly="isNotEdit" required name="fpStart" placeholder="" />
+                                            	        </td>
+                                            	        <td><span>&nbsp;——&nbsp;</span></td>
+                                            	        <td>
+                                            	             <input type="text" ng-model="jsgl.fpEnd" ng-readonly="isNotEdit" required 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
-                                            rows="5" ng-model="drugInfo.cctj" name="cctj" ng-disabled="issyz"
-                                            oninput="if(value.length>255) value=value.slice(0,255)" placeholder="多个发票号码填写，请用英文近号进行间隔。例如:1234567890,123456788"></textarea>
+                                        <label class="textarea textarea-resizable"> 
+                                          <textarea
+                                            rows="5" ng-model="drugInfo.cctj" name="cctj" ng-disabled="issyz" class="custom-scroll"
+                                            oninput="if(value.length>255) value=value.slice(0,255)" placeholder="多个发票号码填写，请用英文近号进行间隔。例如:1234567890,123456788,最大255个字符">
+                                          </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="">--请选择--</option>
+                                         		<option value="0">作废</option>
+                                         		<option value="1">正常</option>
+                                         	</select>
+                                     	</label>
+                                    </section>
+                                    </div>
                                 </fieldset>
                                 <header><strong>收付款信息</strong></header>
                                 <fieldset>
@@ -153,21 +187,21 @@
                                         <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" ng-readonly="isNotEdit"
+                                                <input class="form-control" type="text" ng-model="jsgl.sfkr" ng-readonly="true"
                                                 name="sfkr" 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="jsgl.khhmc" ng-readonly="isNotEdit"
+                                                <input class="form-control" type="text" ng-model="jsgl.khhmc" ng-readonly="true"
                                                 name="khhmc" 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.khhh" ng-readonly="isNotEdit" required
+                                                <input type="text" ng-model="jsgl.khhh" ng-readonly="true" required
                                                 name="khhh" placeholder="" />
                                             </label>
                                         </section>
@@ -176,22 +210,20 @@
                                         <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="isNotEdit"
+                                                <input class="form-control" type="text" ng-model="jsgl.yhzh" ng-readonly="true"
                                                 name="yhzh" placeholder="" required />
                                             </label>
                                         </section>
-                                        <section class="col col-4">
+                                        <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="isNotEdit"
-                                                name="skrsfzh" placeholder="" />
+                                                <input class="form-control" type="text" ng-model="jsgl.skrsfzh" ng-readonly="true" name="skrsfzh" placeholder="" />
                                             </label>
                                         </section>
-                                        <section class="col col-4">
+                                        <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" ng-readonly="isNotEdit" required
-                                                name="fkdw" placeholder="" />
+                                                <input type="text" ng-model="jsgl.fkdw" name="fkdw" ng-readonly="isNotEdit" required placeholder="" />
                                             </label>
                                         </section>
                                     </div>
@@ -199,9 +231,9 @@
 
                                 <div><!--class="form-actions"-->
                                     <footer class="text-align-center">
-                                        <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>
                                         <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>

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

@@ -8,7 +8,7 @@
                 <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>
+                        <h2>{{top_title}} </h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -28,7 +28,7 @@
 										</label>
 										<label>
 											<select ng-model="search.wareId" class="form-control input-sm" 
-												ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+												ng-options="ware.warehouseId as ware.warehouseName for ware in warehouseList">
 												<option value="">--货位名称--</option>
 											</select>&emsp;
 										</label>
@@ -69,7 +69,7 @@
 								<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
 								<td>{{data.htbh}}</td>
 								<td>{{storehouseObj[data.houseId].storehouseName}}</td>
-								<td>{{warehouseObj[data.warehouseId].warehouseName}}</td>
+								<td>{{wares[data.warehouseId].warehouseName}}</td>
 								<td>{{dicData[data.mxpz]}}</td>
 								<td>{{data.bcjssl}}</td>
 								<td>{{data.bcjsdj}}</td>

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

@@ -1155,23 +1155,26 @@ angular.module('app.business')
         	data: {
         		title: '入库结算管理'
         	},
+        	params:{
+        		jslx: '0'
+        	},
         	views: {
         		"content@app": {
-        			controller: 'rkjsCtrl',
-        			templateUrl: 'app/business/jsgl/view/rkjs-list.html'
+        			controller: 'jsglCtrl',
+        			templateUrl: 'app/business/jsgl/view/jsgl-list.html'
         		}
         	}
         })
 
         .state('app.business.rkjslist.edit', {
-            url: '/business/rkjslist/edit/:id/:butType',
+            url: '/business/rkjslist/edit/:id/:butType/:jslx',
             data: {
                 title: '入库结算详情'
             },
             views: {
                 "content@app": {
-                    controller: 'rkjsEditCtrl',
-                    templateUrl: 'app/business/jsgl/view/rkjs-edit.html'
+                    controller: 'jsglEditCtrl',
+                    templateUrl: 'app/business/jsgl/view/jsgl-edit.html'
                 }
             }
         })
@@ -1181,10 +1184,13 @@ angular.module('app.business')
         	data: {
         		title: '出库结算管理'
         	},
+        	params:{
+        		jslx: '1'
+        	},
         	views: {
         		"content@app": {
-        			controller: 'ckjsCtrl',
-        			templateUrl: 'app/business/jsgl/view/ckjs-list.html'
+        			controller: 'jsglCtrl',
+        			templateUrl: 'app/business/jsgl/view/jsgl-list.html'
         		}
         	}
         })
@@ -1196,8 +1202,8 @@ angular.module('app.business')
             },
             views: {
                 "content@app": {
-                    controller: 'ckjsEditCtrl',
-                    templateUrl: 'app/business/jsgl/view/ckjs-edit.html'
+                    controller: 'jsglEditCtrl',
+                    templateUrl: 'app/business/jsgl/view/jsgl-edit.html'
                 }
             }
         })

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

@@ -215,16 +215,16 @@ angular.module('app.intelligent')
         },"不能填写无，暂无,空等选项！");
         
         // 自定义验证:散气日期
-        $.validator.addMethod("sqrq",function(value,element, params) {
-        	var xzkssj = $filter('date')($scope.fumigation.fumigationStart.substring(0,10), "yyyy-MM-dd");
-        	var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
-        	var sqrq = $filter('date')(value, "yyyy-MM-dd");
-            if(sqrq >= xzjssj || sqrq <= xzkssj){
-                return this.optional(element)|| false;
-            }else{
-                return this.optional(element)|| true;
-            }
-        },"散气日期必须在熏蒸开始时间与结束时间范围内，且不可等于！");
+//        $.validator.addMethod("sqrq",function(value,element, params) {
+//        	var xzkssj = $filter('date')($scope.fumigation.fumigationStart.substring(0,10), "yyyy-MM-dd");
+//        	var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
+//        	var sqrq = $filter('date')(value, "yyyy-MM-dd");
+//            if(sqrq >= xzjssj || sqrq <= xzkssj){
+//                return this.optional(element)|| false;
+//            }else{
+//                return this.optional(element)|| true;
+//            }
+//        },"散气日期必须在熏蒸开始时间与结束时间范围内，且不可等于！");
 
         // 返回.
         $scope.retList = function () {
@@ -524,16 +524,16 @@ angular.module('app.intelligent')
         },"不能填写无，暂无,空等选项！");
         
         // 自定义验证
-        $.validator.addMethod("czsjzysj",function(value,element, params) {
-        	var sqrq = $filter('date')($scope.fumigationProcess.perforatedDate.substring(0,10), "yyyy-MM-dd");
-        	var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
-        	var czsjzysj = $filter('date')($("input[name='residueCollectionTime']").val(), "yyyy-MM-dd");
-            if(czsjzysj <= sqrq || czsjzysj >= xzjssj){
-                return this.optional(element)|| false;
-            }else{
-                return this.optional(element)|| true;
-            }
-        },"残渣收集作业时间必须大于散气日期！");
+//        $.validator.addMethod("czsjzysj",function(value,element, params) {
+//        	var sqrq = $filter('date')($scope.fumigationProcess.perforatedDate.substring(0,10), "yyyy-MM-dd");
+//        	var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
+//        	var czsjzysj = $filter('date')($("input[name='residueCollectionTime']").val(), "yyyy-MM-dd");
+//            if(czsjzysj <= sqrq || czsjzysj >= xzjssj){
+//                return this.optional(element)|| false;
+//            }else{
+//                return this.optional(element)|| true;
+//            }
+//        },"残渣收集作业时间必须大于散气日期！");
 
         // 返回.
         $scope.retList = function () {