接收合同

src/main/resources/static/app/business/contractReceive/controller/contractReceiveCtrl.js

@@ -0,0 +1,65 @@
+"use strict";
+
+angular.module('app.business')
+    .controller("contractReceiveCtrl", function ($scope, $http, $state, $rootScope, contractReceiveService, warehouseService, $filter, $stateParams, APP_CONFIG) {
+        // 获取列表数据
+        $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        $scope.search = {htbh: "", houseId: "", warehouseId: ""};
+
+        $scope.loadData = function () {
+        	contractReceiveService.getPageInfo($scope.pageInfo.pageNum, 
+        			$scope.pageInfo.pageSize, 
+        			$scope.search.htbh,
+        			$scope.search.houseId,
+        			$scope.search.warehouseId).then(function (data) {
+                $scope.pageInfo = data;
+            }, function (data) {
+                console.log(data);
+            });
+        }
+
+        $scope.loadData();
+        
+        $scope.getBasicData = function() {
+    		//按照单位获取单位下的仓房信息
+    		var orgId = $rootScope.orgInfo.orgId;
+    		warehouseService.getStorehouse(orgId, $scope.search.houseId, "0").then(function(data){
+    			$scope.warehouseList = data.wareList;  //下拉列表数据
+    			//$scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
+    		},function (data) {
+    			console.log(data);
+    		});
+
+    	}
+
+        //查看
+        $scope.checkView = function (id) {
+            $state.go("app.business.grainReservesManage-contractReceiveList.edit", {btnType: "view", id: id});
+        }
+
+        // 翻页
+        $scope.goPage = function(pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
+        }
+
+    })
+    .controller("contractReceiveEditCtrl", function ($scope, $http, $state, $rootScope, $filter, contractReceiveService, $stateParams, APP_CONFIG) {
+
+    	// 初始化页面数据
+    	$scope.edit = function() {
+    		contractReceiveService.loadDataById($stateParams.id).then(function(data){
+    			$scope.contractReceive = data.data;
+    		},function(data){
+    			console.log(data);
+    		});
+    	}
+    	$scope.edit();
+
+        //返回
+   	    $scope.retList = function () {
+            $state.go("app.business.grainReservesManage-contractReceiveList");
+        }
+    });

src/main/resources/static/app/business/contractReceive/service/contractReceiveService.js

@@ -0,0 +1,45 @@
+"use strict";
+
+angular.module('app.business').service("contractReceiveService", function($http, $q, APP_CONFIG,$rootScope) {
+    //盘点列表
+	this.getPageInfo = function(pageNum, pageSize, htbh, houseId, warehouseId){
+		var d = $q.defer();
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.businessUrl + '/businessContractReceiveController/getList',
+			params : {
+				pageNum : pageNum,
+				pageSize : pageSize,
+				htbh: htbh,
+                houseId: houseId,
+                warehouseId: warehouseId,
+                orgId: $rootScope.userInfo.orgId
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+
+    //详情
+    this.loadDataById = function(id){
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.businessUrl + '/businessContractReceiveController/findbyparmaryKey',
+            params: {
+                id : id
+            }
+        }).then(function successCallback(response) {
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            //console.log(response);
+        });
+        return d.promise;
+    }
+
+})

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

