Browse Source

更新付款企业新增的方法

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8422 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
24a1d45436

+ 19 - 8
src/main/webapp/resources/js/index/app.js

@@ -7155,19 +7155,30 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			});
 		};
 		
-		
 		// 新增付款企业
-		$scope.savePayCompany = function(pay) {
-			pay.address = pay.province + pay.city + pay.district + pay.addressdet;
-			DeputyOrder.savePaycompany( {}, pay, function(data) {
-				DeputyOrder.paycompanies({enuu: $scope.enterprise.uu}, {}, function(data) {
+		$scope.addPayCompany = function() {
+			var modalInstance = $modal.open({
+				animation: true,
+				templateUrl: 'static/tpl/index/approvalFlow/paycompany_modal.html',
+				controller: 'PayCompanyCtrl',
+				resolve: {
+					pay: function(){return null;}
+				}
+			});
+			
+			modalInstance.result.then(function() {
+				DeputyOrder.paycompanies({enuu: uu}, {}, function(data) {
 					$scope.pays = data;
+					// 获取付款企业信息
+					DeputyOrder.paycompanies({enuu: $scope.enterprise.uu}, {}, function(data) {
+						$scope.pays = data;
+					}, function(response) {
+						toaster.pop('error', '提示', response.data);
+					});
 				}, function(response) {
 					toaster.pop('error', '提示', response.data);
 				});
-				toaster.pop('success', '提示', '保存成功');
-			}, function(response) {
-				toaster.pop('error', '提示', response.data);
+			}, function(){
 			});
 		}
 		

+ 1 - 59
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -497,7 +497,7 @@
 	<div ng-if="deputyEnter.deputyEnterprise">
 		<div class="compangy-open com_title01"><span>付款企业信息</span>
 			<a href="javascript:void(0);" class="open" ng-if="pays.length>1">展开<i class="fa fa-angle-down"></i></a>
-			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" href="javascript:void(0)">+新增付款企业</a>
+			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="addPayCompany()">+新增付款企业</a>
 			<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 					class="fa fa-reply-all fa-fw"></i>取消</a>
 			<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
@@ -615,54 +615,6 @@
         </div>
     </form>
 </div>
-<!-- 付款企业信息编辑  -->
-<div class="bomb-box" style="display: none" id="paycompany">
-    <form class="box04 box" name="payCompany" id="payCompany">
-        <i class="off"><img src="static/img/purc/close.png" alt="" /></i>
-        <p>付款企业资料</p>
-        <ul>
-            <li class="line01">
-                <div class="fl">
-                    <span class="fl">企业名称<em>*</em>:</span>
-                    <span class="fr"><input type="text" placeholder="填写企业名称" ng-model="pay.enname" required="true"/></span>
-                </div>
-                <div class="fr">
-                    <span class="fl">联系人<em>*</em>:</span>
-                    <span class="fr"><input type="text" ng-model="pay.user" required="true"/></span>
-                </div>
-            </li>
-            <li class="line01">
-                <div class="fl">
-                    <span class="fl">手机<em>*</em>:</span>
-                    <span class="fr"><input type="text" ng-model="pay.usertel"  ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
-                </div>
-            </li>
-            <li class="line02 margin-top40">
-                <div class="fl">所在地址<em>*</em>:</div>
-				 <div class="select fr">
-                    <select required="" class="area-select" ng-model="pay.province" ng-options="key as key for (key,value) in provinces"
-                            ng-change="pay.city='';pay.district='';" required="true">  
-                        <option value="">省</option>  
-                    </select>
-                    <select class="area-select" ng-model="pay.city" ng-options="key as key for (key,value) in provinces[pay.province]"
-                            ng-change="ship.district='';" required="true">  
-                        <option value="">市</option>  
-                    </select>
-                    <select class="area-select" ng-model="pay.district" ng-options="value as value for value in provinces[pay.province][pay.city]" required="true">
-                        <option value="">区</option>  
-                    </select>  
-				</div>
-            </li>
-            <li class="line02">
-                <div class="fl">详细地址<em>*</em>:</div>
-                <div class="fr"><input type="text" ng-model="pay.addressdet" required="true"/></div>
-            </li>
-        </ul>
-        <div class="many-file-btn">
-            <button class="btn01" ng-click="savePayCompany(pay)" ng-disabled="payCompany.$invalid">保存</button><a class="btn02" ng-click="">取消</a>
-        </div>
-    </form>
-</div>
 <script src="static/lib/jquery/jquery.min.js"></script>
 <script>
     $(function(){
@@ -706,15 +658,5 @@
 				$("#company-list").css("height","116px");
 			}
 		});
-		 //新增付款企业信息
-        $(".com_title01 .add-paycompany").click(function(){
-        	document.getElementById('payCompany').reset();
-            $("#paycompany").show();
-        });
-        
-        $("#paycompany .add-paycompany").click(function(){
-        	document.getElementById('payCompany').reset();
-            $("#paycompany").show();
-        });
     })
 </script>