执行进度增加中转的合同和通知单

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

@@ -871,7 +871,7 @@ angular.module('app.business')
         })
         
         .state('app.business.lading-view', {
-            url: '/business/lading-view/:id',
+            url: '/business/lading-view/:id/:type',
             params: {
                 "noticeType" : "storage",
                 "isNotEdit" : true

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

@@ -23,12 +23,17 @@ angular.module('app.business').controller("contractScheduleCtrl", function($scop
     
     
     // 查看页面
-    $scope.showView = function(id, processInstanceId) {
+    $scope.showView = function(id, processInstanceId,contractType) {
     	if ($stateParams.SalesStatistics) {
             $state.go("app.supervise.decisionSupport.SalesStatistics.contract-schedule.contract-view", {id : id, processInstanceId : processInstanceId});
             return;
 		}
-        $state.go("app.business.contract-view", {id : id, processInstanceId : processInstanceId});
+        //$state.go("app.business.contract-view", {id : id, processInstanceId : processInstanceId});
+    	if(contractType == 6913){
+            $state.go("app.business.transferContract-view", {id : id, processInstanceId : processInstanceId});
+        }else{
+            $state.go("app.business.contract-view", {id : id, processInstanceId : processInstanceId});
+        }
     };
     
     // 查看对应的通知单的执行进度.

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

@@ -35,6 +35,10 @@ angular.module('app.business').controller("deliveryStorageNoticeScheduleCtrl", f
             $state.go("app.business.storageNotice-view", {id : id, processInstanceId : processInstanceId});
         } else if (billType == "3") {
             $state.go("app.business.deliveryNotice-view", {id : id, processInstanceId : processInstanceId});
+        }else if(billType == "2"){
+            $state.go("app.business.transferNotice-view", {id : id, processInstanceId : processInstanceId});
+        }else{
+            $state.go("app.business.lading-view", {id : id,type:0}); //自定义了一个参数
         }
     }
     

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

@@ -70,8 +70,8 @@
 	                                <td>{{ contract.completeRate }}</td>
 	                                <td>{{ contract.agreeTime | date:'yyyy-MM-dd' }}</td>
 	                                <td>
-	                                    <a href-void ng-click="showView(contract.id, contract.processInstanceId)"><i class="fa fa-info-circle"></i>查看</a> &emsp;
-	                                    <a href-void ng-click="showNoticeScheduleList(contract.rootContractBid)"><i class="fa fa-info-circle"></i>通知单</a>
+                                    <a href-void ng-click="showView(contract.id, contract.processInstanceId,contract.contractType)"><i class="fa fa-info-circle"></i>查看</a> &emsp;	         
+                                    <a href-void ng-click="showNoticeScheduleList(contract.rootContractBid)"><i class="fa fa-info-circle"></i>通知单</a>
 	                                </td>
 	                            </tr>
 	                        </tbody>

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

@@ -21,6 +21,7 @@
                                                             <option value="">--通知单类型--</option>
                                                             <option value="1">入库</option>
                                                             <option value="3">出库</option>
+                                                            <option value="2">中转</option>
                                             </select>
 										</label>&emsp;
                                         <label><a class="btn btn-default btn-sm" ng-click="loadData()">
@@ -62,8 +63,10 @@
 	                            <tr ng-repeat="deliveryStorageNotice in pageInfo.list">
 	                                <td>
 	                                    <div ng-switch="{{deliveryStorageNotice.billType}}">
-	                                    <div ng-switch-when="1">入库</div>
-	                                    <div ng-switch-when="3">出库</div>
+	                                      <div ng-switch-when="1">入库</div>
+                                          <div ng-switch-when="3">出库</div>
+                                          <div ng-switch-when="2">发运中转</div>
+                                          <div ng-switch-default>到站中转</div>
 	                                    </div>
 	                                </td>
 	                                <td>{{ deliveryStorageNotice.billNumber}}</td>

src/main/resources/static/app/business/util/views/notice-schedule-list-modal.html

@@ -29,6 +29,8 @@
                                     <div ng-switch="{{deliveryStorageNotice.billType}}">
                                     <div ng-switch-when="1">入库</div>
                                     <div ng-switch-when="3">出库</div>
+                                    <div ng-switch-when="2">发运中转</div>
+                                    <div ng-switch-default>到站中转</div>
                                     </div>
                                 </td>
                                 <td>{{ deliveryStorageNotice.billNumber}}</td>