性质转变单

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

@@ -2,7 +2,7 @@ angular.module('app.business').controller("propertyTransitionSheetAuditCtrl", fu
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
 	
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.searchCondition = {auditState : 5,isSheet:0};
+	$scope.searchCondition = {isSheet:0};
      // 获取列表数据
      $scope.loadData = function() {
     	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
@@ -34,7 +34,7 @@ angular.module('app.business').controller("propertyTransitionSheetAuditCtrl", fu
  	
     // 查看页面
  	$scope.auditView = function(id) {
-        $state.go("app.business.propertyTransitionSheet-audit-pass-view", {id : id});
+        $state.go("app.business.propertyTransitionSheet-list-view", {id : id});
     }
      
 });
@@ -61,7 +61,12 @@ angular.module('app.business').controller("propertyTransitionSheetAuditSaveCtrl"
 		 receiveNoticeService.getAuditById(id).then(function(data){
 			 $scope.receiveNotice = data.businessNoticeReceive;
 			 $scope.auditList = data.auditList;
-			 $scope.isNotEdit = true;
+			 if($scope.auditList != null && $scope.auditList.length != 0){//有审批信息则展示
+				 $scope.isNotEdit = true; 
+			 }else{
+				 $scope.isNotEdit = false;
+			 }
+			 
 			 
 	     },function(data){
 	    	 console.log(data);
@@ -77,12 +82,12 @@ angular.module('app.business').controller("propertyTransitionSheetAuditSaveCtrl"
  	
     // 查看页面
  	$scope.auditView = function(id) {
-        $state.go("app.business.propertyTransitionSheet-audit-pass-view", {id : id});
+        $state.go("app.business.propertyTransitionSheet-list-view", {id : id});
     }
  	
  	//返回
 	 $scope.retList = function () {
-      $state.go("app.business.propertyTransitionSheet-audit-pass");
+      $state.go("app.business.propertyTransitionSheet-list");
     }
      
 });

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

@@ -7,7 +7,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>性质转变单审批列表</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -50,7 +50,7 @@
                         <table class="table table-striped table-bordered table-hover" width="100%">
 	                        <thead>
 		                        <tr>
-		                        	<th> 序号</th>
+		                            <th> 序号</th>
 		                            <th> 性质转变单编号</th>
 		                            <th> 仓房名称</th>
 		                            <th> 货位名称</th>
@@ -60,6 +60,7 @@
 		                            <th> 转后性质</th>
 		                            <th> 划转数量(吨)</th>
 		                            <th> 划转时间</th>
+		                            <th> 当前审批节点</th>
 		                            <th> 操作</th>
 		                        </tr>
 	                        </thead>
@@ -78,14 +79,23 @@
 	                                <td>{{dicData[receiveNotice.grainAttribute]}}</td>
 	                                <td>{{dicData[receiveNotice.hzqlsxzdm]}}</td>
 	                                <td>{{receiveNotice.count}}</td>
-	                                <td>{{receiveNotice.receiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                                <td>{{receiveNotice.hzrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                                <td>   
+		                                <div ng-switch="{{receiveNotice.auditState}}">
+		                                    <div ng-switch-when="0">仓储部经理审批</div>
+		                                    <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>
-	                                	<a href-void ng-click="auditView(receiveNotice.id)"><i class="fa fa-info-circle"></i>查看</a>
+	                                	<a href-void ng-click="auditView(receiveNotice.id)"><i class="fa fa-info-circle"></i>审批</a>
 	                                </td>
 	                            </tr>
 	                        </tbody>
                         </table>
-                        <div smart-include="app/layout/partials/page.tpl.html"></div>
+						<div smart-include="app/layout/partials/page.tpl.html"></div>
                         </div>
                         </div>
                     </div>

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

@@ -7,7 +7,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>性质转变单列表</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -30,6 +30,14 @@
 												<option value="">请选择</option>
 											</select>&emsp;
                                        </label>
+                                       <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><a class="btn btn-default btn-sm" ng-click="loadData()">
 														<i class="fa fa-search"></i>&nbsp;查&nbsp;询
 													</a>
@@ -50,52 +58,51 @@
                         <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>
-		                            <th> 划转时间</th>
-		                            <th> 当前审批节点</th>
-		                            <th> 操作</th>
+		                        	<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="4%"> 仓房名称</th>
+		                            <th data-class="expand" style="text-align:center;" width="4%"> 货位名称</th>
+		                            <th data-class="expand" style="text-align:center;" width="5%"> 粮油品种</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="7%"> 转后性质</th>
+		                            <th data-class="expand" style="text-align:center;" width="5%"> 划转数量(吨)</th>
+		                            <th data-class="expand" style="text-align:center;" width="8%"> 划转时间</th>
+		                            <th data-class="expand" style="text-align:center;" width="5%"> 审批状态</th>
+		                            <th data-class="expand" style="text-align:center;" width="4%"> 操作</th>
 		                        </tr>
 	                        </thead>
 	                        
 	                        <tbody>
 	                            <tr ng-repeat="receiveNotice in pageInfo.list">
-	                                <td>{{$index+1}}</td>
-	                                <td>{{receiveNotice.lsxzzbdh}}</td>
-	                                <td>{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
-	                                <td>
+	                                <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;">{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
+	                                <td data-class="expand" style="text-align:center;">
 									    <span ng-if="receiveNotice.wareHouseId != null">{{wares[receiveNotice.wareHouseId].warehouseName}}</span>
 									    <span ng-if="receiveNotice.wareHouseId == null">---</span>
 									</td>
-	                                <td>{{dicData[receiveNotice.grainKind]}}</td>
-	                                <td>{{receiveNotice.lssl}}</td>
-	                                <td>{{dicData[receiveNotice.grainAttribute]}}</td>
-	                                <td>{{dicData[receiveNotice.hzqlsxzdm]}}</td>
-	                                <td>{{receiveNotice.count}}</td>
-	                                <td>{{receiveNotice.hzrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-	                                <td>   
-		                                <div ng-switch="{{receiveNotice.auditState}}">
-		                                    <div ng-switch-when="0">仓储部经理审批</div>
-		                                    <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>
-	                                	<a href-void ng-click="auditView(receiveNotice.id)"><i class="fa fa-info-circle"></i>审批</a>
+	                                <td data-class="expand" style="text-align:center;">{{dicData[receiveNotice.grainKind]}}</td>
+	                                <td data-class="expand" style="text-align:center;">{{receiveNotice.lssl}}</td>
+	                                <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;">
+									    <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>
+									</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>
 	                                </td>
 	                            </tr>
 	                        </tbody>
                         </table>
-						<div smart-include="app/layout/partials/page.tpl.html"></div>
+                        <div smart-include="app/layout/partials/page.tpl.html"></div>
                         </div>
                         </div>
                     </div>

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

@@ -3471,7 +3471,7 @@ angular.module('app.business')
         	views: {
         		"content@app": {
         			controller: 'propertyTransitionSheetCtrl',
-        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-list.html'
+        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-audit-list.html'
         		}
         	}
         })
@@ -3489,24 +3489,24 @@ angular.module('app.business')
         	}
         })
         
-        //已审批性质转变单
-        .state('app.business.propertyTransitionSheet-audit-pass', {
-        	url: '/business/propertyTransitionSheet-audit-pass',
+        //性质转变单
+        .state('app.business.propertyTransitionSheet-list', {
+        	url: '/business/propertyTransitionSheet-list',
         	data: {
-        		title: '已审批性质转变单列表'
+        		title: '性质转变单列表'
         	},
         	views: {
         		"content@app": {
         			controller: 'propertyTransitionSheetAuditCtrl',
-        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-audit-list.html'
+        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-list.html'
         		}
         	}
         })
         
-        .state('app.business.propertyTransitionSheet-audit-pass-view', {
-        	url: '/business/propertyTransitionSheet-audit-pass-view/:id',
+        .state('app.business.propertyTransitionSheet-list-view', {
+        	url: '/business/propertyTransitionSheet-list-view/:id',
         	data: {
-        		title: '已审批性质转变单详情'
+        		title: '性质转变单详情'
         	},
         	views: {
         		"content@app": {

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

@@ -150,12 +150,12 @@
                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>性质转变单管理
                               </a>
                               <ul>
+                              		<li has-func="476" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.propertyTransitionSheet-list">性质转变单</a>
+                                    </li>
                                     <li has-func="475" data-ui-sref-active="active">
                                         <a data-ui-sref="app.business.propertyTransitionSheet-audit">性质转变单审批</a>
                                     </li>
-                                    <li has-func="476" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.business.propertyTransitionSheet-audit-pass">已审批性质转变单</a>
-                                    </li>
                                 </ul>
                             </li>