1

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

@@ -734,7 +734,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
         $scope.iddetailInfo();*/
         
      // 修改时弹出模态窗,通知单只能修改数量.
-        $scope.editRow = function(detailInfo,$event,deliveryStorageNotice) {
+        $scope.editRow = function(detailInfo,$event,deliveryStorageNotice, buttype) {
             var copyId = $($event.target).parent().parent().find("td:first").text();
             var count = detailInfo.inCount;
             var countAnother = detailInfo.outCount;
@@ -806,6 +806,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 	    		params.planRemainingNumber = detailInfo.planRemainingNumber;  //计划的剩余数量
 	    		params.planOutRemainingNumber = detailInfo.planOutRemainingNumber;  //计划的剩余数量
 	    		params.copyId = copyId;
+	    		params.buttype = buttype;
 	    		if (detailInfo.crktype == 3) {//出库
 	    			if (detailInfo.ywtype == "2" || detailInfo.ywtype == "4") {//销售=竞价
 	    				if (detailInfo.htbh == null) {

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

@@ -155,7 +155,7 @@
 													<th data-hide="expand" align="center" width="8%">剩余数量(吨)</th>
 													<th data-hide="expand" align="center" width="8%">单价(元/吨)</th>
 													<th data-hide="expand" align="center" width="7%">金额(元)</th>
-													<th data-hide="expand" align="center" width="10%" ng-hide="isNotEdit">操作</th>
+													<th data-hide="expand" align="center" width="10%">操作</th>
 														
 												</tr>
 											</thead>
@@ -187,11 +187,11 @@
 													<td>{{detailInfo.outRemainingNumber}}</td>
 													<td>{{detailInfo.outPrice}}</td>
 													<td>{{detailInfo.outDetailTotalPrice}}</td>
-													<td ng-hide="isNotEdit">
+													<td>
+														<a ng-hide="isNotEdit" class="btn btn-primary"
+															ng-click="editRow(detailInfo,$event,deliveryStorageNotice,'edit')">编辑</a>
 														<a class="btn btn-primary"
-															ng-click="editRow(detailInfo,$event,deliveryStorageNotice)">编辑</a>
-<!-- 														<a class="btn btn-primary" -->
-<!-- 															ng-click="deleteRow(detailInfo)">删除</a> -->
+															ng-click="editRow(detailInfo,$event,deliveryStorageNotice,'show')">查看</a>
 													</td>
 												</tr>
 											</tbody>

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

@@ -159,7 +159,7 @@
 													<th data-hide="expand" align="center" width="8%">剩余数量(吨)</th>
 													<th data-hide="expand" align="center" width="8%">单价(元/吨)</th>
 													<th data-hide="expand" align="center" width="7%">金额(元)</th>
-													<th data-hide="expand" align="center" width="10%" ng-hide="isNotEdit">操作</th>
+													<th data-hide="expand" align="center" width="10%">操作</th>
 												</tr>
 											</thead>
 											<tbody>
@@ -191,13 +191,11 @@
 													<td id="nums_{{$index+1}}">{{detailInfo.inCount}}</td> 
 													<td>{{detailInfo.remainingNumber}}</td>
 													<td>{{detailInfo.inPrice}}</td>
-													<td>{{detailInfo.inDetailTotalPrice}}</td>  
+													<td>{{detailInfo.inDetailTotalPrice}}</td>
 
-													<td ng-hide="isNotEdit">
-														<a class="btn btn-primary"
-															ng-click="editRow(detailInfo,$event,deliveryStorageNotice)">编辑</a>
-<!-- 														<a class="btn btn-primary" -->
-<!-- 															ng-click="deleteRow(detailInfo)">删除</a> -->
+													<td>
+														<a ng-hide="isNotEdit" class="btn btn-primary" ng-click="editRow(detailInfo,$event,deliveryStorageNotice, 'edit')">编辑</a>
+														<a class="btn btn-primary" ng-click="editRow(detailInfo,$event,deliveryStorageNotice, 'show')">查看</a>
 													</td>
 												</tr>
 											</tbody>

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

@@ -329,6 +329,7 @@ angular.module('app.business')
 		jsglService.findBykey($stateParams.id).then(function(data){
 			$scope.jsgl = data;
 			$scope.jsgl.orgId = $rootScope.orgInfo.orgId;
+			$scope.sfkr_list = $scope.jsgl.khxxlist;
 			$scope.loadWare($scope.jsgl.houseId);
             if ("" != id) {
                 if (butType != "show") {
@@ -418,16 +419,15 @@ angular.module('app.business')
         });
 	}
 
-	// 选择个人客户.
-    $scope.getCustomer = function(id) {
-        if (id == null) {
+	// 选择收款人信息.
+    $scope.getSkrData = function(id) {
+        if ($scope.jsgl.htbh != null) {
         	var params = [];
-            params.type = "addBlacklist"; //不是黑名单人员
-            params.classify = 3152;
+            params.tzdbh = $scope.jsgl.htbh; //通知单编号
             var uibModalInstance = $uibModal.open({
                 size:'lg',
-                templateUrl: 'app/business/util/views/customer-list-modal.html',
-                controller: 'customerListModalCtrl',
+                templateUrl: 'app/business/jsgl/views/crkjl-model-list.html',
+                controller: 'selectCyrDataModalCtrl',
                 resolve: {
                     // items是一个回调函数
                     items: function () {
@@ -438,62 +438,80 @@ angular.module('app.business')
             });
             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;
+                	$scope.sfkr_list = result;
+                    $scope.jsgl.khxxlist = result;
+                    $scope.jsgl.khxxlist.forEach(obj => {
+                    	  delete obj.bizno;
+                    	  delete obj.checked;
+                    });
+                    //计算本次结算数量
+                    var bcjssl = 0;
+                    bcjssl = $scope.sfkr_list.reduce((sum, slkhxx) => sum + slkhxx.crksl, 0);
+                    $scope.jsgl.bcjssl = bcjssl/1000;
+                    $scope.calculate();//计算本次结算金额
                 }
                 // 关闭模态框时刷新页面数据
             }, 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);
-			});
         }
     }
 
+    $.validator.addMethod("checkKhhh",function(value,element, params) {
+    	var checkNumber = /(^[0-9]{1,12}$)/g;
+    	return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的开户行号");
+    $.validator.addMethod("checkSfzhm",function(value,element, params) {
+    	var checkNumber = /(^\d{18}$)|(^\d{17}(\d|X)$)/g;
+    	return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的身份证号码,且不能重复！");
+
+    $.validator.addMethod("checkYhzh",function(value,element, params) {
+    	var checkNumber = /^[0-9]{1,30}$/g;
+    	return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的银行账号！");
+
+    //散粮客户信息保存
+    $scope.saveKhxx = function(ite) {
+    	if (ite.sfkr != null && ite.skrsfzh != null && ite.sfkr != undefined && ite.skrsfzh != undefined) {
+    		var obj = {};
+    		obj.khmc = ite.sfkr;
+    		obj.sfzhm = ite.skrsfzh;
+    		obj.khhmc = ite.khhmc;
+    		obj.yhhbdm = ite.yhhbdm;
+    		obj.khhh = ite.khhh;
+    		obj.yhzh = ite.yhzh;
+    		jsglService.saveOrUpdateSlkhxx(obj).then(function(data){
+    			if (data.status == "200") {
+    				alert("操作成功！");
+    			} else {
+    				alert("操作失败！");
+    			}
+    	    },function(data){
+    	        console.log(data);
+    	    });
+    	} else {
+    		alert("收款人和身份证号不能为空");
+    	}
+    }
+
+    //点击收款人或身份证号码带出散粮客户信息
+    $scope.checkSlKhxx = function(ite) {
+    	if (ite.sfkr != null && ite.skrsfzh != null && ite.sfkr != undefined && ite.skrsfzh != undefined) {
+    		jsglService.queryStorageSlkhxx(ite.sfkr, ite.skrsfzh).then(function(data){
+    			if (data.status == "200") {
+    				var slkhxx = data.msg;
+    				ite.khhmc = slkhxx.khhmc;
+    				ite.yhhbdm = slkhxx.yhhbdm;
+    				ite.khhh = slkhxx.khhh;
+    				ite.yhzh = slkhxx.yhzh;
+    			}
+    	    },function(data){
+    	        console.log(data);
+    	    });
+    	}
+    }
+
     /**
 	 * 计算本次结算金额 = 本次结算数量 * 本次结算单价
 	 * 保留两位小数
@@ -538,25 +556,27 @@ angular.module('app.business')
     //保存(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("连续发票号和不连续发票号至少要录入一种，不能都为空值!");
+    	$scope.isCustomerEdit = $scope.jsgl.bcjsfs=='0'?false:true;
+    	if (null === $scope.jsgl.khxxlist || $scope.jsgl.khxxlist == undefined) {
+    		alert("至少要有一条客户信息!");
     		return;
-    	} else {
-    		if ((fp_s == null && fp_e != null) || (fp_s != null && fp_e == null)) {
-    			alert("连续发票号码不能只录入起始值或只录入终止值!");
+    	}
+    	let sfkr = $scope.jsgl.khxxlist.filter(item => !item.sfkr);
+    	let skrsfzh = $scope.jsgl.khxxlist.filter(item => !item.skrsfzh);
+    	let khhmc = $scope.jsgl.khxxlist.filter(item => !item.khhmc);
+    	let yhzh = $scope.jsgl.khxxlist.filter(item => !item.yhzh);
+    	if ($scope.isCustomerEdit) {//转账
+    		if (sfkr.length != 0 || skrsfzh.length != 0 || khhmc.length != 0 || yhzh.length != 0) {
+    			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("请补全对应客户档案信息!");
+    	} else {
+    		if (sfkr.length != 0 || skrsfzh.length != 0) {
+    			alert("收款人、身份证号不能为空!");
     			return;
     		}
     	}
+
     	var validator = $("#jsgl-sl-form").validate();
     	if (validator.form()) {
     		//本次结算时间
@@ -578,4 +598,45 @@ angular.module('app.business')
     	}
     };
 
+})
+.controller("selectCyrDataModalCtrl", function($scope, $uibModalInstance, $filter, $http, $uibModal, $rootScope, jsglService, APP_CONFIG, items) {
+
+    $scope.search = {tzdbh: items.tzdbh, cph: null, startTime: null, endTime: null};
+    // 获取列表数据
+    $scope.loadData = function() {
+    	var startTime = $("#startTime").val();
+    	var endTime = $("#endTime").val();
+    	$scope.search.startTime = startTime;
+    	$scope.search.endTime = endTime;
+    	jsglService.queryCrkywData($scope.search).then(function(data) {
+            $scope.list = data;
+        }).catch(function(data) {
+            if (data.status == 601) {
+                // session失效，关闭模态框.
+                $uibModalInstance.close();
+            }
+        });
+    }
+
+    $scope.loadData();
+
+    //勾选或取消勾选一条数据
+    $scope.selectData = function(index, obj) {
+    	$scope.list[index].checked = obj.checked;
+    	if (!obj.checked) {
+    		$scope.checkeds = false;
+    	}
+    }
+
+    // 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    }
+
+    // 选择后点下一步.
+    $scope.closeModal = function() {
+    	var arr = $scope.list.filter(item => item.checked); //检索被选中的数据
+        $uibModalInstance.close(arr);
+    }
+
 });

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

@@ -1,12 +1,13 @@
 angular.module('app.business').controller("tzdZjCtrl", 
-	function($scope, $uibModalInstance, $filter, $http, $uibModal,deliveryStorageNoticeService, storeWareDetailService, jsglService, commonUtilService, APP_CONFIG, items) {
+	function($scope, $rootScope, $uibModalInstance, $filter, $http, $uibModal,deliveryStorageNoticeService, storeWareDetailService, jsglService, commonUtilService, APP_CONFIG, items) {
 
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};  
-	$scope.searchCondition = {}; //查询入库的
+	$scope.searchCondition = {orgId : $rootScope.orgInfo.orgId, billType : 1}; //查询入库的
     // 获取列表数据
 	
     $scope.loadData = function() {
-    	deliveryStorageNoticeService.getPassPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.searchCondition).then(function(data){
+    	$scope.searchCondition.billType = 1;
+    	deliveryStorageNoticeService.getGrainPassPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.searchCondition).then(function(data){
             $scope.pageInfo = data;
         },function(data){
             console.log(data);
@@ -38,6 +39,7 @@ angular.module('app.business').controller("tzdZjCtrl",
 	$scope.selectData = function(check) {
 		var datas = {billNumber: check.billNumber, shipingCount: check.shipingCount};
 		storeWareDetailService.getStoreWareDetailList(check.id, 'notice').then(function(data) {
+			datas.id = data[0].zid;
 			datas.houseId = data[0].houseId;
 			datas.warehouseId = data[0].warehouseId;
 			datas.lypz = data[0].grainKind;

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

@@ -96,4 +96,62 @@ angular.module('app.business').service("jsglService", function($http, $q,$rootSc
         });
         return d.promise;
     }
+
+    //根据通知单编号查询出入库记录数据
+    this.queryCrkywData = function(obj){
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.deviceUrl + '/storageJsglKhxx/queryCrkywData',
+            params : {
+            	tzdbh : obj.tzdbh,
+            	cph : obj.cph,
+            	startTime : obj.startTime,
+            	endTime : obj.endTime
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
+    // 保存散粮客户信息
+    this.saveOrUpdateSlkhxx = function(json) {
+        var d = $q.defer();
+        $http({
+            method: 'POST',
+            url: APP_CONFIG.deviceUrl + '/storageSlkhxx/saveOrUpdate',
+            data: {
+                json : angular.toJson(json)
+            }
+        }).then(function successCallback(response) {
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+        });
+        return d.promise;
+    }
+    
+    //收付款人和身份证号码查询一条散粮客户信息
+    this.queryStorageSlkhxx = function(khmc, sfzhm){
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.deviceUrl + '/storageSlkhxx/queryStorageSlkhxx',
+            params : {
+            	khmc : khmc,
+            	sfzhm : sfzhm
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 });

src/main/resources/static/app/business/jsgl/views/crkjl-model-list.html

@@ -0,0 +1,57 @@
+<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">
+                    <div class="col-xs-12 col-sm-10">
+                        <label>出入库日期：<input style="width: 100px;" class="form-control" type="text" ng-model="search.startTime" name="startTime" id="startTime"
+                                               onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endTime\')}', dateFmt:'yyyy-MM-dd'})">——
+                                       <input style="width: 100px;" class="form-control" type="text" ng-model="search.endTime" name="endTime" id="endTime"
+                                               onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startTime\')}', dateFmt:'yyyy-MM-dd'})">
+                        </label>
+                        <label>车牌号：<input style="width: 100px;" class="form-control" type="text"
+                                           ng-model="search.cph" name="cph" id="ssyf" />
+                        </label>
+                        <a class="btn btn-default btn-sm"  ng-click="loadData()">
+                                                <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>&nbsp;&nbsp;
+                    </div>
+                    <table class="table table-striped table-bordered table-hover" width="100%">
+                        <thead>
+                            <tr>
+	                            <th>序号</th>
+	                            <th>业务单据号</th>
+	                            <th>车牌号</th>
+	                            <th>数量(kg)</th>
+	                            <th>出入库日期</th>
+	                            <th>承运人</th>
+	                            <th>身份证号</th>
+                            </tr>
+                        </thead>
+                        
+                        <tbody>
+                            <tr ng-repeat="data in list">
+		                        <td><input type="checkbox" ng-model="data.checked" name="checked" ng-click="selectData($index,data)">{{$index+1}}</td>
+								<td>{{data.bizno}}</td>
+								<td>{{data.cph}}</td>
+								<td>{{data.crksl}}</td>
+								<td>{{data.crkrq}}</td>
+								<td>{{data.sfkr}}</td>
+								<td>{{data.skrsfzh}}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+       <button type="button" class="btn btn-primary"  ng-click="closeModal()"> 下一步 </button>
+       <button type="button" class="btn btn-default"  ng-click="cancel()"> 返回 </button>
+    </div>
+</div>

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

@@ -135,108 +135,105 @@
                                         </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>
+                                
+                                <header>
+                                    <strong>收/付款信息</strong> 
+                                    <button style="padding: 5px 10px;" type="button" class="btn btn-default" ng-click="getSkrData()" ng-hide="isEdit">
+										<i class="glyphicon glyphicon-plus"></i> 
+										<span>添加收款人信息</span>
+									</button>
+								</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>
-                                    <div class="row">
-                                        <section class="col col-3">
-                                            <label class="label">提交人:</label>
-                                            <label class="input">
-                                                <input type="text" ng-model="jsgl.commitPeople" name="commitPeople" ng-readonly="true" required>
-                                            </label>
-                                        </section>
-                                        <section class="col col-3">
-                                            <label class="label">提交时间:</label>
-                                            <label class="input">
-                                                <input type="text" ng-model="jsgl.commitTime" name="commitTime" ng-readonly="true" required>
-                                            </label>
-                                        </section>
-                                    </div>
-                                </fieldset>
+									<div class="col-xs-12 col-sm-12">
+										<table class="table table-striped table-bordered table-hover" width="100%">
+											<tbody>
+											<tr>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">序号</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">车牌号</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">数量(kg)</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">出入库日期</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">收款人</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">身份证号</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">开户行名称</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">银行行别代码</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">开户行号</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">银行账号</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">操作</label>
+												</th>
+											</tr>
+											<tr ng-repeat="item in sfkr_list" class="ng-scope">
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ $index+1 }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.cph }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.crksl }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.crkrq }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.sfkr" name="sfkr" ng-click="checkSlKhxx(item)" ng-readonly="isNotEdit" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.skrsfzh" name="skrsfzh" checkSfzhm=true ng-click="checkSlKhxx(item)" ng-readonly="isNotEdit" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.khhmc" name="khhmc" ng-readonly="isNotEdit" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.yhhbdm" name="yhhbdm" ng-readonly="isNotEdit" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.khhh" name="khhh" checkKhhh=true ng-readonly="isNotEdit" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <input class="form-control" type="text" ng-model="item.yhzh" name="yhzh" checkYhzh=true ng-readonly="isNotEdit" />
+													</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">
+													    <a class="btn btn-primary" ng-click="saveKhxx(item)" ng-hide="isNotEdit">保存</a>
+													</label>
+												</th>
+											</tr>
+										</tbody></table>
+									</div>
+								</fieldset>
 
                                 <div>
                                     <footer class="text-align-center">

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

@@ -1308,7 +1308,7 @@ angular.module('app.business')
         	}
         })
         .state('app.business.rkjs-sl-list.edit', {
-            url: '/business/rkjs-sl-list/edit/:id',
+            url: '/business/rkjs-sl-list/edit/:id/:butType',
             data: {
                 title: '散粮入库结算详情'
             },

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

@@ -159,7 +159,10 @@ angular.module('app.business').controller("grainStoreWareDetailModalCtrl",
 						$scope.wareHidden = true ;
 					}
 				}
-
+				if (items.buttype == "show") {
+					$scope.isEdit = true;
+					$scope.isNotEdit = true;
+				} 
 			}
 		}
 

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

@@ -271,7 +271,7 @@
 		</form>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-primary"  ng-click="save()">提交</button>
+        <button type="button" class="btn btn-primary"  ng-click="save()" ng-hide="isNotEdit">提交</button>
         <button type="button" class="btn btn-default"  ng-click="cancel()">取消</button>
     </div>
 </div>

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

@@ -282,7 +282,7 @@
 		</form>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-primary"  ng-click="save()">
+        <button type="button" class="btn btn-primary"  ng-click="save()" ng-hide="isNotEdit">
         	提交
         </button>
         <button type="button" class="btn btn-default"  ng-click="cancel()">

src/main/resources/static/app/storage/foodstuffAnalysis/service/GrainAnalysisService.js

@@ -86,14 +86,15 @@ angular.module('app.storage').service("GrainAnalysisService", function($http, $q
 	}
 	
 	//选择周报(新版用)
-	this.queryWeekAnalysis = function (ssyf, houseId) {
+	this.queryWeekAnalysis = function (ssyf, houseId, warehouseId) {
 		var d = $q.defer();
 		$http({
 			method : 'GET',
 			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/queryWeekAnalysis',
 			params : {
 				ssyf: ssyf,
-				houseId: houseId
+				houseId: houseId,
+				warehouseId : warehouseId
 			}
 		}).then(function successCallback(response) {
 			// 请求成功执行代码

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

@@ -204,6 +204,7 @@ angular.module('app.storage')
         $scope.modelItem.orgId = $rootScope.orgInfo.orgId;
         $scope.modelItem.type = 1;//报表类型是周报
         $scope.modelItem.houseId = $scope.form.houseId;//仓房ID
+        $scope.modelItem.warehouseId = $scope.form.warehouseId;//货位ID
         $scope.modelItem.ssyf = $scope.storageGrainAnalysis.ssyf;//所属月份
 		
         // 展开选择仓房的模态框.

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

@@ -8,7 +8,7 @@ angular.module('app.storage').controller("selectWeekAnalysisModalCtrl",
     // 获取列表数据
     $scope.loadData = function() {
 
-    	GrainAnalysisService.queryWeekAnalysis(items.ssyf, items.houseId).then(function(data) {
+    	GrainAnalysisService.queryWeekAnalysis(items.ssyf, items.houseId, items.warehouseId).then(function(data) {
 			$scope.list = data;
 			for (var i = 0; i < $scope.list.length; i++) {
     			$scope.list[i].checked = true;

src/main/resources/static/app/storage/yl_account/controller/ylBgzzCtrl.js

@@ -219,6 +219,7 @@ angular.module('app.storage')
     	$scope.bgzz.jzsj = $scope.jzsj;
     	$scope.bgzz.shr = $scope.shr;
     	$scope.bgzz.shsj = $scope.shsj;
+    	$scope.disabled = true;
     	ylBgzzService.saveJz($scope.bgzz).then(function (data) {
 			$scope.list = data;
 			if (data.status == "200") {
@@ -265,6 +266,7 @@ angular.module('app.storage')
         	$scope.modelItem.jzyf = items.obj.sjfm;//记账月份
         	$scope.modelItem.jzzy = items.obj.jzzy;//摘要
         }
+        $scope.modelItem.orgId = $rootScope.orgInfo.orgId
         ylBgzzService.selectFcbgzDetail($scope.modelItem).then(function(data){
     		$scope.list = data;
         },function(data){

src/main/resources/static/app/storage/yl_account/controller/ylFcbgzCtrl.js

@@ -205,6 +205,7 @@ angular.module('app.storage')
 
     //保存
     $scope.save = function() {
+    	$scope.disabled = true;
     	ylFcbgzService.saveJz($scope.fcbgz).then(function (data) {
 			$scope.list = data;
 			if (data.status == "200") {

src/main/resources/static/app/storage/yl_account/service/ylBgzzService.js

@@ -68,7 +68,8 @@ angular.module('app.storage').service("ylBgzzService", function($http, $q, $root
                 lspz : modelItem == undefined ? "" :modelItem.lspz,
                 jzzy : modelItem == undefined ? "" :modelItem.jzzy,
                 jzyf : modelItem == undefined ? "" :modelItem.jzyf,
-                jznd : modelItem == undefined ? "" :modelItem.jznd
+                jznd : modelItem == undefined ? "" :modelItem.jznd,
+                orgId : modelItem == undefined ? "" :modelItem.orgId
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/storage/yl_account/views/bgzz-jz-modul.html

@@ -48,8 +48,7 @@
 		</form>
 	</div>
 	<div class="modal-footer">
-		<button ng-click="save()" type="button" ng-hide="isNotEdit"
-			class="btn btn-primary">提交</button>
+		<button ng-click="save()" type="button" ng-hide="isNotEdit" class="btn btn-primary" ng-disabled="disabled">提交</button>
 		<button ng-click="cancel()" class="btn btn-default"
 			data-dismiss="modal">取消</button>
 	</div>

src/main/resources/static/app/storage/yl_account/views/fcbgz-jz-edit.html

@@ -154,7 +154,7 @@
 								</fieldset>
 								<footer class="modal-footer text-align-center">
 									<button ng-click="retList()" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
-									<button ng-click="save()" type="button" class="btn btn-primary btn-lg" ng-hide="fcbgz.dataStatus=='0'">提交</button>
+									<button ng-click="save()" type="button" class="btn btn-primary btn-lg" ng-hide="fcbgz.dataStatus=='0'" ng-disabled="disabled">提交</button>
 								</footer>
 							</form>
 						</div>