wangcz пре 7 година
родитељ
комит
da6000c499
41 измењених фајлова са 2538 додато и 76 уклоњено
  1. 1 1
      src/main/resources/test/sys.properties
  2. 1 1
      src/main/webapp/resources/css/common.css
  3. 58 1
      src/main/webapp/resources/js/sso/controllers/b2b/newPartnerCtrl.js
  4. 12 0
      src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js
  5. 2 2
      src/main/webapp/resources/view/sso/b2b/invitation.html
  6. 2385 0
      src/main/webapp/resources/view/sso/b2b/modal/partnership_modal.html
  7. 2 2
      src/main/webapp/resources/view/sso/b2b/searchresult.html
  8. 2 2
      src/main/webapp/resources/view/sso/b2b/vendorsInfo.html
  9. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/cart.html
  10. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html
  11. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/tender_answer_list.html
  12. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/tenderlist.html
  13. 2 2
      src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html
  14. 1 1
      src/main/webapp/resources/view/usercenter/b2b/modal/enableOrderList.html
  15. 2 2
      src/main/webapp/resources/view/usercenter/b2b/order/changeList.html
  16. 2 2
      src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder.html
  17. 2 2
      src/main/webapp/resources/view/usercenter/b2b/order/outorder.html
  18. 2 2
      src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html
  19. 2 2
      src/main/webapp/resources/view/vendor/b2b/apBill.html
  20. 2 2
      src/main/webapp/resources/view/vendor/b2b/apCheck.html
  21. 2 2
      src/main/webapp/resources/view/vendor/b2b/modal/apcheck_customer.html
  22. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/approval.html
  23. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/sale_accept.html
  24. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/sale_badIn.html
  25. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html
  26. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/sale_make_accept.html
  27. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/sale_make_returns.html
  28. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale/sample.html
  29. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_change.html
  30. 1 1
      src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html
  31. 5 2
      src/main/webapp/resources/view/vendor/b2b/sale_inquiryMould.html
  32. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_makechange.html
  33. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_maketodo.html
  34. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_notice.html
  35. 3 3
      src/main/webapp/resources/view/vendor/b2b/sale_order.html
  36. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_send.html
  37. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_tenderList.html
  38. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_tender_question_list.html
  39. 4 6
      src/main/webapp/resources/view/vendor/forstore/addExistUser.html
  40. 2 2
      src/main/webapp/resources/view/vendor/forstore/purchaseAccept.html
  41. 7 0
      src/main/webapp/resources/view/vendor/forstore/vendor_take_self.html

+ 1 - 1
src/main/resources/test/sys.properties

@@ -54,7 +54,7 @@ inquiryServiceInnerUrl=http://218.17.158.219:24000
 messageServiceUrl=http://192.168.253.12:24000/message/
 
 #b2b
-b2b=http://218.17.158.219/b2b_test
+b2b=http://218.17.158.219:9000/b2b_test
 b2bDomain=218.17.158.219:9000/b2b_test
 
 #lottery

+ 1 - 1
src/main/webapp/resources/css/common.css

@@ -402,7 +402,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 
 .modal-open .modal {
     overflow-x: hidden;
-    overflow-y: hidden;
+    /*overflow-y: hidden;*/
 		z-index: 999995 !important;
 }
 

+ 58 - 1
src/main/webapp/resources/js/sso/controllers/b2b/newPartnerCtrl.js