@@ -0,0 +1,155 @@
+<!-- MAIN CONTENT -->
+<div id="content" style=" border-width:5px; margin-left:2%;position:relative;margin-right:2%;">
+    <!-- widget grid -->
+    <section id="widget-grid" widget-grid>
+        <!-- START ROW -->
+        <div class="row">
+            <!-- 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>
+                        <!-- widget content -->
+                        <div class="widget-body no-padding">
+                            <form id="contractReceive-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate" style=" border-width:5px; margin-left:2%;position:relative;margin-right:2%;">
+                                <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>
+								</header>
+                                <fieldset>
+                              	<div>
+                              		    <section class="col col-4">
+											<label class="label">合同编号：</label>
+											<label class="input">
+												<input type="text" ng-model="contractReceive.htbh" name="htbh" ng-readonly="true">
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">合同类型：</label>
+										    <label class="select">
+												<select name="htlx" ng-model="contractReceive.htlx" ng-disabled="true">
+													<option value="">--请选择--</option>
+													<option value="0">采购</option>
+													<option value="1">销售</option>
+												</select> <i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">合同总数量(吨)：</label>
+											<label class="input">
+												<input type="text" ng-model="contractReceive.htzsl" name="htzsl" ng-readonly="true">
+											</label>
+										</section>
+                              	</div>
+                              	<div>
+									<section class="col col-4">
+										<label class="label">仓房名称：</label>
+										 <label class="input">
+											<input type="text" ng-model="storehouseObj[contractReceive.houseId].storehouseName" name="houseId" ng-readonly="true">
+										</label> 
+									</section>
+									<section class="col col-4">
+										<label class="label">货位名称：</label>
+										<label class="input">
+											<input type="text" ng-model="wares[contractReceive.warehouseId].warehouseName" name="warehouseId" ng-readonly="true">
+										</label> 
+									</section>
+                              		<section class="col col-4">
+										<label class="label">合同单价(元/吨)：</label>
+										<label class="input">
+											<input type="text" ng-model="contractReceive.htdj" name="htdj" ng-readonly="true" />
+										</label>
+									</section>
+                              	</div>
+                              	<div>
+									<section class="col col-4">
+										<label class="label">合同总价(元)：</label>
+										<label class="input">
+											<input type="text" ng-model="contractReceive.htzj" name="htzj" ng-readonly="true" />
+										</label>
+									</section>
+									<section class="col col-4">
+										<label class="label">粮油品种：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.lypz]" name="lypz" ng-readonly="true" />
+										</label>
+									</section>
+									<section class="col col-4">
+										<label class="label">明细品种：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.mxpz]" name="mxpz" ng-readonly="true" />
+										</label>
+									</section>
+								</div>
+                              	<div>
+                              		<section class="col col-4">
+										<label class="label">粮油等级：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.lydj]" name="lydj" ng-readonly="true" />
+										</label>
+									</section>
+									<section class="col col-4">
+										<label class="label">粮油性质：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.lyxz]" name="lyxz" ng-readonly="true" />
+										</label>
+									</section>
+									<section class="col col-4">
+										<label class="label">生产年份：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.scnf]" name="scnf" ng-readonly="true" />
+										</label>
+									</section>
+                              	</div>
+                              	<div>
+                              		<section class="col col-4">
+										<label class="label">收货年度：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.shnd]" name="shnd" ng-readonly="true" />
+										</label>
+									</section>
+									<section class="col col-4">
+										<label class="label">粮油产地：</label>
+										<label class="input">
+											<input type="text" ng-model="dicData[contractReceive.lycd]" name="lycd" ng-readonly="true" />
+										</label>
+								    </section> 					
+									<section class="col col-4">
+										<label class="label">客户名称：</label>
+										<label class="input">
+											<input type="text" ng-model="contractReceive.khmc" name="khmc" ng-readonly="true" />
+										</label>
+									</section>
+                              	</div>
+								<div>
+									<section class="col col-4">
+										<label class="label">数据接收时间：</label>
+										<label class="input">
+											<input type="text" ng-model="contractReceive.inputTime" name="inputTime" ng-readonly="true" />
+										</label>
+									</section>
+									<section class="col col-4">
+										<label class="label">最后修改时间：</label>
+										<label class="input">
+											<input type="text" ng-model="contractReceive.updateTime" name="updateTime" ng-readonly="true" />
+										</label>
+									</section>
+								</div>
+                                </fieldset>
+                                <div><!--class="form-actions"-->
+                                    <footer class="text-align-center">
+                                        <button type="button" class="btn btn-default" ng-click="retList()">返回</button>
+                                    </footer>
+                                </div>
+							</form>
+                        </div>
+                    </div>
+            </article>
+		</div>
+	</section>
+</div>

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

