Merge remote-tracking branch 'origin/release-201823-wangcz' into release-201823-wangcz

src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -6,7 +6,6 @@ define(['app/app'], function(app) {
 	app.register.controller('buyerPayCenterCtrl', ['$scope', '$rootScope', 'ngTableParams', 'BaseService', 'bankInfoService', '$filter', 'SessionService', '$modal', 'toaster', 'OrderSimpleInfo', 'Loading', 'Authority', '$stateParams', function($scope, $rootScope, ngTableParams, BaseService, bankInfoService, $filter, SessionService, $modal, toaster, OrderSimpleInfo, Loading, Authority, $stateParams) {
 		$rootScope.active = 'buyer_pay_center';
 
-		document.title = '支付中心-优软商城';
 		var hideBankFilter = $filter("hideBankFilter");
 
 		//历史记录的状态
@@ -19,6 +18,8 @@ define(['app/app'], function(app) {
 			$scope.status = $stateParams.status;
 		}
 
+		document.title = ($scope.status == 'pay-history' ? '应付对账' : '付款账户') + '-优软商城';
+
 		//切换银行账户信息，历史记录的状态
 		$scope.toggleStatus = function(status) {
 			if($scope.status != status) {

src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -6,7 +6,6 @@ define(['app/app'], function(app) {
     app.register.controller('vendorPayCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'toaster', '$upload', 'bankTransferService', 'Purchase', '$filter', 'Loading', 'ngTableParams', 'BaseService', 'SessionService', '$stateParams', '$http', 'Authority', function($scope, $rootScope, bankInfoService, toaster, $upload, bankTransferService, Purchase, $filter, Loading, ngTableParams, BaseService, SessionService, $stateParams, $http, Authority) {
         $rootScope.active = 'vendor_pay_center';
 
-        document.title = '结算中心-优软商城';
         // 加密订单的ID过滤器
         var enIdFilter = $filter('EncryptionFilter');
 
@@ -17,6 +16,9 @@ define(['app/app'], function(app) {
         $scope.param = {};
 
         $scope.tab = $stateParams.tab == 'accountTab' ? $stateParams.tab : hiStatus == null ? 'paymentRecord' : hiStatus;
+
+        document.title = $stateParams.tab == 'accountTab' ? '收款账户' : '应收对账' + '-优软商城';
+
         $scope.$$bankInfo = {};
 
         $scope.paytype = 'ALL';

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_invoice_ctrl.js

@@ -73,6 +73,7 @@ define([ 'app/app' ], function(app) {
                             item.checked = false
                             item.billInfo = angular.fromJson(item.billInfo);
                             item.orderids = item.orderids.split(',')
+                            item.purchaseids = item.purchaseids ? item.purchaseids.split(',') : item.orderids
                         })
                         //划分数据
                         $scope.billData = page.content;

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -502,7 +502,7 @@ define(['app/app'], function (app) {
             //     $scope.orderTableParams.reload();
             // });
             purchase.showGotoSettle = false;
-            window.open("vendor#/payCenter");
+            window.open("/sso#/gatheringAccount?tab=accountTab");
         }
         // 关闭操作
         $scope.cancle = function () {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_upload_ctrl.js

@@ -6,7 +6,7 @@ define([ 'app/app' ], function(app) {
             $rootScope.$$productOn.leadIn = 'bathOn';
             $rootScope.$$productOn.tab = 'bathOn';
         }
-		$rootScope.active = 'vendor_material';
+		$rootScope.active = 'vendor_productOn';
 		document.title = '产品导入-优软商城';
         //切换展示的信息
         $scope.toggleActive = function(active) {

src/main/webapp/resources/view/common/bankInfoModal.html

@@ -0,0 +1,132 @@
+<style>
+    .margin15 {
+        margin: 0 7px 0 0;
+        font-size: 14px;
+        font-weight: normal;
+        width: 67px;
+    }
+
+    .divinline {
+        display: inline-block;
+    }
+    .modal-header {
+        padding: 15px 18px;
+        border-bottom: 1px solid #ddd;
+    }
+    .divinline .form-control {
+        opacity: 1;
+        width: 241px;
+        border-radius: 0;
+        position:relative;
+    }
+    .divinline .select-down{
+        float:left;
+        width: 241px;
+        max-height:230px;
+        overflow-y: scroll;
+        border-radius: 3px;
+        border:1px solid #5078cb;
+        position:absolute;
+        background: #fff;
+        top:34px;
+        z-index:1000;
+    }
+    .divinline .select-down li{
+        line-height: 32px;
+        padding:6px;
+        padding-left:12px;
+    }
+    .divinline .select-down li:hover{
+        background: #5078cb;
+        color:#fff;
+        cursor:pointer;
+    }
+    .divinline .select-down li.active{
+        background: #5078cb;
+        color:#fff;
+        cursor:pointer;
+    }
+    .modal-content {
+        width: 482px;
+    }
+    .modal-body .form-group .warn-message {
+        color: #f41b1b;
+        font-size: 12px;
+        margin-left: 10px;
+    }
+    .modal-body .remind-message {
+        width: auto;
+        font-size: 12px;
+        position: relative;
+        left: -15px;
+        bottom: 3px;
+    }
+    .modal-footer {
+        text-align: center;
+        border: none;
+        padding-top: 0;
+    }
+    .modal-footer button {
+        margin-right: 10px;
+    }
+</style>
+<div class="modal-header" style="position:relative">
+    <h3 class="modal-title" style="font-weight: 700">{{title}}</h3>
+    <span style="color:#cbcaca;width:10px;height:10px;position:absolute;top:15px;right:15px;"><i class="fa fa-close" style="font-size: 14px;" ng-click="cancel()"></i></span>
+</div>
+<form class="form-horizontal add-bank-account" style="margin-left: 17px;" name="myForm" novalidate>
+    <div class="modal-body">
+        <div class="form-group">
+            <label class="margin15"><b class="text-inverse">*&nbsp;</b>开户银行</label>
+            <div class="divinline" style="position:relative;margin-right:25px;">
+                <!--<select class="form-control select-adder">-->
+                <!--<option>请选择开户银行</option>-->
+                <!--<option value="1">1</option>-->
+                <!--<option value="2">2</option>-->
+                <!--</select>-->
+                <input name="bankname" ng-model="account.bankname" ng-change="checkAccount(1)" autocomplete="off" type="text" class="form-control" placeholder="请选择开户银行" required style="width:216px;border-right:transparent;border-radius:3px 0 0 3px;" ng-keydown="onKeyUp()" ng-focus="getItemFocus()" ng-blur="onItemBlur()">
+                <i class="select-adder" style="display:inline-block;width:25px;height:34px;border:1px solid #ddd;position:absolute;right:-25px;top:0;border-radius:0 3px 3px 0;border-left:transparent" ng-click="showList()"></i>
+                <ul class="select-down" ng-if="showBankFrame && matchData" id="ulContent">
+                    <li ng-click="fitBankToAccount(bank)" ng-repeat="bank in resultList" ng-class="{'active': $index==selectIndex}">{{bank}}</li>
+                </ul>
+            </div>
+            <span class="warn-message" ng-if="account.bankname && !matchData">请填写正确的开户银行</span>
+            <span class="warn-message" ng-if="myForm.bankname.$touched && myForm.bankname.$invalid">开户银行不能为空</span>
+        </div>
+        <div class="form-group">
+            <label class="margin15"><b class="text-inverse">*&nbsp;</b>开户支行</label>
+            <div class="divinline">
+                <input name="branchname" type="text" class="form-control" ng-model="account.branchname" ng-change="checkAccount(2)" autocomplete="off"
+                       placeholder="例如：侨香支行" ng-required="true">
+            </div>
+            <span class="warn-message" ng-if="account.branchname && branchPattError">请填写正确的开户支行</span>
+            <span class="warn-message" ng-if="account.branchname && !branchPattError && branchError">请勿超过20个字</span>
+            <span class="warn-message" ng-if="myForm.branchname.$touched && myForm.branchname.$invalid">开户支行不能为空</span>
+        </div>
+        <div class="form-group">
+            <label class="margin15"><b class="text-inverse">*&nbsp;</b>银行账号</label>
+            <div class="divinline">
+                <input name="number" ng-model="account.number" type="text" class="form-control"
+                       placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
+            </div>
+            <span class="warn-message" ng-if="account.number && numberPattError">请填写正确的银行账号</span>
+            <span class="warn-message" ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</span>
+            <span class="warn-message" ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</span>
+            <span class="warn-message" ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</span>
+        </div>
+        <div class="form-group">
+            <label class="margin15"><b class="text-inverse">*&nbsp;</b>开户名称</label>
+            <div class="divinline">
+                <input name="accountname" type="text" class="form-control" ng-model="account.accountname"
+                       placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
+            </div>
+            <span class="warn-message" ng-if="account.accountname && nameError">请勿超过50个字</span>
+            <span class="warn-message" ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</span>
+        </div>
+        <label class="remind-message"><b class="text-inverse">*&nbsp;</b>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</label>
+    </div>
+</form>
+<div class="modal-footer">
+    <button class="com-btn-level1 com-btn-cancel" ng-click="cancel()">取消</button>
+    <input type="submit" class="com-btn-submit com-btn-level1" ng-click="confirm()" value="确定" />
+</div>

src/main/webapp/resources/view/sso/left_nav.html

@@ -48,7 +48,7 @@
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_management'}"><span ui-sref="ssoManagement">员工管理</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_permission'}"><span ui-sref="ssoPermission">角色权限</span></li>
 		<li ng-class="{'active' : active == 'sso_address'}"><span ui-sref="ssoAddress">收货地址</span></li>
-		<li ng-class="{'active' : active == 'sso_invoice'}"><span ui-sref="ssoInvoice">发票管理</span></li>
+		<li ng-class="{'active' : active == 'sso_invoice'}"><span ui-sref="ssoInvoice">发票信息</span></li>
 		<li ng-class="{'active' : active == 'vendor_pay_center'}" ng-if="userInfo.enterprise.uu && userInfo.enterprise.isVendor == 313"><span ui-sref="gatheringAccount({'tab': 'accountTab'})">收款账户</span></li>
 		<li ng-class="{'active' : active == 'buyer_pay_center'}"><span ui-sref="payAccount({'status': 'pay-info'})">付款账户</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_logistics'}">-->

src/main/webapp/resources/view/sso/ssoInvoice.html

@@ -515,7 +515,8 @@
     <!--<div style="background: #f5f5f5; height: 11px" ng-if="!changeBillStatusFlag"></div>-->
     <!--发票操作导航-->
     <div class="match-menu" ng-if="changeBillStatusFlag">
-                <span class="active">
+                <span ng-if="invoices.length === 0"></span>
+                <span class="active" ng-if="invoices.length > 0">
                     <a ng-bind="isAdd?'新增发票信息':'修改发票信息'"></a>
                         <i class="fa fa-remove" ng-click="exitEdit()" ng-if="invoices.length > 0"></i>
                 </span>

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

@@ -236,7 +236,7 @@
         <div class="invoice-record">
             <div class="invoice-search">
                 <div class="fr">
-                    <input type="text" ng-keydown="enterEvent($event)" class="form-control" ng-model="keyword" placeholder="商家名称/订单号/发票抬头/收票人/联系电话"/>
+                    <input type="text" ng-keydown="enterEvent($event)" class="form-control" ng-model="keyword" placeholder="卖家/订单号/收票人/联系电话"/>
                     <button ng-click="searchByKey()">搜索</button>
                 </div>
             </div>
@@ -321,7 +321,7 @@
                                             </div>
                                             <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                                 <div class="pull-left name">订单号: </div>
-                                                <div class="pull-left marginLeft" style="max-width: 224px">
+                                                <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
                                                     <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                                 </div>
                                             </div>

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

@@ -255,7 +255,7 @@ body div.ng-table-pager a.page-a {
             </div>
             <div class="invoice-search">
                 <div class="fr">
-                    <input type="text" ng-keydown="enterEvent($event)" class="form-control" ng-model="keyword" placeholder="卖家/物料名称/订单号/收票人/联系电话"/>
+                    <input type="text" ng-keydown="enterEvent($event)" class="form-control" ng-model="keyword" placeholder="卖家/订单号/收票人/联系电话"/>
                     <button ng-click="searchByKeyword()">搜索</button>
                 </div>
             </div>
@@ -289,7 +289,7 @@ body div.ng-table-pager a.page-a {
                                 <!--<a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>-->
                             <!--</td>-->
                             <td>
-                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-bind="item.orderid" target="_blank" style="display: block;"></a>
+                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{item.orderid | EncryptionFilter}}" ng-bind="item.orderid" target="_blank" style="display: block;"></a>
                             </td>
                             <td ng-bind="item.paytime | date: 'yyyy-MM-dd HH:mm'">
 

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -435,45 +435,58 @@
                         <td colspan="2" style="position: relative;padding: 0px">
                             <div class="clearboth tbpadding" >
                                 <div class="pull-left clearboth w65" style="margin-bottom: 0px">
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50 clearboth">
+                                    <div class="list clearboth pull-left" style="width: 50%">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">发票抬头: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.invoicetitle}}" style="max-width: 224px">{{item.invoicetitle}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">税务登记号: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        <div class="clearboth w100">
+                                            <div class="pull-left name">买家: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.submiter.userName}}" style="max-width: 224px">{{item.submiter.userName}}</div>
                                         </div>
-                                    </div>
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">开票金额: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.price}}" style="max-width: 224px">{{'￥' + item.price || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">开户银行: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
-                                        </div>
-                                    </div>
-
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">单位电话: </div>
                                             <div class="pull-left marginLeft" title="{{item.billInfo.companyPhone}}">{{item.billInfo.companyPhone || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">单位地址: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype !== 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="pull-left list clearboth" style="width: 50%">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">税务登记号: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">开户银行: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">开户银行账号: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankAccount}}" style="max-width: 200px">{{item.billInfo.bankAccount || '-'}}</div>
                                         </div>
-                                    </div>
-                                    <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                        <div class="pull-left name">单位地址: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
-                                    </div>
-                                    <div class="pull-left w50">
-                                        <div class="pull-left name">订单号: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
-                                            <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -565,7 +578,7 @@
     <div class="vendor-invoice" ng-if="active == 'apply_record'">
         <div class="invoice-search" style="margin-top: 5px;margin-bottom: 16px; width: 100%">
             <div class="fr">
-                <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="订单号/发票抬头/收票人/联系电话"/>
+                <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="买家/订单号/收票人/联系电话"/>
                 <button ng-click="searchByKey(keyword)">搜索</button>
             </div>
         </div>
@@ -596,48 +609,60 @@
                         <td colspan="2" style="position: relative;padding: 0px">
                             <div class="clearboth tbpadding" >
                                 <div class="pull-left clearboth" style="margin-bottom: 0px;width: 65%">
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50 clearboth">
+                                    <div class="list clearboth pull-left" style="width: 50%">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">发票抬头: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.invoicetitle}}" style="max-width: 224px">{{item.invoicetitle}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">税务登记号: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        <div class="clearboth w100">
+                                            <div class="pull-left name">买家: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.submiter.userName}}" style="max-width: 224px">{{item.submiter.userName}}</div>
                                         </div>
-                                    </div>
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50">
+                                        <div class="clearboth w100">
                                             <div class="pull-left name">开票金额: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.price}}" style="max-width: 224px">{{'￥' + item.price || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                            <div class="pull-left name">开户银行: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
-                                        </div>
-                                    </div>
-
-                                    <div class="list clearboth" style="width: 100%">
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">单位电话: </div>
                                             <div class="pull-left marginLeft" title="{{item.billInfo.companyPhone}}">{{item.billInfo.companyPhone || '-'}}</div>
                                         </div>
-                                        <div class="pull-left w50" ng-if="item.invoicetype === 1205">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">单位地址: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype !== 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="pull-left list clearboth" style="width: 50%">
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">税务登记号: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.companyTaxNumber}}" style="max-width: 205px;">{{item.billInfo.companyTaxNumber || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">开户银行: </div>
+                                            <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankName}}" style="max-width: 224px">{{item.billInfo.bankName || '-'}}</div>
+                                        </div>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">开户银行账号: </div>
                                             <div class="pull-left marginLeft overhidden" title="{{item.billInfo.bankAccount}}" style="max-width: 200px">{{item.billInfo.bankAccount || '-'}}</div>
                                         </div>
-                                    </div>
-                                    <div class="pull-left w50" ng-if="item.invoicetype === 1205">
-                                        <div class="pull-left name">单位地址: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px;text-align: left;white-space: normal;word-break: break-all;" title="{{item.billInfo.companyAddress}}">{{item.billInfo.companyAddress || '-'}}</div>
-                                    </div>
-                                    <div class="pull-left w50">
-                                        <div class="pull-left name">订单号: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px">
-                                            <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
+                                        <div class="clearboth w100" ng-if="item.invoicetype === 1205">
+                                            <div class="pull-left name">订单号: </div>
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <p ng-repeat="(col,orderid) in item.orderids">
+                                                    <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                    <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                </p>
+                                            </div>
                                         </div>
                                     </div>
-
                                 </div>
                                 <div class="pull-right clearboth" style="margin-bottom: 0px;width: 35%">
                                     <div class="pull-left w100 clearboth">

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

@@ -588,7 +588,7 @@
 							<span class="tip_info" ng-if="storeInfo.type == 'DISTRIBUTION'">您已成功申请经销商店铺</span>
 						</div>
 						<div class="col-md-8" style="text-align: right;">
-							<span class="tip_info" ng-if="store"><a ng-href="{{'store/' + store.uuid}}">进入我的店铺</a></span>
+							<span class="tip_info" ng-if="store"><a ng-href="{{isPcbStore ? 'pcb' : ('store/' + store.uuid)}}">进入我的店铺</a></span>
 						</div>
 					</div>
 				</div>