@@ -147,7 +147,7 @@ define(['app/app'], function (app) {
                       if (data.result) {
                           //选择打印模板
                           var modalInstance = $modal.open({
-                              templateUrl: 'static/tpl/index/baseInfo/modal/partnership_modal.html',
+                              templateUrl: 'static/view/sso/b2b/modal/partnership_modal.html',
                               controller: 'PartnerShipCtrl',
                               resolve: {
                                   PartnerShipInfo: function () {
@@ -263,4 +263,61 @@ define(['app/app'], function (app) {
               });
           }
       }]);
+    /**
+     * 同意申请后续操作
+     */
+    app.register.controller('PartnerShipCtrl', ['$scope', 'PartnerShipInfo', '$modalInstance', 'B2bAddPartner', 'toaster',
+        function($scope, PartnerShipInfo, $modalInstance, AddPartner, toaster) {
+            $scope.partInfo = PartnerShipInfo;
+
+            // 添加为服务商
+            $scope.addServicer = function (vendUID) {
+                AddPartner.addServicer({businessCode: vendUID}, {}, function (data) {
+                    if (data.success) {
+                        toaster.pop('success', '提示', data.success);
+                        $scope.tableParams.reload();
+                    }
+                    if (data.error) {
+                        toaster.pop('error', '提示', data.error);
+                    }
+                }, function (response) {
+                    toaster.pop('error', '失败', response.data);
+                })
+            };
+
+            // 添加客户
+            $scope.addCust = function (vendUID) {
+                AddPartner.addCust({businessCode: vendUID}, {}, function (data) {
+                    if (data.success) {
+                        toaster.pop('success', '提示', data.success);
+                        $scope.tableParams.reload();
+                    }
+                    if (data.error) {
+                        toaster.pop('error', '提示', data.error);
+                    }
+                }, function (response) {
+                    toaster.pop('error', '失败', response.data);
+                })
+            };
+
+            // 添加为供应商
+            $scope.addSupplier = function (vendUID) {
+                AddPartner.addSupplier({businessCode: vendUID}, {}, function (data) {
+                    if (data.success) {
+                        toaster.pop('success', '提示', data.success);
+                        $scope.tableParams.reload();
+                    }
+                    if (data.error) {
+                        toaster.pop('error', '提示', data.error);
+                    }
+                }, function (response) {
+                    toaster.pop('error', '失败', response.data);
+                })
+            };
+
+            // 关闭
+            $scope.close = function() {
+                $modalInstance.close();
+            }
+        }]);
 });

+ 12 - 0
src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -173,6 +173,18 @@ define(['app/app'], function (app) {
                             $defer.resolve(page.content);
                             $scope.users = page.content;
                             $scope.reloadUserCheck(false);
+                            var arr = [];
+                            angular.forEach($scope.users, function (item) {
+                                arr.push(item.userUU);
+                            })
+                            B2bUser.getUsersByUU({userUUJson: JSON.stringify(arr)}, function (data) {
+                                angular.forEach($scope.users, function (item, index) {
+                                    item.b2bRoles = data[index].roles;
+                                })
+                                console.log($scope.users);
+                            }, function () {
+                                toaster.pop('获取b2b角色信息失败');
+                            })
                         }
                     },function (error) {
                         toaster.pop('error', '获取企业人员信息失败',error.data);

+ 2 - 2
src/main/webapp/resources/view/sso/b2b/invitation.html

@@ -139,8 +139,8 @@
 					<div class="col-xs-9">
 						<div class="search">
 							<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-								<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、联系人、邀请人进行搜索" />
-								<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+								<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、联系人、邀请人进行搜索" />
+								<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 							</div>
 						</div>
 					</div>

+ 2385 - 0
src/main/webapp/resources/view/sso/b2b/modal/partnership_modal.html

@@ -0,0 +1,2385 @@
+<style>
+    * {
+        box-sizing: border-box;
+        padding: 0;
+        margin: 0;
+    }
+
+
+    a {
+        text-decoration: none;
+    }
+
+    a:hover {
+        text-decoration: none;
+    }
+
+    .clearfix:before, .clearfix:after {
+        display: table;
+        content: '';
+        line-height: 0;
+    }
+
+    .clearfix:after {
+        clear: both;
+    }
+
+    .clear {
+        clear: both;
+    }
+
+    .fl {
+        float: left;
+    }
+
+    .fr {
+        float: right;
+    }
+
+    .textMore {
+        display: block;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
+    .no-space {
+        display: flex;
+    }
+
+    body {
+        background: #f5f5f5;
+    }
+
+    .wrap {
+        width: 100%;
+        margin: 0px auto;
+        /*margin-top: 20px;*/
+    }
+
+    .content {
+        width: 973px;
+        margin: 0 auto;
+    }
+
+    .bule {
+        color: #3578ba;
+    }
+
+    .grey {
+        color: #969595;
+    }
+
+    .red {
+        color: #d2272d;
+    }
+
+    /*产品资料-价格*/
+    input:focus, select:focus {
+        border: #3578ba 1px solid !important;
+        order-color: #66afe9;
+        outline: 0;
+        -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
+    }
+
+    .com_title {
+        width: 100%;
+        margin: 0px auto;
+        height: 40px;
+        line-height: 40px;
+        font-size: 14px;
+        color: #323232;
+        background: #f5f5f5;
+    }
+
+    .com_title font {
+        color: #3f84f6;
+    }
+
+    .search {
+        position: relative;
+    }
+
+    .search input {
+        width: 300px;
+        padding-left: 10px;
+        height: 36px;
+        background: #fff;
+        float: left;
+        vertical-align: middle;
+        border: #3578ba 1px solid;
+        font-size: 14px;
+        text-align: center;
+        padding-right: 85px;
+        line-height: 36px;
+    }
+
+    .search a.seek {
+        vertical-align: middle;
+        display: inline-block;
+        line-height: 36px;
+        text-align: center;
+        height: 36px;
+        width: 85px;
+        border-left: 0;
+        background: #3578ba;
+        color: #fff;
+        text-align: center;
+        font-size: 16px;
+        float: right;
+        border: #3578ba 1px solid;
+        position: absolute;
+        right: 0;
+    }
+
+    .search a.seek:hover {
+        background: #1f6199;
+        color: #fff;
+    }
+
+    .public-01 {
+        height: 44px;
+        margin-bottom: 10px;
+        margin-top: 10px;
+    }
+
+    .public-01 ul {
+        width: 87%;
+        margin: 0 auto;
+        height: 44px;
+        line-height: 44px;
+        background: #fff;
+        border: #e8e8e8 1px solid;
+    }
+
+    .public-01 ul li {
+        width: 100px;
+        height: 44px;
+        text-align: center;
+        float: left;
+        margin-left: 10px;
+    }
+
+    .public-01 ul li a {
+        font-size: 16px;
+        width: 100px;
+        height: 44px;
+        display: inline-block;
+        color: #323232;
+    }
+
+    .public-01 ul li.active a {
+        color: #d82128;
+        border-bottom: 3px #d82128 solid;
+    }
+
+    .public-01 ul li:hover a {
+        color: #d82128;
+        border-bottom: 3px #d82128 solid;
+    }
+
+    .public-01 ul li a em {
+        color: #d2272d;
+        font-size: 16px;
+    }
+
+    .public-01 ul li.active a {
+        color: #d82128;
+    }
+
+    .public-01-btn, .public-01-btn a {
+        width: 104px;
+        height: 44px;
+        color: #3f84f6;
+        text-align: center;
+        background: #fff;
+        display: inline-block;
+        font-size: 14px;
+        line-height: 44px;
+        border: #e8e8e8 1px solid;
+    }
+
+    .public-01-btn a:hover {
+        border: #3578ba 1px solid;
+    }
+
+    .public-01-btn a img {
+        vertical-align: middle;
+        margin-right: 5px;
+    }
+
+    .pro-price {
+        margin-bottom: 20px !important;
+    }
+
+    .pro-price, .pro-price dl {
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+        padding-top: 6px;
+    }
+
+    .pro-price dl dt {
+        width: 100%;
+        margin: 0 auto;
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .pro-price dl span {
+        width: 18.75%;
+        display: inline-block;
+        float: left;
+        font-size: 14px;
+        text-align: center;
+    }
+
+    .pro-price dl span.wid01 {
+        width: 25%;
+    }
+
+    .pro-price dl dt span {
+        line-height: 40px;
+    }
+
+    .pro-price dl dd span {
+        line-height: 110px;
+        height: 110px;
+    }
+
+    .pro-price dl dd span p {
+        line-height: 22px;
+        text-align: left;
+        font-size: 14px;
+        width: 80%;
+        margin: 0 auto;
+    }
+
+    .pro-price dl dd {
+        border-bottom: #e3e3e3 1px dotted;
+    }
+
+    .pro-price dl dd:hover {
+        border: #d32526 1px solid;
+    }
+
+    .pro-price dl dd {
+        height: 110px;
+        overflow: hidden;
+    }
+
+    .pro-price dl .bottom01 {
+        border-bottom: #3578ba 1px dotted;
+    }
+
+    .pro-price dl dd span.style01 {
+        padding-top: 10px;
+    }
+
+    .pro-price dl dd span em {
+        width: 100%;
+        display: inline-block;
+        font-size: 14px;
+    }
+
+    .pro-price dl dd span.style02 {
+        line-height: 22px;
+        margin-top: 30px;
+    }
+
+    .pro-price dl dd span em i {
+        margin-left: 10px;
+    }
+
+    /*B2B商务账号设置-个人信息*/
+    /*弹框*/
+    .bomb-box {
+        width: 100%;
+        height: 100%;
+        position: fixed;
+        z-index: 11111;
+        background: rgba(0, 0, 0, 0.2);
+        top: 0;
+        left: 0;
+    }
+
+    .bomb-box .box {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        margin: auto;
+        box-shadow: 0 0 3px #888;
+    }
+
+    .bomb-box .box01 {
+        margin-top: 80px;
+        width: 580px;
+        height: 406px;
+        border-radius: 5px;
+        background: #fff;
+    }
+
+    .bomb-box .box i.off {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        position: absolute;
+        right: 8px;
+        top: 8px;
+        text-align: center;
+        cursor: pointer;
+    }
+
+    .bomb-box .box p {
+        height: 40px;
+        line-height: 40px;
+        font-size: 14px;
+        width: 100%;
+        margin: 0 auto;
+        border-bottom: #e8e8e8 1px solid;
+        padding-left: 20px;
+    }
+    .bomb-box .box-bottom{
+        padding: 0 5px 5px;
+        width: 465px;
+        height: 450px!important;
+        background: #e8e8e8;
+    }
+    .bomb-box .box-bottom .box-header{
+        padding-left: 5px;
+        width: 100%;
+        height: 26px;
+    }
+    .bomb-box .box-bottom .box-header p{
+        float: left;
+        padding-left: 10px;
+        height: 26px;
+        line-height: 28px;
+        width: 100px;
+        font-size: 14px;
+        color: #000;
+    }
+    .bomb-box .box-bottom .box-header a{
+        margin-top: 6px;
+        display: inline-block;
+        float: right;
+        width: 15px;
+        height: 15px;
+        text-align: center;
+        font-size: 14px;
+        color: #000;
+        border-radius: 3px;
+        border: 1px solid #000;
+    }
+    .bomb-box .box-bottom .per-data{
+        margin: 0 auto;
+        width: 455px;
+        height: 418px;
+        text-align: center;
+        background: #f3f3f3;
+        border-top: 1px solid #ccc;
+    }
+    .bomb-box .box-bottom .per-data ul li{
+        margin-bottom: 15px;
+        height: 26PX;
+        line-height: 26px;
+    }
+    .bomb-box .box-bottom .per-data ul li:first-child, .bomb-box .box-bottom .per-data ul li:last-child{
+        margin-top: 25px;
+    }
+    .bomb-box .box-bottom .per-data ul li em{
+        width: 80px;
+        text-align: right;
+    }
+    .bomb-box .box-bottom .per-data ul li input{
+        padding-left: 10px;
+        width: 300px;
+        height: 26px;
+        border: 1px solid #a0a0a0;
+    }
+    .bomb-box .box-bottom .per-data ul li a.mod-psd{
+        float: none;
+    }
+
+    .per-data {
+        width: 90%;
+        margin: 0 auto;
+    }
+
+    .per-data ul, .per-data ul li {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .per-data ul li {
+        height: 34px;
+        line-height: 34px;
+        margin-top: 15px;
+    }
+
+    .per-data ul li em {
+        width: 60px;
+        font-size: 14px;
+        float: left;
+    }
+    .per-data ul li.text-info{
+        font-size: 13px;
+        color: #787878 !important;
+    }
+    .per-data ul li.text-info b{
+        font-size: 13px;
+        color: #D08200;
+    }
+    .per-data ul li input, .per-data ul li select {
+        width: 236px;
+        height: 34px;
+        border: #e8e8e8 1px solid;
+        font-size: 14px;
+        padding-left: 10px;
+    }
+
+    .per-data ul li select {
+        background: url("../img/purc/select.png") no-repeat right;
+        -webkit-appearance: none;
+        appearance: none;
+        -o-appearance: none;
+        -moz-appearance: none;
+        -ms-appearance: none;
+    }
+
+    .per-data ul li select option {
+        line-height: 30px;
+    }
+
+    .per-data ul li span {
+        color: #959595;
+        line-height: 18px;
+        float: right;
+        width: 215px;
+        display: inline-block;
+    }
+
+    .per-data ul li.per-btn {
+        margin-top: 30px;
+    }
+    .per-data ul li.perBtn{
+        margin-top: 45px;
+    }
+    .per-data ul li.perBtn .save{
+        margin-left: 150px;
+    }
+    .per-data ul li a {
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        font-size: 14px;
+        color: #fff;
+        text-align: center;
+        line-height: 34px;
+        float: left;
+    }
+
+    .per-data ul li button {
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        font-size: 14px;
+        color: #fff;
+        text-align: center;
+        line-height: 34px;
+        float: left;
+    }
+
+    .per-data ul li a.save {
+        margin-left: 60px;
+        background: #3f84f6;
+    }
+
+    .per-data ul li button.save {
+        margin-left: 60px;
+        background: #3f84f6;
+        border: 1px;
+    }
+
+    .per-data ul li a.mod-psd {
+        background: #8dc7f9;
+        margin-left: 30px;
+    }
+
+    .per-data ul li a:hover {
+        background: #3578ba;
+    }
+
+    .per-data ul li button:hover {
+        background: #3578ba;
+    }
+    .per ul{
+        text-align: center;
+    }
+    .per ul li.register{
+        margin-top: 10px;
+        height: 20px;
+        line-height: 20px;
+        font-size: 14px;
+    }
+    .per ul li.register span{
+        float: none;
+        margin-left: 5px;
+        width: 65px;
+        font-size: 14px;
+        color: #3578ba;
+    }
+    .per ul li em{
+        margin-left: 60px;
+        text-align: left;
+    }
+    /*产品资料-价格-新增*/
+    .com_head a {
+        color: #fff;
+        float: right;
+        margin-right: 40px;
+        font-size: 14px;
+    }
+
+    .com_head a i {
+        margin-left: 5px;
+        line-height: 40px;
+    }
+
+    .com_head a:hover {
+        color: #d2272d;
+    }
+
+    .pro-add-data {
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+    }
+
+    .pro-add-data dl {
+        width: 95%;
+        margin: 0 auto;
+    }
+
+    .pro-add-data dl dd {
+        width: 100%;
+        margin: 0 auto;
+        height: 34px;
+        line-height: 34px;
+        font-size: 14px;
+        margin-top: 10px;
+    }
+
+    .pro-add-data dl dd div.fl {
+        width: 100px;
+    }
+
+    .pro-add-data dl dd div.fr {
+        width: 750px;
+    }
+
+    .pro-add-data dl dd div.fr input {
+        width: 750px;
+        border-bottom: #5d5d5d 1px solid !important;
+        height: 34px;
+        line-height: 34px;
+        border: none;
+        position: relative;
+        font-size: 14px;
+        /*top: -6px;*/
+        color: #666;
+    }
+
+    .pro-add-data dl dd div.fr input:focus {
+        /*box-shadow: none;
+        border: none !important;*/
+        border: #3578ba 1px solid !important;
+    }
+
+    .com_title01 {
+        height: 50px;
+        line-height: 50x;
+        width: 100%;
+        margin: 0 auto;
+        border-bottom: #3578ba 1px dotted;
+        border-top: #e8e8e8 1px solid;
+        margin-top: 10px;
+    }
+
+    .com_title01 span {
+        margin-left: 20px;
+        font-size: 14px;
+        line-height: 50px;
+        color: #555;
+        font-weight: bold;
+    }
+
+    .pro-info, .pro-info dl {
+        width: 99%;
+        margin: 0 auto;
+    }
+
+    .pro-info dl dd, .pro-info dl dt {
+        width: 99%;
+        margin: 0 auto;
+        height: 50px;
+        border-bottom: #e8e8e8 1px dotted;
+    }
+
+    .pro-info dl span {
+        width: 8.5%;
+        font-size: 14px;
+        float: left;
+        display: inline-block;
+        height: 50px;
+        line-height: 50px;
+        text-align: center;
+    }
+
+    .pro-info dl span.wid01 {
+        width: 4%;
+    }
+
+    .pro-info dl span.wid02 {
+        width: 12%;
+    }
+
+    .pro-info dl span.wid01 a {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        line-height: 18px;
+        background: #c2c2c2;
+        text-align: center;
+        border-radius: 100%;
+    }
+
+    .pro-info dl span.wid01 a i {
+        color: #fff;
+    }
+
+    .pro-info dl span.wid01 a:hover {
+        background: #d2272d;
+    }
+
+    .pro-info dl span.add-wl {
+        text-align: left;
+        width: 100%;
+    }
+
+    .pro-info .save {
+        width: 100%;
+        height: 36px;
+        margin: 5px 0 20px 0;
+    }
+
+    .pro-info .save a {
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        background: #3578ba;
+        text-align: center;
+        color: #fff;
+        font-size: 14px;
+        float: right;
+        line-height: 36px;
+        margin-right: 40px;
+    }
+
+    .pro-info .save a:hover {
+        background: #1f4fb2;
+    }
+
+    .pro-add-data02 {
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+        margin-top: 20px;
+    }
+
+    .pro-search {
+        width: 100%;
+        height: 90px;
+        margin: 0 auto;
+        /*border-bottom: #d0cfcf 1px solid;*/
+        overflow: hidden;
+    }
+
+    .pro-search .search {
+        margin-top: 30px;
+        margin-right: 20px;
+    }
+
+    .pro-search .search input {
+        width: 348px;
+    }
+
+    .pro-add-data02 .pro-info dl span {
+        width: 12.5%;
+    }
+
+    /*分页*/
+    .page {
+        width: 100%;
+        margin: 0 auto;
+        height: 60px;
+        line-height: 60px;
+    }
+
+    .page ul {
+        margin-left: 20px;
+    }
+
+    .page ul li {
+        float: left;
+        font-size: 14px;
+        color: #999;
+        margin: 0 5px;
+    }
+
+    .page ul li a {
+        width: 50px;
+        display: inline-block;
+        font-size: 14px;
+        color: #999;
+    }
+
+    .page ul li input {
+        width: 24px;
+        height: 24px;
+        border: #3578ba 1px solid;
+        text-align: center;
+        color: #3578ba;
+        margin: 0 10px;
+    }
+
+    .page ul li a:hover {
+        color: #3578ba;
+    }
+
+    /*产品资料批量导入 1*/
+    .bomb-box .box02 {
+        width: 654px;
+        height: 264px;
+        border-radius: 5px;
+        background: #fff;
+    }
+
+    .bomb-box .box02 .many-file {
+        width: 90%;
+        margin: 0 auto;
+        font-size: 14px;
+    }
+
+    .bomb-box .box02 .many-file .file {
+        margin-top: 25px;
+        position: relative;
+    }
+
+    .bomb-box .box02 .many-file span {
+        margin-left: 10px;
+    }
+
+    .bomb-box .box02 .many-file span, .bomb-box .box02 .many-file .file input[type="text"] {
+        width: 506px;
+        height: 34px;
+        display: inline-block;
+        border: #e8e8e8 1px solid;
+        position: relative;
+    }
+
+    .bomb-box .box02 .many-file .file input[type="text"] {
+        padding-left: 30px;
+        font-size: 14px;
+        color: #999;
+    }
+
+    .bomb-box .box02 .many-file span {
+        border: none;
+    }
+
+    .bomb-box .box02 .many-file .file i {
+        position: absolute;
+        top: 10px;
+        z-index: 10;
+        color: #959595;
+        font-size: 16px;
+        left: 10px;
+    }
+
+    .bomb-box .box02 .many-file-btn {
+        width: 235px;
+        margin: 0px auto;
+        margin-top: 20px;
+    }
+
+    .bomb-box .box02 .many-file-btn a {
+        width: 94px;
+        height: 36px;
+        line-height: 36px;
+        font-size: 14px;
+        display: inline-block;
+        text-align: center;
+    }
+
+    .bomb-box .box02 .many-file-btn a.btn01 {
+        background: #3f84f6;
+        color: #fff;
+    }
+
+    .bomb-box .box02 .many-file-btn .btn01 a {
+        color: #fff;
+    }
+
+    .bomb-box .box02 .many-file-btn a.btn02 {
+        border: #3f84f6 1px solid;
+        color: #3f84f6;
+        margin-left: 45px;
+    }
+
+    .bomb-box .box02 .many-file-btn a:hover {
+        background: #135c9a;
+        color: #fff;
+    }
+
+    .many-file-text {
+        width: 100%;
+        margin: 0 auto;
+        margin-top: 30px;
+    }
+
+    .many-file-text em {
+        width: 100%;
+        margin: 0 auto;
+        display: inline-block;
+        line-height: 30px;
+    }
+
+    .bomb-box .box02 .file01 {
+        width: 506px;
+        height: 34px;
+        filter: alpha(opacity=0);
+        -moz-opacity: 0;
+        opacity: 0;
+        position: absolute;
+        left: 0;
+        top: 8px;
+    }
+
+    /*产品资料批量导入 后*/
+    .bomb-box .box03 {
+        width: 648px;
+        min-height: 300px;
+        border-radius: 5px;
+        background: #fff;
+        margin-top: 15%;
+        bottom: auto;
+        padding-bottom: 18px;
+    }
+
+    .bomb-box .box03 .many-tile {
+        width: 100%;
+        height: 60px;
+        line-height: 60px;
+        font-size: 14px;
+    }
+
+    .bomb-box .box03 .many-tile i {
+        background: #04be02;
+        color: #fff;
+        font-size: 14px;
+        border-radius: 100%;
+        width: 24px;
+        height: 24px;
+        line-height: 24px;
+        margin-left: 60px;
+        text-align: center;
+        margin-right: 10px;
+    }
+
+    .bomb-box .box03 .fail-data {
+        width: 90%;
+        margin: 0 auto;
+    }
+
+    .bomb-box .box03 .fail-data p {
+        width: 100%;
+        margin: 0 auto;
+        font-size: 14px;
+        color: #959595;
+        height: 30px;
+        line-height: 30px;
+        border-bottom: none !important;
+        padding-left: 0
+    }
+
+    .bomb-box .box03 .fail-data dl {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .bomb-box .box03 .fail-data dl span {
+        font-size: 14px;
+        width: 18.333%;
+        float: left;
+        text-align: center;
+        border: #e8e8e8 1px solid;
+        border-top: none;
+        border-right: none;
+    }
+
+    .bomb-box .box03 .fail-data dl dt, .bomb-box .box03 .fail-data dl dd {
+        width: 100%;
+        margin: 0 auto;
+        display: flex !important;
+        border-top: #e8e8e8 1px solid;
+        border-right: #e8e8e8 1px solid;
+    }
+
+    .bomb-box .box03 .fail-data dl span.wid01 {
+        width: 15%;
+    }
+
+    .bomb-box .box03 .fail-data dl span.wid02 {
+        width: 30%;
+    }
+
+    .bomb-box .box03 .fail-data dl dt, .bomb-box .box03 .fail-data dl dt span {
+        height: 40px;
+        line-height: 40px;
+        display: inline-block;
+    }
+
+    .bomb-box .box03 .fail-data dl dd, .bomb-box .box03 .fail-data dl dd span {
+        height: 50px;
+        line-height: 50px;
+        display: inline-block;
+    }
+
+    .fail-data a {
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        background: #3578ba;
+        text-align: center;
+        color: #fff;
+        font-size: 14px;
+        float: right;
+        line-height: 36px;
+        margin-top: 30px;
+    }
+
+    .fail-data a:hover {
+        background: #1f4fb2;
+    }
+
+    /*供应商列表*/
+    .supply-list {
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+        margin-top: 10px;
+    }
+
+    .supply-list dl, .supply-list dl dt, .supply-list dl dd {
+        width: 100%;
+        margin: 0 auto;
+        border-bottom: #dcdcdc 1px dotted;
+    }
+
+    .supply-list dl dt, .supply-list dl dt span {
+        height: 50px;
+        line-height: 50px;
+    }
+
+    .supply-list dl span {
+        width: 20.5%;
+        display: inline-block;
+        text-align: center;
+        font-size: 14px;
+    }
+
+    .supply-list dl span.wid01 {
+        width: 8%;
+    }
+
+    .supply-list dl span.wid02 {
+        width: 10%;
+    }
+
+    .supply-list dl dd, .supply-list dl dd span {
+        height: 110px;
+        line-height: 110px;
+        overflow: hidden;
+    }
+
+    .supply-list dl dd p {
+        line-height: 22px;
+        padding-top: 20px;
+        font-size: 14px;
+        width: 90%;
+        margin: 0 auto;
+    }
+
+    .supply-list dl dd:hover {
+        border: #d2272d 1px solid;
+    }
+
+    .supply-list dl dd span a {
+        color: #3f84f6;
+    }
+
+    .supply-list dl dd span a.buy-btn {
+        margin-left: 15px;
+    }
+
+    .supply-list dl dd span a:hover {
+        color: #d2272d;
+    }
+
+    /*供应商详情*/
+    .pro-add-data .sty01 {
+        margin-top: 0px !important;
+    }
+
+    .supply-list01 dl span {
+        width: 20%;
+    }
+
+    .supply-list01 dl span.wid01, .supply-list01 dl span.wid02 {
+        width: 10%;
+    }
+
+    .supply-list01 dl span a.edit {
+        margin-right: 10px;
+    }
+
+    /*设置-企业设置-收货地址编辑*/
+    .bomb-box .box04 {
+        width: 780px;
+        height: 478px;
+        background: #fff;
+    }
+
+    .bomb-box .box04 p {
+        height: 50px;
+        line-height: 50px;
+        border-bottom: #dcdcdc 1px dotted;
+    }
+
+    .bomb-box .box04 ul {
+        width: 92%;
+        margin: 0 auto;
+    }
+
+    .bomb-box .box04 ul li {
+        width: 100%;
+        height: 34px;
+        margin-top: 16px !important;
+        line-height: 34px;
+        margin: 0 auto;
+    }
+
+    .bomb-box .box04 ul li.line01 div {
+        width: 50%;
+        float: left;
+    }
+
+    .bomb-box .box04 ul li.line01 div.fl span.fl, .bomb-box .box04 ul li.line01 div.fr span.fl {
+        width: 80px;
+        font-size: 14px;
+    }
+
+    .bomb-box .box04 ul li.line01 div.fl span.fr, .bomb-box .box04 ul li.line01 div.fr span.fr {
+        width: 254px;
+        height: 34px;
+        display: inline-block;
+        float: left;
+    }
+
+    .bomb-box .box04 ul li div em {
+        color: #f00;
+    }
+
+    .bomb-box .box04 ul li.line01 div.fl span.fr input, .bomb-box .box04 ul li.line01 div.fr span.fr input {
+        width: 254px;
+        height: 34px;
+        padding-left: 10px;
+        border: #cccccd 1px solid;
+        font-size: 14px;
+    }
+
+    .bomb-box .box04 ul li.line01 div.fr span.fl {
+        margin-left: 20px;
+    }
+
+    .bomb-box .box04 ul li.line02 div.fl {
+        width: 80px;
+        font-size: 14px;
+    }
+
+    .bomb-box .box04 ul li.line02 div.fr {
+        width: 632px;
+        height: 34px;
+        font-size: 14px;
+        float: left;
+    }
+
+    .bomb-box .box04 ul li.line02 div.fr input {
+        width: 632px;
+        height: 34px;
+        font-size: 14px;
+        padding-left: 10px;
+        border: #cccccd 1px solid;
+    }
+
+    .bomb-box .box04 .margin-top40 {
+        margin-top: 40px !important;
+    }
+
+    .bomb-box .box04 .emaill, .bomb-box .box04 .address {
+        position: relative;
+    }
+
+    .bomb-box .box04 .emaill i, .bomb-box .box04 .address i {
+        position: absolute;
+        bottom: -30px;
+        width: 112%;
+        font-size: 12px;
+        color: #959595;
+        left: 0;
+    }
+
+    .bomb-box .box04 .select {
+        position: relative;
+    }
+
+    .bomb-box .box04 .select i {
+        position: absolute;
+        top: 10px;
+        left: 60px;
+        color: #959595;
+    }
+
+    .bomb-box .box04 .many-file-btn {
+        width: 240px;
+        margin: 0px auto;
+        margin-top: 60px;
+    }
+
+    .bomb-box .box04 .many-file-btn a {
+        width: 94px;
+        height: 36px;
+        line-height: 36px;
+        font-size: 14px;
+        display: inline-block;
+        text-align: center;
+    }
+
+    .bomb-box .box04 .many-file-btn button {
+        width: 94px;
+        height: 36px;
+        line-height: 36px;
+        font-size: 14px;
+        display: inline-block;
+        text-align: center;
+    }
+
+    .bomb-box .box04 .many-file-btn button.btn01 {
+        border: 1px;
+        background: #3f84f6;
+        color: #fff;
+    }
+
+    .bomb-box .box04 .many-file-btn a.btn01 {
+        background: #3f84f6;
+        color: #fff;
+    }
+
+    .bomb-box .box04 .many-file-btn .btn01 a {
+        color: #fff;
+    }
+
+    .bomb-box .box04 .many-file-btn a.btn02 {
+        border: #3f84f6 1px solid;
+        color: #3f84f6;
+        margin-left: 45px;
+    }
+
+    .bomb-box .box04 .many-file-btn button:hover {
+        background: #135c9a;
+        color: #fff;
+    }
+
+    .bomb-box .box04 .many-file-btn a:hover {
+        background: #135c9a;
+        color: #fff;
+    }
+
+    /*产品资料新增*/
+    .pro-add-tab {
+        padding-bottom: 40px;
+    }
+
+    .pro-add-tab dl {
+        margin-top: 20px;
+    }
+
+    .pro-add-tab dl dd span {
+        font-size: 12px;
+        color: #959595;
+        margin-left: 10px;
+    }
+
+    .pro-add-tab dd div.fr input {
+        width: 190px !important;
+        color: #323232 !important;
+    }
+
+    .com_head span.fr {
+        margin-right: 20px;
+        color: #fff;
+    }
+
+    .com_head span.fr em {
+        margin-right: 50px;
+        font-size: 14px;
+        color:#fff;
+    }
+
+    .pro-add-tab dl dd select {
+        width: 96px;
+        height: 34px;
+        background: url("../img/purc/select.png") no-repeat right;
+        -webkit-appearance: none;
+        appearance: none;
+        -o-appearance: none;
+        -moz-appearance: none;
+        -ms-appearance: none;
+        border: #3f84f6 1px solid;
+        position: relative;
+        font-size: 14px;
+        padding-left: 10px;
+    }
+
+    .pro-add-tab .com_title01 span em {
+        color: #d2272d;
+        font-size: 14px;
+        margin-left: 5px;
+    }
+
+    .pro-add-tab .upload-pro {
+        height: 100px;
+        overflow: hidden;
+        margin-top: 20px;
+    }
+
+    .pro-add-tab .upload-pro span {
+        width: 100px;
+        height: 100px;
+        background: url("../img/purc/upload.png") no-repeat center;
+        display: inline-block;
+        border: #ccc 1px solid;
+        float: left;
+        margin-left: 0;
+    }
+
+    .pro-add-tab .upload-pro input[type="file"] {
+        width: 100px !important;
+        height: 100px;
+        filter: alpha(opacity=0);
+        -moz-opacity: 0;
+        opacity: 0;
+    }
+
+    .pro-add-tab .upload-pro i {
+        font-size: 12px;
+        color: #959595;
+        margin-left: 10px;
+        padding-top: 75px;
+        display: inline-block;
+    }
+
+    .pro-add-tab .text-detail {
+        height: 120px;
+        overflow: hidden;
+        margin-top: 20px;
+    }
+
+    .pro-add-tab .text-detail textarea {
+        width: 710px;
+        height: 110px;
+        border: #ccc 1px solid;
+        padding: 0 10px;
+        font-size: 14px;
+    }
+
+    .pro-add-tab .fj-file {
+        width: 200px;
+        height: 34px;
+        display: inline-block;
+        position: relative;
+    }
+
+    .pro-add-tab .fj-file input[type="text"], .pro-add-tab .fj-file input[type="file"] {
+        width: 200px;
+        height: 34px;
+        border: none !important;
+        top: 0;
+        padding-left: 15px;
+        z-index: 1;
+        color: #3f84f6 !important;
+    }
+
+    .pro-add-tab .fj-file i {
+        position: absolute;
+        top: 6px;
+        left: -10px;
+        z-index: 2;
+        font-size: 16px;
+        width: 18px;
+        height: 18px;
+        display: inline-block;
+        background: url("../img/purc/folder.png") no-repeat center;
+    }
+
+    .pro-add-tab .fj-file input[type="file"] {
+        filter: alpha(opacity=0);
+        -moz-opacity: 0;
+        opacity: 0;
+        position: absolute;
+        left: 0;
+        top: 0;
+    }
+
+    .pro-add-tab .many-file-btn {
+        width: 220px;
+        margin: 0px auto;
+        margin-top: 20px;
+        float: right;
+        margin-right: 40px;
+    }
+
+    .pro-add-tab .many-file-btn a {
+        width: 94px;
+        height: 36px;
+        line-height: 36px;
+        font-size: 14px;
+        display: inline-block;
+        text-align: center;
+    }
+
+    .pro-add-tab .many-file-btn button {
+        border: 1px;
+        width: 94px;
+        height: 36px;
+        line-height: 36px;
+        font-size: 14px;
+        display: inline-block;
+        text-align: center;
+    }
+
+    .pro-add-tab .many-file-btn button.btn01 {
+        background: #3f84f6;
+        color: #fff;
+    }
+
+    .pro-add-tab .many-file-btn .btn01 a {
+        color: #fff;
+    }
+
+    .pro-add-tab .many-file-btn a.btn02 {
+        border: #3f84f6 1px solid;
+        color: #3f84f6;
+        margin-left: 25px;
+    }
+
+    .pro-add-tab .many-file-btn a:hover {
+        background: #135c9a;
+        color: #fff;
+    }
+
+    .pro-add-tab .many-file-btn button.btn02 {
+        border: #3f84f6 1px solid;
+        color: #3f84f6;
+        margin-left: 25px;
+        background-color: #fff;
+    }
+
+    .pro-add-tab .many-file-btn button:hover {
+        background: #135c9a;
+        color: #fff;
+    }
+
+    .pro-add-tab dl dd div.fr {
+        position: relative;
+    }
+
+    .pro-add-tab #proText {
+        position: absolute;
+        border: none !important;
+        color: #3f84f6 !important;
+        top: 30px;
+        left: 110px;
+        width: 600px !important;
+    }
+
+    option {
+        height: 30px;
+        padding-top: 3px;
+        padding-left: 10px;
+    }
+
+    /*B2B商务采购变更-添加*/
+    .oder-change {
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+        padding-top: 10px;
+        padding-bottom: 30px;
+    }
+
+    .oder-change .purc {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .oder-change .purc li {
+        width: 100%;
+        height: 34px;
+        line-height: 34px;
+        margin-bottom: 16px;
+    }
+
+    .oder-change .purc li div {
+        width: 450px;
+        float: left;
+        font-size: 14px;
+    }
+
+    .oder-change .purc li div em {
+        width: 110px;
+        float: left;
+        margin-left: 30px;
+        line-height: 40px;
+        font-size: 14px;
+    }
+
+    .oder-change .purc li div span {
+        width: 275px;
+        float: left;
+        display: inline-block;
+        height: 40px;
+        line-height: 40px;
+        position: relative;
+        font-size: 14px;
+    }
+
+    .oder-change .dropdown-menu td {
+        padding: 0;
+        line-height: 30px;
+    }
+
+    .oder-change .purc li div span .select01 {
+        width: 187px;
+        height: 34px;
+        font-size: 14px;
+        padding-left: 10px;
+    }
+
+    .oder-change .purc li.beizhu div {
+        width: 800px;
+    }
+
+    .oder-change .purc li.beizhu div span {
+        width: 600px;
+    }
+
+    .oder-change .purc li div span .select01 option em {
+        margin-right: 10px;
+        width: 20px;
+        display: inline-block;
+    }
+
+    .oder-change .purc li div span .select02 {
+        background: url("../img/purc/select.png") no-repeat right;
+        -webkit-appearance: none;
+        appearance: none;
+        -o-appearance: none;
+        -moz-appearance: none;
+        -ms-appearance: none;
+        border: #5078cb 1px solid;
+        height: 34px;
+        font-size: 14px;
+        line-height: 34px;
+        padding-left: 20px;
+    }
+
+    .oder-change .purc li div span .select02 option {
+        padding-right: 21px;
+        text-align: center;
+    }
+
+    .oder-change .purc li div span .wid152 {
+        width: 152px;
+    }
+
+    .oder-change .purc li div span .wid100 {
+        width: 100px;
+    }
+
+    .editable {
+        width: 100%;
+        height: 34px;
+        border: none;
+        font-size: 14px;
+        padding-left: 4px;
+        line-height: 34px;
+    }
+
+    /*下拉样式*/
+    .oder-change .select {
+        width: 568px !important;
+        height: 34px;
+        border: #ccc 1px solid;
+        font-size: 14px;
+        position: relative;
+        margin: 0px auto;
+        margin-top: 3px;
+    }
+
+    .oder-change .select:after {
+        content: "";
+        display: block;
+        width: 8px;
+        height: 8px;
+        border-left: 1px solid #444;
+        border-bottom: 1px #444 solid;
+        position: absolute;
+        right: 10px;
+        top: 10px;
+        transform: rotate(-45deg);
+        cursor: pointer;
+        transition: transform .1s ease-out, top .1s ease-out;
+    }
+
+    .oder-change .select p {
+        width: 95% !important;
+        display: block;
+        height: 34px;
+        line-height: 32px;
+        padding: 0 15px;
+        cursor: pointer;
+        font-size: 14px;
+    }
+
+    .oder-change .select ul {
+        list-style-type: none;
+        background-color: #fff;
+        width: 100%;
+        position: absolute;
+        top: 35px;
+        overflow-y: auto;
+        left: -1px;
+        max-height: 0;
+        transition: max-height .5s ease-out;
+        z-index: 20;
+    }
+
+    .oder-change .select ul li {
+        line-height: 34px;
+        cursor: pointer;
+        padding-left: 10px;
+        font-size: 14px;
+        margin-bottom: 0;
+    }
+
+    .oder-change .select ul li:hover {
+        background-color: #f5f5f5;
+    }
+
+    .oder-change .select ul li.selected {
+        background-color: #5078cb;
+        color: #fff;
+    }
+
+    .oder-change .select ul li b, .oder-change .select p b {
+        margin-right: 16px;
+    }
+
+    @-webkit-keyframes slide-out {
+        0% {
+            transform: scale(1, 0)
+        }
+
+        25% {
+            transform: scale(1,
+            1.1)
+        }
+        50% {
+            transform: scale(1,
+            0.85)
+        }
+        0% {
+            transform: scale(1,
+            1.1)
+        }
+        0% {
+            transform: scale(1,
+            1)
+        }
+    }
+
+    .oder-change .select.open ul {
+        max-height: 500px;
+        animation: slide-out .3s ease-in;
+        transform-origin: 50% 0;
+        transition: max-height .3s ease-in;
+        border: #ccc 1px solid;
+    }
+
+    .oder-change .select.open:after {
+        transform: rotate(-225deg);
+        top: 14px;
+        transition: all .1s ease-in;
+    }
+
+    .oder-change dl {
+        width: 100%;
+        margin: 0 auto;
+        position: relative;
+    }
+
+    .oder-change dl dt {
+        width: 100%;
+        margin: 0 auto;
+        height: 40px;
+    }
+
+    .oder-change dl dt b {
+        height: 40px;
+        line-height: 48px;
+        display: inline-block;
+        color: #999;
+    }
+
+    .oder-change dl dd {
+        width: 100%;
+        margin: 0 auto;
+        min-height: 100px;
+        border-bottom: #ccc 1px dashed;
+        overflow: hidden;
+    }
+
+    .oder-change dl dd:hover {
+        border: #3f84f6 1px solid;
+    }
+
+    .oder-change dl dd:hover b.wid02 a {
+        display: inline-block;
+    }
+    .oder-change dl.delect-hover dd:hover b.wid02 a{
+        display: none;
+    }
+    .oder-change dl dd b {
+        height: 100px;
+        line-height: 50px;
+        display: inline-block;
+    }
+
+    .oder-change dl b {
+        width: 10.2%;
+        font-size: 14px;
+        float: left;
+        text-align: center;
+    }
+
+    .oder-change dl b.wid01 {
+        width: 24%;
+    }
+
+    .oder-change .purc .address {
+        width: 100%;
+    }
+
+    .oder-change .purc .address span {
+        width: 720px;
+    }
+
+    .oder-change ul .address b {
+        width: 720px
+    }
+
+    .oder-change .add-address {
+        float: right;
+        color: #5078cb;
+    }
+
+    .oder-change .add-address:hover {
+        color: #d2272d;
+    }
+
+    .oder-change dl b.wid02 {
+        width: 4%;
+    }
+
+    .oder-change dl b.wid01 p {
+        font-size: 14px;
+        line-height: 22px;
+        text-align: left;
+        margin: 0;
+    }
+
+    .oder-change dl dd b.wid01 {
+        margin-top: 15px;
+    }
+
+    .oder-change dl b.wid02 a {
+        display: none;
+    }
+
+    .oder-change dl b.wid02 a i {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        line-height: 20px;
+        background: #d2272d;
+        text-align: center;
+        border-radius: 100%;
+        color: #fff;
+    }
+
+    .oder-change .save {
+        margin-top: 30px;
+    }
+
+    .oder-change .dropdown-menu {
+        min-width: auto;
+    }
+
+    .oder-change .save button {
+        border: 1px;
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        background: #3578ba;
+        text-align: center;
+        color: #fff;
+        font-size: 14px;
+        float: right;
+        line-height: 36px;
+        margin-right: 40px;
+    }
+
+    /* .oder-change .save button:hover {
+        background: #1f4fb2;
+    } */
+
+    .search-result {
+        font-size: 18px;
+        color: #969595;
+        line-height: 90px;
+    }
+
+    .search-result img {
+        margin-left: 40px;
+        font-style: inherit;
+        margin-right: 15px;
+    }
+
+    .search-result em {
+        color: #000;
+        font-size: 18px;
+    }
+
+    /*投标单*/
+    .tender-list, .tender-list02 {
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+    }
+
+    .tender-list dl {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .tender-list dl dt {
+        width: 100%;
+        margin: 0 auto;
+        height: 40px;
+    }
+
+    .tender-list dl dt span {
+        height: 40px;
+        line-height: 48px;
+        display: inline-block;
+        color: #999;
+    }
+
+    .tender-list dl dd {
+        width: 100%;
+        margin: 0 auto;
+        height: 100px;
+        border-bottom: #ccc 1px dashed;
+        overflow: hidden;
+    }
+
+    .tender-list dl dd:hover {
+        border: #d32526 1px solid;
+    }
+
+    .tender-list dl dd span {
+        height: 100px;
+        line-height: 50px;
+        display: inline-block;
+    }
+
+    .tender-list dl span {
+        width: 10.6%;
+        font-size: 14px;
+        float: left;
+        text-align: center;
+    }
+
+    .tender-list dl span.wid01 {
+        width: 25%;
+    }
+
+    .tender-list dl span.wid01 p {
+        font-size: 14px;
+        line-height: 22px;
+        text-align: left;
+        margin: 0;
+    }
+
+    .tender-list dl dd span.wid01 {
+        margin-top: 15px;
+    }
+
+    .tender-list .com_title01 em, .tender-list02 .com_title01 em {
+        margin-left: 5px;
+        font-size: 16px;
+        color: #f00;
+        position: relative;
+        top: 3px;
+    }
+
+    /*招标单*/
+    .tender-list02 dl {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .tender-list02 dl dt {
+        width: 100%;
+        margin: 0 auto;
+        height: 40px;
+    }
+
+    .tender-list02 dl dt span {
+        height: 50px;
+        line-height: 50px;
+        display: inline-block;
+        color: #999;
+    }
+
+    .tender-list02 dl dd {
+        width: 100%;
+        margin: 0 auto;
+        height: 50px;
+        border-bottom: #ccc 1px dotted;
+        /*overflow: hidden;*/
+        display: inline-block;
+        display: flex;
+    }
+    .scroll-y{
+        display: inline;
+    }
+    .tender-list02 dl dd:hover {
+        border: #d32526 1px solid;
+    }
+
+    .tender-list02 dl dd span {
+        height: 50px;
+        line-height: 50px;
+        display: inline-block;
+    }
+
+    .tender-list02 dl span {
+        width: 16.6666%;
+        font-size: 14px;
+        float: left;
+        text-align: center;
+    }
+
+    .tender-list02 .com_title01 a {
+        float: right;
+        margin-right: 45px;
+        font-size: 14px;
+        line-height: 50px;
+    }
+
+    .scroll-y {
+        width: 100%;
+        margin: 0 auto;
+        max-height: 500px;
+    }
+
+    .scroll-y.active {
+        overflow-y: scroll;
+        overflow-x: hidden;
+    }
+
+    /*评标单*/
+    .tender-list02 .comment-oder {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .tender-list02 .comment-oder:hover {
+        border: #d32526 1px solid;
+    }
+
+    .tender-list02 .comment-oder-text {
+        border-bottom: #5078cb 1px solid;
+    }
+
+    .tender-list02 .comment-oder-text, .comment-oder-text ul {
+        width: 100%;
+        margin: 0 auto;
+        padding: 5px 0;
+        position: relative;
+    }
+
+    .tender-list02 .comment-oder-text i {
+        position: absolute;
+        top: -1px;
+        left: 35px;
+        width: 20px;
+        height: 20px;
+        line-height: 15px;
+        text-align: center;
+        background: #595959;
+        display: inline-block;
+        font-weight: 700;
+        font-size: 14px;
+        color: #fff;
+        border-radius: 0 0 50px 0;
+    }
+
+    .tender-list02 .comment-oder-text ul li {
+        width: 88%;
+        margin: 0 auto;
+        height: 30px;
+        line-height: 30px;
+    }
+
+    .tender-list02 .comment-oder-text ul li span {
+        width: 33.3333%;
+        float: left;
+    }
+
+    .tender-list02 .comment-oder-text ul li span em, .comment-oder-text ul li span b {
+        font-size: 14px;
+    }
+
+    .tender-list02 .comment-oder-text ul li span em {
+        width: 110px;
+        display: inline-block;
+    }
+
+    .tender-list02 .comment-oder-text ul li span b {
+        color: #959595;
+    }
+
+    .tender-list02 .comment-oder-list, .comment-oder-list dl {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .tender-list02 .comment-oder-list dl dt, .comment-oder-list dl dd {
+        width: 100%;
+        margin: 0 auto;
+        border-bottom: #ccc 1px dashed;
+        height: 50px;
+        line-height: 50px;
+    }
+
+    .tender-list02 .comment-oder-list dl dt span.wid01 {
+        text-align: left;
+        padding-left: 30px;
+    }
+
+    .tender-list02 .comment-oder-list dl span {
+        font-size: 14px;
+        width: 9.1%;
+        float: left;
+        color: #323232 !important;
+        line-height: 50px;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .tender-list02 .comment-oder-list dl span.wid01 {
+        width: 30%;
+    }
+
+    .tender-list02 .comment-oder-list dl span.wid02 {
+        width: 15%;
+    }
+
+    .tender-list02 .comment-oder-list dl dd span a {
+        margin-left: 15px;
+        font-size: 12px;
+    }
+
+    .tender-list02 .comment-oder-list dl dd:hover {
+        border-bottom: #ccc 1px dotted;
+        border-top: none;
+        border-left: none;
+        border-right: none;
+    }
+
+    .tender-list02 .change01 {
+        width: 16px;
+        height: 14px;
+        display: inline-block;
+        float: right;
+        line-height: 7px;
+        position: absolute;
+        top: 13px;
+    }
+
+    .tender-list02 .change01 i {
+        width: 100%;
+        display: inline-block;
+        height: 7px;
+        color: #000;
+    }
+
+    .tender-list02 .change01:hover i {
+        color: #5078cb;
+    }
+
+    .tender-list02 .explain {
+        width: 90%;
+        height: 30px;
+        border: none;
+        text-align: center;
+    }
+
+    .tender-list02 .save {
+        margin-top: 30px;
+    }
+
+    .tender-list02 .save a {
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        background: #3578ba;
+        text-align: center;
+        color: #fff;
+        font-size: 14px;
+        float: right;
+        line-height: 36px;
+        margin-right: 40px;
+    }
+
+    .tender-list02 .save a:hover {
+        background: #1f4fb2;
+    }
+
+    .tender-list02 .com_title01, .tender-list .com_title01 {
+        margin-top: 0;
+    }
+
+    /*采购变更弹窗*/
+    .pro-add-data02 {
+        margin-bottom: 30px;
+    }
+
+    .pro-add-data02 .pro-info dl {
+        position: relative;
+    }
+
+    .pro-add-data02 .pro-info dl dd.active .add01 {
+        color: #d32526;
+    }
+
+    .pro-add-data02 .pro-info dl dd.active {
+        border: #d32526 1px solid;
+    }
+
+    .add-tanchuang {
+        position: absolute;
+        box-shadow: 0 0 3px #888;
+        width: 238px;
+        height: 202px;
+        background: #fff;
+        right: 100px;
+        top: 20%;
+        display: none;
+    }
+
+    .add-tanchuang ul {
+        width: 195px;
+        margin: 0 auto;
+        margin-top: 10px;
+    }
+
+    .add-tanchuang ul li {
+        width: 100%;
+        margin: 0 auto;
+        height: 34px;
+        line-height: 34px;
+        margin-top: 12px;
+    }
+
+    .add-tanchuang ul li div.fl {
+        width: 50px;
+        font-size: 14px;
+    }
+
+    .add-tanchuang ul li div.fr {
+        width: 145px;
+    }
+
+    .add-tanchuang ul li div.fr .price-input {
+        width: 145px;
+        border: #969595 1px solid;
+        height: 34px;
+        font-size: 14px;
+        padding-left: 10px;
+    }
+
+    .add-tanchuang ul li.add-btn {
+        margin-top: 20px;
+    }
+
+    .add-tanchuang ul li.add-btn div.fr a {
+        width: 62px;
+        height: 24px;
+        display: inline-block;
+        line-height: 24px;
+        text-align: center;
+    }
+
+    .add-tanchuang ul li div.fr a.off {
+        border: #3f84f6 1px solid;
+        color: #3f84f6;
+        float: left;
+    }
+
+    .add-tanchuang ul li div.fr a.ok {
+        background: #3f84f6;
+        color: #fff;
+        float: right;
+    }
+
+    .add-tanchuang ul li div.fr a:hover {
+        background: #5078cb;
+        color: #fff;
+    }
+
+    .add-tanchuang ul li .btn-wrap {
+        position: relative;
+        height: 30px;
+        width: 145px;
+        line-height: 30px;
+    }
+
+    .add-tanchuang ul li .btn-wrap input {
+        display: inline-block;
+    }
+
+    .add-tanchuang ul li .btn-wrap .number {
+        width: 145px;
+        height: 34px !important;
+        border: #969595 1px solid;
+        display: inline-block;
+        text-align: center;
+        line-height: 34px !important;
+        color: #333;
+    }
+
+    .add-tanchuang ul li .btn-wrap .number a {
+        width: 26px;
+        height: 33px;
+        display: inline-block;
+        font-size: 18px;
+        color: #666;
+        line-height: 28px;
+    }
+
+    .add-tanchuang ul li .btn-wrap .number a:hover {
+        color: #fff;
+        background: #5078cb
+    }
+
+    .add-tanchuang ul li .btn-wrap .number .reduce {
+        float: left;
+        border-right: #969595 1px solid;
+    }
+
+    .add-tanchuang ul li .btn-wrap .number .add {
+        float: right;
+        border-left: #969595 1px solid;
+    }
+
+    .add-tanchuang ul li .btn-wrap .number input {
+        float: left;
+        width: 91px;
+        height: 32px;
+        line-height: 32px;
+        text-align: center;
+        font-size: 16px;
+        color: #666;
+        border: none;
+    }
+
+    .area-select {
+        width: 204px;
+        height: 34px;
+        padding-left: 10px;
+        border: #cccccd 1px solid;
+        font-size: 14px;
+        float: left;
+        margin-left: 10px;
+    }
+
+    .area-select:first-child {
+        margin-left: 0 !important;
+    }
+
+    .area-select[size] {
+        z-index: 1000;
+        position: relative;
+    }
+
+    .area-select option {
+        width: 204px;
+        position: relative;
+        left: -10px;
+    }
+
+    .oder-change dl .editable {
+        text-align: center;
+    }
+
+    .oder-change dl dd b {
+        height: auto;
+    }
+
+    .oder-change .save button:disabled {
+        background: #ccc !important;
+    }
+
+    .pro-add-data02 table tbody {
+        font-size: 14px;
+    }
+
+    .pro-add-data02 .table-default .header {
+        background: #fff;
+        border: none;
+        font-size: 14px;
+    }
+
+    .pro-add-data02 .table-default .header th {
+        border-bottom: #e8e8e8 1px solid;
+    }
+
+    .pro-add-data02 table tbody tr td {
+        /*line-height: 50px;*/
+        height: 50px;
+        padding: 0;
+        font-size: 14px !important;
+        border-bottom: #e8e8e8 1px solid;
+        background: #fff;
+        vertical-align: middle;
+    }
+
+    .pro-add-data02 table tbody tr {
+        margin-top: 1px;
+        background: #f5f5f5;
+    }
+
+    .pro-add-data02 table tbody tr td a:hover {
+        color: #f00 !important;
+    }
+
+    .pro-add-data02 table tbody tr:hover td {
+        background: #f5f5f5;
+    }
+
+    /*蒋下划线改成框*/
+    .pro-add-data dl dd div.fr input {
+        border: #bfbfbf 1px solid !important;
+        padding-left: 10px;
+    }
+
+    .bor01 {
+        width: 187px;
+        height: 34px;
+        border: #bfbfbf 1px solid !important;
+        font-size: 14px;
+        padding-left: 10px;
+        line-height: 34px;
+    }
+    .com_title01{
+        border-bottom: #5078cb 1px dashed !important;
+    }
+    .bomb-box .box01 {
+        height: 360px !important;
+    }
+    .per-data ul li input{
+        width: 340px !important;
+    }
+    .perBtn a {
+        margin-left: 30px;
+    }
+    .bomb-box .box01 ul li span{
+        float: left;
+        color: #959595;
+        line-height: 33px;
+        width: 215px;
+        display: inline-block;
+        margin-left: 10px;
+        font-size: 14px;
+    }
+    .bomb-box {
+        font-family: "Microsoft YaHei", "Hiragino Sans GB";
+        font-size: 16px;
+    }
+</style>
+<!--B2B商务账号设置-个人信息-->
+<div class="bomb-box">
+    <div class="box01 box">
+        <p ng-bind="partInfo.custName"></p>
+        <form class="per-data per" name="contactInfo" id="contactInfo">
+            <ul class="text-left">
+                <li>
+                    <em>企业名称</em><span ng-bind="partInfo.custName"></span>
+                </li>
+                <li>
+                    <em>企业UU</em><span ng-bind="partInfo.custSpaceUU"></span>
+                </li>
+                <li>
+                    <em>联系人</em><span ng-bind="partInfo.custUserName"></span>
+                </li>
+                <li>
+                    <em>联系方式</em><span ng-bind="partInfo.custUserTel"></span>
+                </li>
+                <li class="per-btn perBtn">
+                    <a class="btn-success" ng-click="addSupplier(partInfo.custUID)">添加供应商</a>
+                    <a class="btn-success" ng-click="addServicer(partInfo.custUID)">添加服务商</a>
+                    <a class="btn-success" ng-click="addCust(partInfo.custUID)">添加客户</a>
+                    <a class="btn-danger" ng-click="close()">关闭</a>
+                </li>
+            </ul>
+        </form>
+    </div>
+</div>

+ 2 - 2
src/main/webapp/resources/view/sso/b2b/searchresult.html

@@ -316,8 +316,8 @@
 				<div class="col-xs-9">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称等关键词进行搜索" />
-							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称等关键词进行搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 						</div>
 					</div>
 				</div>

+ 2 - 2
src/main/webapp/resources/view/sso/b2b/vendorsInfo.html

@@ -211,8 +211,8 @@
 	<div>
 		<div class="search">
 			<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称等关键词进行搜索" />
-				<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称等关键词进行搜索" />
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/Purc/cart.html

@@ -594,8 +594,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html

@@ -744,8 +744,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/Purc/tender_answer_list.html

@@ -663,8 +663,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/Purc/tenderlist.html

@@ -593,8 +593,8 @@
           </div>
         </div>
         <div class="sreach-input fr">
-          <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-          <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+          <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+          <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
         </div>
       </div>
     </div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -549,8 +549,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 1 - 1
src/main/webapp/resources/view/usercenter/b2b/modal/enableOrderList.html

@@ -555,7 +555,7 @@
                 </div>
                 <div class="sreach-input fr">
                     <input type="search" class="form-control input-sm" ng-model="keyword"
-                           ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索"/>
+                           ng-search="onSearch(keyword)" placeholder="单据编号/客户名称/物料名称"/>
                     <a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
                 </div>
             </div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/order/changeList.html

@@ -574,8 +574,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder.html

@@ -669,8 +669,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/order/outorder.html

@@ -560,8 +560,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -680,8 +680,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/apBill.html

@@ -561,8 +561,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -576,8 +576,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/modal/apcheck_customer.html

@@ -54,8 +54,8 @@
 		<div class="form-group" id="window-search">
 			<div class="col-md-12 col-sm-12">
 				<input type="text" class="form-control input-sm"
-					required placeholder="输入客户名称关键字查询" autofocus ng-model="keyword" ng-search="onSearch(keyword)">
-				<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+					required placeholder="输入客户名称关键字查询" autofocus ng-model="keyword" ng-search="onSearch()">
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 			</div>
 		</div>
 	</form>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/approval.html

@@ -386,8 +386,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/sale_accept.html

@@ -372,8 +372,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/sale_badIn.html

@@ -371,8 +371,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html

@@ -371,8 +371,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/sale_make_accept.html

@@ -367,8 +367,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/sale_make_returns.html

@@ -372,8 +372,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale/sample.html

@@ -387,8 +387,8 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
       </div>
     </div>
   </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_change.html

@@ -308,8 +308,8 @@
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+					<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 				</div>
 			</div>
 		</div>

+ 1 - 1
src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html

@@ -699,7 +699,7 @@
                 </div>
                 <div class="sreach-input fr">
 					<input type="search" class="form-control input-sm" ng-model="keyword"
-						   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索"/>
+						   ng-search="onSearch(keyword)" placeholder="单据编号/客户名称/物料名称"/>
 					<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
                 </div>
             </div>

+ 5 - 2
src/main/webapp/resources/view/vendor/b2b/sale_inquiryMould.html

@@ -547,6 +547,9 @@
 		top: 0px;
 		width: 40px;
 	}
+	.down-purchase{
+		padding-right:20px;
+	}
 </style>
 <div class="block user_right fr"  id="public" style="position: relative">
 	<!--<div class="pub-com_head">-->
@@ -636,8 +639,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_makechange.html

@@ -298,8 +298,8 @@
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+					<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 				</div>
 			</div>
 		</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_maketodo.html

@@ -1109,8 +1109,8 @@
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+					<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 				</div>
 			</div>
 		</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_notice.html

@@ -512,8 +512,8 @@
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+					<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 				</div>
 			</div>
 		</div>

+ 3 - 3
src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -279,8 +279,8 @@
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+					<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 				</div>
 			</div>
 		</div>
@@ -808,7 +808,7 @@
 	.text-mns {
 		padding-right: 15px;
 		position: absolute;
-		bottom: 64px;
+		bottom: 20px;
 		right: 20px;
 	}
 </style>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_send.html

@@ -307,8 +307,8 @@
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+					<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 				</div>
 			</div>
 		</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_tenderList.html

@@ -658,8 +658,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_tender_question_list.html

@@ -680,8 +680,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>

+ 4 - 6
src/main/webapp/resources/view/vendor/forstore/addExistUser.html

@@ -53,12 +53,6 @@
 	.add-register-user .modal-footer button {
 		border-radius: 0;
 	}
-	.add-register-user .modal-footer button:nth-child(1) {
-		background: #5078cb;
-	}
-	.add-register-user .modal-footer button:nth-child(2) {
-		background: #c8c6c6;
-	}
 	.add-register-user .modal-footer button.cancel {
 		border: none;
 		width: 64px;
@@ -83,6 +77,10 @@
 	table.userinfo >tbody >tr:nth-of-type(odd) {
 		background-color: #f9fbfe;
 	}
+	.btn-primary {
+		 color: #fff;
+		 background-color: #5078cb;
+	}
 </style>
 
 <div class="add-register-user">

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/purchaseAccept.html

@@ -500,8 +500,8 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
-                    <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+                    <input type="search" placeholder="型号/品牌" class="form-control" ng-model="keyWord" ng-search="onSearch(keyword)"/>
+                    <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
                 </div>
             </div>
         </div>

+ 7 - 0
src/main/webapp/resources/view/vendor/forstore/vendor_take_self.html

@@ -258,6 +258,13 @@
 	.com_tab ul li.active:after{
 		display: block
 	}
+	.switch{
+		padding:0;
+		line-height: normal;
+	}
+	.switch .checkbox span:after{
+		content:none;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">