Pārlūkot izejas kodu

卖家发货,新增配送商按钮修改;erp相关页面居中;线下分期卖家权限错误提示。

yangc 8 gadi atpakaļ
vecāks
revīzija
a0b8c853bd

+ 5 - 1
src/main/webapp/resources/css/erp/align.css

@@ -1,3 +1,7 @@
 .user_content .user_right {
-    margin-right: 90px;
+    float: none!important;
+    margin: 0 auto;
+}
+.wrap {
+    width: 100%;
 }

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/purchase_detail.js

@@ -64,7 +64,7 @@ define(['app/app'], function(app) {
 					Installment.validationCount({purchaseId : $scope.purchase.id}, null, function (data) {
 						$scope.isShow = true;
 					}, function (error) {
-						if (error.data === '当前企业没有设置分期功能权限,如有需要请联系客服') {
+						if (error.data == '"当前企业没有设置分期功能权限,如有需要请联系客服"') {
 							toaster.pop('error', error.data);
 						} else {
 							$scope.setShowNoAccountBox(true);

+ 23 - 6
src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html

@@ -75,7 +75,9 @@
         border-radius: 3px;
     }
     .sell_oder .sure_oder .oder_xq_list dl span .dropdown-menu{
-        top: 95%;
+        position: unset;
+        float: none;
+        /*top: 95%;*/
         line-height: 23px;
         max-height: 120px;
         overflow-y: auto;
@@ -83,6 +85,7 @@
         display: block;
         overflow-x: hidden;
         border-radius: 0;
+        box-shadow: none;
     }
     .sell_oder .sure_oder .oder_xq_list dl span .dropdown-menu li{
         font-size: 14px;
@@ -478,6 +481,17 @@
         margin-top: -1px;
         height: 32px;
     }
+    #oder-detail .line60.logistic-input span.input-ul >div {
+        position: relative;
+        -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
+        box-shadow: 0 6px 12px rgba(0,0,0,.175);
+    }
+    #oder-detail .line60.logistic-input span.input-ul >div >a {
+        width: 170px;
+        background: #e8e8e8;
+        color: #666!important;
+        display: block;
+    }
     #oder-detail .line60.logistic-input span.input-ul em{
     }
     #oder-detail .line60.logistic-input .logistic-input-01{
@@ -672,10 +686,13 @@
                             <span class="input-ul">
                                 <input id="addr" style="border: #5078cb 1px solid;" type="text" class="form-control select-adder" ng-focus="getItemFocus()" ng-blur="onItemBlur()" ng-keydown="onKeyup()" ng-model="logistics.companyName" placeholder="请选择物流公司" autocomplete="off" maxlength="15" readonly="readonly" >
                                 <!--<em name="companyName" ng-click="changeShowLogistics()" class="btn-position"><i class="fa fa-caret-down" aria-hidden="true"></i></em>-->
-                                <ul id="ulContent" ng-if="showCompanyName" class="dropdown-menu">
-                                    <li ng-click="showDefaultText()">请选择物流公司</li>
-                                    <li ng-click="showText(data)" ng-repeat="data in data_list" ng-class="{'active': $index==selectIndex}" ng-bind="data.companyName"></li>
-                                </ul>
+                                <div ng-if="showCompanyName">
+                                    <ul id="ulContent" class="dropdown-menu">
+                                        <li ng-click="showDefaultText()">请选择物流公司</li>
+                                        <li ng-click="showText(data)" ng-repeat="data in data_list" ng-class="{'active': $index==selectIndex}" ng-bind="data.companyName"></li>
+                                    </ul>
+                                    <a ng-click="addDistributor()">+&nbsp;新增配送商</a>
+                                </div>
                             </span>
                             <span  style="width: 10%;"> 物流单号 :&nbsp;</span>
                             <span style="margin-right: 20px; width: 160px; float: left;">
@@ -694,7 +711,7 @@
                         <div ng-if="checkinvoice.status==406">
                             <a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认发货</a>
                             <a ng-click="backToDelivery()" class="cancel">取消</a>
-                            <a ng-click="addDistributor()" class="add">新增配送商</a>
+                            <!--<a ng-click="addDistributor()" class="add">新增配送商</a>-->
                         </div>
                     </dd>
                 </dl>