@@ -0,0 +1,99 @@
+<!-- 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-10">
+									<div class="form-group">
+										<label> 仓房名称:&emsp;
+                                            <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="getBasicData()">
+                                                <option value="">请选择</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label> 货位名称:&emsp;
+                                            <select ng-model="search.warehouseId" class="form-control input-sm"
+                                                    ng-options="ware.warehouseId as ware.warehouseName for ware in warehouseList">
+                                                <option value="">请选择</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label>合同编号:&emsp;
+                                            <input type="text" ng-model="search.htbh" class="form-control input-sm" placeholder="" />&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-xs-2 col-sm-1">
+									<a href-void class="btn btn-primary btn-sm" ng-click="moreDelete()"><i class="fa fa-trash-o"></i>&nbsp;批&nbsp;量&nbsp;结&nbsp;束</a>
+								</div> -->
+								<div class="col-sm-2 col-xs-1 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-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-class="expand"> 操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        	<tr ng-repeat="contractReceive in pageInfo.list">
+								<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
+								<td>{{contractReceive.htbh}}</td>
+								<td>{{contractReceive.htlx==0?"采购":"销售"}}</td>
+								<td>{{storehouseObj[contractReceive.houseId].storehouseName}}</td> 
+								<td>{{wares[contractReceive.warehouseId].warehouseName}}</td>
+								<td>{{contractReceive.htzsl}}</td>
+								<td>{{contractReceive.htdj}}</td>
+								<td>{{contractReceive.htzj}}</td>
+								<td>{{dicData[contractReceive.mxpz]}}</td>
+								<td>{{contractReceive.khmc}}</td>
+								<td>{{contractReceive.inputTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+								<td>
+									<a href-void ng-click="checkView(contractReceive.id)"><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/business/customer/controller/customerSaveCtrl.js

@@ -185,6 +185,7 @@ angular.module('app.business').controller("customerSaveCtrl", function($scope, $
     			// 设置saveFlag为true,防止重复提交.
     			$scope.saveFlag = true;
     			$scope.orgId=$rootScope.userInfo.orgId;
+    			$scope.customer.sfwz = "0";//从前端保存的数据默认为完整数据
     			customerService.save($scope.customer,$scope.orgId).then(function(data) {
     				if(data.status == "success"){
     					alert("保存成功！");

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

@@ -3462,6 +3462,34 @@ angular.module('app.business')
             }
         })
         
+        /***************************************接收合同 start*******************************************/
+        .state('app.business.grainReservesManage-contractReceiveList', {
+        	url: '/business/grainReservesManage-contractReceiveList',
+        	data: {
+        		title: '接收合同'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'contractReceiveCtrl',
+        			templateUrl: 'app/business/contractReceive/views/contractReceive-list.html'
+        		}
+        	}
+        })
+        .state('app.business.grainReservesManage-contractReceiveList.edit', {
+        	url: '/business/grainReservesManage-contractReceiveList/edit/:btnType/:id',
+        	data: {
+        		title: '接收合同详情'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'contractReceiveEditCtrl',
+        			templateUrl: 'app/business/contractReceive/views/contractReceive-edit.html'
+        		}
+        	}
+        })
+        
+        /***************************************接收合同 end*******************************************/
+        
      //---------------------------------性质转变单审批--------------------------------
         .state('app.business.propertyTransitionSheet-audit', {
         	url: '/business/propertyTransitionSheet-audit',

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

@@ -139,8 +139,8 @@
                             <i class="fa fa-fw fa-folder-open"></i>储备粮管理
                         </a>
                         <ul>
-                            <li has-func="0" data-ui-sref-active="active">
-                                <a data-ui-sref="app.business.grainReservesManage-receiveNotice">接收合同</a>
+                            <li has-func="272" data-ui-sref-active="active">
+                                <a data-ui-sref="app.business.grainReservesManage-contractReceiveList">接收合同</a>
                             </li>
                             <li has-func="273" data-ui-sref-active="active">
                                 <a data-ui-sref="app.business.grainReservesManage-receiveNotice">接收通知单</a>