处理B2B合并bug

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryCtrl.js

@@ -374,7 +374,7 @@ define(['app/app'], function(app) {
                                     toaster.pop('success', '提示', data.success);
                                     $timeout(function () {
                                         $rootScope.active = 'todo';
-                                        window.location.hash = "#/inquiry_unapply";
+                                        window.location.href = "/user#/inquiry_unapply";
                                     }, 500);
                                 }
                                 if (data.error) {
@@ -449,13 +449,13 @@ define(['app/app'], function(app) {
                                 data: {
                                     inquiry: $scope.inquiry,
                                     contacts: $scope.vendors
-                                },
+                                }
                             }).success(function (data) {
                                 $scope.loading = false;
                                 if (data.success) {
                                     toaster.pop('success', '提示', data.success);
                                     $timeout(function () {
-                                        window.location.hash = "#/purc/purchaseinquiry";
+                                        window.location.href = "/user#/purchaseinquiry";
                                     }, 500);
                                 }
                                 if (data.error) {

src/main/webapp/resources/js/usercenter/controllers/b2b/order/deputyOrderDetailCtrl.js

@@ -72,7 +72,7 @@ define(['app/app'], function(app) {
         // 查找付款企业
         $scope.dbfindPayCompany = function (deputyuu) {
             var modalInstance = $modal.open({
-                templateUrl: 'static/tpl/index/purc/modal/payCompany.html',
+                templateUrl: 'static/view/usercenter/b2b/modal/payCompany.html',
                 controller: 'DbfindDeputyPayCompanyCtrl',
                 resolve: {
                     deputyuu: function () {
@@ -393,4 +393,20 @@ define(['app/app'], function(app) {
             });
         }
     }]);
+    // 代采企业付款企业
+    app.register.controller('DbfindDeputyPayCompanyCtrl', ['$scope', 'toaster', '$upload', '$modalInstance', 'deputyuu', 'B2bDeputyOrder', 'BaseService', 'ngTableParams', function ($scope, toaster, $upload, $modalInstance, deputyuu, DeputyOrder, BaseService, ngTableParams) {
+        DeputyOrder.paycompanies({enuu: deputyuu}, {}, function (data) {
+            $scope.paycompanies = data;
+        }, function (response) {
+            toaster.pop('error', '提示', response.data);
+        });
+
+        $scope.cancel = function () {
+            $modalInstance.dismiss();
+        };
+
+        $scope.select = function (company) { // 直接选择
+            $modalInstance.close(company);
+        }
+    }]);
 })

src/main/webapp/resources/js/usercenter/controllers/b2b/order/purcNewDeputyOrderCtrl.js

@@ -80,7 +80,7 @@ define(['app/app'], function(app) {
         // 查找付款企业
         $scope.dbfindPayCompany = function (deputyuu) {
             var modalInstance = $modal.open({
-                templateUrl: 'static/tpl/index/purc/modal/payCompany.html',
+                templateUrl: 'static/view/usercenter/b2b/modal/payCompany.html',
                 controller: 'DbfindDeputyPayCompanyCtrl',
                 resolve: {
                     deputyuu: function () {
@@ -394,4 +394,20 @@ define(['app/app'], function(app) {
         };
 
     }]);
+    // 代采企业付款企业
+    app.register.controller('DbfindDeputyPayCompanyCtrl', ['$scope', 'toaster', '$upload', '$modalInstance', 'deputyuu', 'B2bDeputyOrder', 'BaseService', 'ngTableParams', function ($scope, toaster, $upload, $modalInstance, deputyuu, DeputyOrder, BaseService, ngTableParams) {
+        DeputyOrder.paycompanies({enuu: deputyuu}, {}, function (data) {
+            $scope.paycompanies = data;
+        }, function (response) {
+            toaster.pop('error', '提示', response.data);
+        });
+
+        $scope.cancel = function () {
+            $modalInstance.dismiss();
+        };
+
+        $scope.select = function (company) { // 直接选择
+            $modalInstance.close(company);
+        }
+    }]);
 })

src/main/webapp/resources/view/usercenter/b2b/Purc/addOrder.html

@@ -215,6 +215,15 @@
 		height: 34px;
 		font-size: 14px;
 	}
+	.b2b-com-table > tbody > tr > td{
+		word-break: break-all;
+		word-wrap: break-word;
+	}
+	.b2b-com-table > tbody > tr > td p{
+		line-height: 20px;
+		text-indent: -60px;
+		padding-left: 60px
+	}
 </style>
 <div class="user_right fr add-order">
 	<div class="b2b-com-head">新增采购单</div>
@@ -348,15 +357,15 @@
 			<table class="b2b-com-table" ng-if="order.orderItems[0].code != null">
 				<thead>
 				<tr>
-					<th>序号</th>
-					<th>产品信息</th>
-					<th>单位</th>
-					<th>数量</th>
-					<th>单价</th>
-					<th>税率(%)</th>
-					<th>交货日期</th>
-					<th>备注</th>
-					<th></th>
+					<th width="60">序号</th>
+					<th width="200">产品信息</th>
+					<th width="60">单位</th>
+					<th width="110">数量</th>
+					<th width="110">单价</th>
+					<th width="110">税率(%)</th>
+					<th width="110">交货日期</th>
+					<th width="110">备注</th>
+					<th width="30"></th>
 				</tr>
 				</thead>
 				<tbody>

src/main/webapp/resources/view/usercenter/b2b/modal/payCompany.html

@@ -0,0 +1,32 @@
+<div class="modal-header">
+	<h3 class="modal-title">
+		<i class="fa fa-user fa-fw text-default"></i>付款企业
+	</h3>
+</div>
+<div class="modal-body">
+	<div >
+		<table width="50%" class="block table table-bordered table-striped table-hover">
+			<thead>
+				<th width="120px;" class="text-center">付款企业</th>
+			</thead>
+			<tbody ng-if="paycompanies.length != 0">
+				<div style="overflow-y: scroll; width: 100%; max-height: 500px" >
+					<tr ng-repeat="company in paycompanies">
+						<td width="80px;" ng-click="select(company)"><a style="text-decoration: none"
+							ng-bind="::company.enname" ></a></td>
+					</tr>
+				</div>
+			<tbody>
+			<tbody ng-if="paycompanies.length == 0">
+				<div>
+					<tr>
+						<td width="80px;" class="text-center"><i class="fa fa-exclamation-circle"></i> 暂无付款企业信息</td>
+					</tr>
+				</div>
+			<tbody>
+		</table>
+	</div>
+</div>
+<div class="modal-footer">
+	<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+</div>

src/main/webapp/resources/view/usercenter/b2b/modal/tender_vendor.html

@@ -114,12 +114,18 @@
     </table>
 </div>
 <div class="modal-footer">
-    <button class="btn save" style="" ng-click="close()" type="button">确认</button>
-    <button class="btn cancel" style="" ng-click="cancel()" type="button">取消</button>
+    <button class="btn save" ng-click="close()" type="button">确认</button>
+    <button class="btn cancel" ng-click="cancel()" type="button">取消</button>
 </div>
 <style>
     .save {
-        border-radius: 0;background: #5078cb;color: #fff;width: 80px
+        border-radius: 0;
+        background: #5078cb;
+        color: #fff;
+        width: 80px;
+        height: auto;
+        margin-left: 20px;
+        line-height: normal;
     }
     .save:hover {
         background: #67afe4;

src/main/webapp/resources/view/usercenter/forstore/messagePersonal.html

@@ -128,6 +128,23 @@
         color: #333;
         cursor: default ;
     }
+    .oder01 ul li.active a {
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff !important;
+        border: 0;
+        border-top: 0px;
+    }
+    .oder01 ul li {
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01 ul {
+        border-bottom: 0px;
+    }
+    .oder01 ul li a {
+        border:0;
+    }
 </style>
 <div class="user_right fr" id="massage">
     <!--订单中心-->

src/main/webapp/resources/view/vendor/b2b/modal/contact_person_modal.html

@@ -17,6 +17,7 @@
 		text-align: right;
 		margin-right: 15px;
 		font-size: 14px;
+		vertical-align: middle;
 	}
 	.cus-person-modal .contact-info li input,
 	.cus-person-modal .contact-info li select {

src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html

@@ -492,6 +492,7 @@
 		margin: 0;
 		font-size: 14px;
 		color: #666;
+		text-align: left;
 	}
 	#empty_info .empty_title {
 		color: #3f84f6;
@@ -674,7 +675,7 @@
 					</div>
 					<div class="right_link">
 						<p>暂无对应的单据</p>
-						<a ui-sref="sale.quotation.new"><i class="way_icon"></i>立即向客户主动报价</a>
+						<a ui-sref="sale_quotation_new">立即向客户主动报价</a>
 					</div>
 				</div>
 			</td>

src/main/webapp/resources/view/vendor/forstore/messagePersonal.html

@@ -127,6 +127,23 @@
         color: #333;
         cursor: default ;
     }
+    .oder01 ul li.active a {
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff !important;
+        border: 0;
+        border-top: 0px;
+    }
+    .oder01 ul li {
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01 ul {
+        border-bottom: 0px;
+    }
+    .oder01 ul li a {
+        border:0;
+    }
 </style>
 <div class="user_right fr" id="massage">
     <!--订单中心-->