修改B2B样式问题

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

@@ -3,9 +3,10 @@
  */
 
 define(['app/app'], function(app) {
-    app.register.controller('CartController', ['$scope', 'toaster', 'B2bGetCartList', 'ngTableParams', '$filter', 'BaseService', 'B2bCartOperation', '$timeout', 'B2bCartList', 'B2bPurchaseOrder',
-        function ($scope, toaster, getCartList, ngTableParams, $filter, BaseService, cartOperation, $timeout, cartList, PurchaseOrder) {
+    app.register.controller('CartController', [ '$rootScope','$scope', 'toaster', 'B2bGetCartList', 'ngTableParams', '$filter', 'BaseService', 'B2bCartOperation', '$timeout', 'B2bCartList', 'B2bPurchaseOrder',
+        function ($rootScope,$scope, toaster, getCartList, ngTableParams, $filter, BaseService, cartOperation, $timeout, cartList, PurchaseOrder) {
         BaseService.scrollBackToTop();
+          $rootScope.active = 'buyer_order'
         $scope.active = 'all';
         $scope.agreedText = '全部';
         $scope.dateZoneText = '一个月内';

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

@@ -3,9 +3,10 @@
  */
 
 define(['app/app'], function(app) {
-    app.register.controller('CartDetailController', ['$scope', 'B2bCartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'B2bProduct', 'B2bVendor', 'B2bShipAddress', '$modal', 'B2bNewPurcOrder', 'B2bAddtoCart', '$http', 'B2bToken', 'B2bRecentPrice',
-        function ($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http, token, recentPrice) {
+    app.register.controller('CartDetailController', ['$rootScope', '$scope', 'B2bCartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'B2bProduct', 'B2bVendor', 'B2bShipAddress', '$modal', 'B2bNewPurcOrder', 'B2bAddtoCart', '$http', 'B2bToken', 'B2bRecentPrice',
+        function ($rootScope, $scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http, token, recentPrice) {
             BaseService.scrollBackToTop();
+          $rootScope.active = 'buyer_order'
             $scope.loading = true;
             var loadData = function () {
                 cartOperation.getCartDetail({id: $stateParams.id}, function (data) {
@@ -16,6 +17,7 @@ define(['app/app'], function(app) {
                             sum += item.qty * item.price;
                         });
                         $scope.order.total = sum;
+                        $scope.order.payments = $scope.order.payments !== '' ? $scope.order.payments : '月结30天'
                         Vendor.contacts({venduu: $scope.order.receiveCode}, {}, function (data) {
                             $scope.contacts = data;
                             $scope.order.vendor = $scope.order.venduser;
@@ -293,7 +295,7 @@ define(['app/app'], function(app) {
             $scope.addContact = function (uu) {
                 var modalInstance = $modal.open({
                     animation: true,
-                    templateUrl: 'static/tpl/index/purc/modal/contact_person_modal.html',
+                    templateUrl: 'static/view/vendor/b2b/modal/contact_person_modal.html',
                     controller: 'AddContacCtrl',
                     resolve: {}
                 });

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

@@ -4,6 +4,7 @@ define(['app/app'], function(app) {
         function ($scope, PurchaseInquiry, toaster, BaseService, $upload, $filter, $modal, $rootScope, ngTableParams, PurcProduct, PurcProductNewest, $timeout, $http, ShipAddress, Search, ComponentActiveAPI, $state) {
             $scope.status = 'InquiryNew';
             $scope.active = 'all';
+          $rootScope.active = 'purc_haseinquiry'
             $rootScope.tenderVendor = null;// 清除掉已选择的
             $scope.searchMethod = false;
             var getService = function () {

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

@@ -8,6 +8,7 @@ define(['app/app'], function(app) {
             // 每次进入时先清除掉rootScope下的venduu
             $rootScope.venduu = null;
             // 获取收货地址列表
+          $rootScope.active = 'buyer_order'
             ShipAddress.shipAddList({}, function (data) {
                 $scope.ships = data;
                 $scope.order.shipadd = $scope.ships[0];
@@ -96,6 +97,7 @@ define(['app/app'], function(app) {
                     $scope.order.vend.enName = data.vendorEnterprise.enName;
                     $scope.order.vendUser = data.vendorUser;
                     $scope.order.payments = data.paymethod;
+                    console.log(data)
                     $scope.order.orderItems = [];
                     var item = {
                         code: null,

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

@@ -54,6 +54,8 @@ define(['app/app'], function(app) {
           if (page) {
             params.total(page.totalElements);
             $defer.resolve(page.content);
+            $scope.infoCommon = page
+            $scope.infoCommon.all = page.content.length
           }
         }, function (response) {
           $scope.loading = false;

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

@@ -3,8 +3,9 @@
  */
 
 define(['app/app'], function(app) {
-    app.register.controller('PurcChangeNewCtrl', ['$scope', 'toaster', 'BaseService', 'AuthenticationService', '$modal', '$filter', 'B2bChange',
+    app.register.controller('PurcChangeNewCtrl', ['$rootScope', '$scope', 'toaster', 'BaseService', 'AuthenticationService', '$modal', '$filter', 'B2bChange',
         function ($scope, toaster, BaseService, AuthenticationService, $modal, $filter, change) {
+          $rootScope.active = 'buyer_order'
             // 获取登录人员信息
             AuthenticationService.getAuthentication().success(function (data) {
                 $scope.user = data;

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

@@ -3,9 +3,10 @@
  */
 
 define(['app/app'], function(app) {
-    app.register.controller('PurcOrderDetailCtrl', ['$scope', '$stateParams', 'B2bPurcOrder', 'B2bPurcOrderItem', 'toaster', 'B2bReportService', 'B2bPurcOrdersInfo', 'B2bCurrentRole',
-        function ($scope, $stateParams, PurcOrder, PurcOrderItem, toaster, ReportService, PurcOrdersInfo, CurrentRole) {
+    app.register.controller('PurcOrderDetailCtrl', ['$rootScope','$scope', '$stateParams', 'B2bPurcOrder', 'B2bPurcOrderItem', 'toaster', 'B2bReportService', 'B2bPurcOrdersInfo', 'B2bCurrentRole',
+        function ($rootScope, $scope, $stateParams, PurcOrder, PurcOrderItem, toaster, ReportService, PurcOrdersInfo, CurrentRole) {
         // 获取当前用户是否为普通用户
+          $rootScope.active = 'buyer_order'
         CurrentRole.isUser({}, {}, function (data) {
             $scope.isUser = data.isUser;
         });

src/main/webapp/resources/js/vendor/controllers/b2b/change/sale_inquiry_mould_detail.js

@@ -26,6 +26,10 @@ define(['app/app'], function (app) {
           return $filter('date')(item.inquiry.date, 'yyyy-MM-dd');
       };
 
+      $scope.downFile = function(id) {
+          window.location.href = BaseService.getB2bUrl() + '/file/' + id
+      }
+
 
       // 取消
       $scope.reload = function () {

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

@@ -1,15 +1,25 @@
 <style>
 	.add-order {
+		box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		border-radius: 5px;
+		/* min-height: 1066px; */
 		background: #fff;
+		width: 1026px;
+		font-size: 14px;
+		overflow: hidden
 	}
 	.add-order .content-wrap {
 		padding: 0 20px;
 	}
 	.add-order .oder-change .title {
-		width: 86px;
+		width: 102px;
 		display: inline-block;
 		vertical-align: middle;
 		position: relative;
+		font-size: 14px;
 	}
 	.add-order .oder-change .title i {
 		position: absolute;
@@ -17,6 +27,7 @@
 	}
 	.add-order .oder-change .item {
 		line-height: 48px;
+		font-size: 14px;
 	}
 	.add-order .oder-change .item .input-group {
 		width: 280px;
@@ -24,21 +35,25 @@
 		vertical-align: middle;
 	}
 	.add-order .oder-change .item .form-control {
-		width: 280px;
+		width: 254px;
 		display: inline-block;
 		vertical-align: middle;
 	}
 	.add-order .oder-change .item .form-control.large {
-		width: 773px;
-	}
-	.add-order .oder-change .item .plus {
-		color: #30a603;
+		width: 747px;
 	}
 	.add-order .b2b-com-title .operate {
 		float: right;
 		color: #30a603;
 		font-weight: normal;
 	}
+	.add-order .b2b-com-title .operate,.add-order .oder-change .item .plus {
+		color: #5078cb;
+	}
+	i.fa-plus-circle {
+		color: #5078cb !important;
+	}
+
 	.add-order #empty {
 		text-align: center;
 		padding: 30px 0;
@@ -196,7 +211,10 @@
 		color: #666;
 		border: none;
 	}
-
+	.input-sm {
+		height: 34px;
+		font-size: 14px;
+	}
 </style>
 <div class="user_right fr add-order">
 	<div class="b2b-com-head">新增采购单</div>
@@ -227,8 +245,8 @@
 								   autocomplete="off"
 								   typeahead-on-select="onAssociateCmpClick($item, order)"
 								   spellcheck="false">
-						<a class="btn input-group-addon" ng-click="dbfindVend()">
-							<i class="fa fa-search" aria-hidden="true"></i>
+						<a class="btn input-group-addon" ng-click="dbfindVend()" style="background: #5078cb;border: 1px solid #5078cb">
+							<i class="fa fa-search" aria-hidden="true" style="color: #fff;"></i>
 						</a>
 					</span>
 					</div>
@@ -247,14 +265,26 @@
 				</li>
 				<li class="clearfix item">
 					<div class="col-sm-6">
-						<em class="title"><i class="must">*</i>付款方式：</em> <span> <input ng-model="order.payments"
-													 list="paymentmethod" class="form-control"
-													 placeholder="选择付款方式" /> <datalist id="paymentmethod">
-									<option value="月结30天">月结30天</option>
-									<option value="月结60天">月结60天</option>
-									<option value="现金支付">现金支付</option>
-								</datalist>
-							</span>
+						<em class="title"><i class="must">*</i>付款方式：</em> <span>
+
+							<select ng-show="order.payments" class="form-control select-adder"  ng-model="order.payments">
+								<option ng-value="order.payments">{{order.payments}}</option>
+							</select>
+							<select ng-show="!order.payments" name="" class="form-control select-adder" ng-model="order.payments">
+								<option value="月结30天">月结30天</option>
+								<option value="月结60天">月结60天</option>
+								<option value="现金支付">现金支付</option>
+							</select>
+
+						<!--<input ng-model="order.payments"-->
+													 <!--list="paymentmethod" class="form-control"-->
+													 <!--placeholder="选择付款方式" /> -->
+						<!--<datalist id="paymentmethod">-->
+									<!--<option value="月结30天">月结30天</option>-->
+									<!--<option value="月结60天">月结60天</option>-->
+									<!--<option value="现金支付">现金支付</option>-->
+								<!--</datalist>-->
+							<!--</span>-->
 					</div>
 					<div class="col-sm-6">
 						<em class="title"><i class="must">*</i>交易币别：</em>
@@ -332,10 +362,10 @@
 				<tbody>
 				<tr ng-repeat="item in order.orderItems">
 					<td>{{$index + 1}}</td>
-					<td>
-						<p>{{::item.code}}</p>
-						<p>{{::item.title}}</p>
-						<p>{{::item.spec}}</p>
+					<td style="text-align: left">
+						<p>物料编号：{{::item.code}}</p>
+						<p>物料标题：{{::item.title}}</p>
+						<p>物料规格：{{::item.spec}}</p>
 					</td>
 					<td>{{::item.unit||'-'}}</td>
 					<td>

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

@@ -1,11 +1,11 @@
 <style>
 #pub .purc li div span .select02 {
-	background: none;
-	-webkit-appearance: inherit;
-	appearance: inherit;
-	-o-appearance: inherit;
-	-moz-appearance: inherit;
-	-ms-appearance: inherit;
+	/*background: none;*/
+	/*-webkit-appearance: inherit;*/
+	/*appearance: inherit;*/
+	/*-o-appearance: inherit;*/
+	/*-moz-appearance: inherit;*/
+	/*-ms-appearance: inherit;*/
 	border: #bfbfbf 1px solid !important;
 	width: 187px;
 }
@@ -45,7 +45,7 @@
     color: #5078cb;
     font-weight: normal;
     margin-right: 30px;
-    margin-top: 20px;
+    /*margin-top: 20px;*/
     font-size: 14px;
 }
 </style>
@@ -597,16 +597,16 @@
 
 	.com_title01 {
 		height: 50px;
-		line-height: 50x;
+		line-height: 50px;
 		width: 100%;
 		margin: 0 auto;
-		border-bottom: #3578ba 1px dotted;
+		/*border-bottom: #3578ba 1px dotted;*/
 		border-top: #e8e8e8 1px solid;
 		margin-top: 10px;
 	}
 
 	.com_title01 span {
-		margin-left: 20px;
+		/*margin-left: 20px;*/
 		font-size: 14px;
 		line-height: 50px;
 		color: #555;
@@ -698,14 +698,14 @@
 
 	.pro-search {
 		width: 100%;
-		height: 90px;
+		/*height: 90px;*/
 		margin: 0 auto;
 		/*border-bottom: #d0cfcf 1px solid;*/
 		overflow: hidden;
 	}
 
 	.pro-search .search {
-		margin-top: 30px;
+		/*margin-top: 30px;*/
 		margin-right: 20px;
 	}
 
@@ -1426,7 +1426,9 @@
 	option {
 		height: 30px;
 		padding-top: 3px;
-		padding-left: 10px;
+		/*padding-left: 10px;*/
+		width: 100%;
+		text-indent: 12px;
 	}
 
 	/*B2B商务采购变更-添加*/
@@ -1501,23 +1503,24 @@
 	}
 
 	.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;
+		/*background: url("/static/img/user/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;
+		padding-left: 10px;
+		/*text-indent: 12px*/
 	}
 
-	.oder-change .purc li div span .select02 option {
-		padding-right: 21px;
-		text-align: center;
-	}
+	/*.oder-change .purc li div span .select02 option {*/
+		/*padding-right: 21px;*/
+		/*text-align: center;*/
+	/*}*/
 
 	.oder-change .purc li div span .wid152 {
 		width: 152px;
@@ -1538,13 +1541,14 @@
 
 	/*下拉样式*/
 	.oder-change .select {
-		width: 568px !important;
+		/*width: 568px !important;*/
 		height: 34px;
 		border: #ccc 1px solid;
 		font-size: 14px;
 		position: relative;
 		margin: 0px auto;
 		margin-top: 3px;
+		text-indent: 12px;
 	}
 
 	.oder-change .select:after {
@@ -2338,6 +2342,10 @@
 		background: #fff;
 		width: 1026px;
 	}
+	select{
+		-webkit-appearance: menulist-button;
+		appearance: menulist-button;
+	}
 </style>
 <div class="loading in" ng-class="{'in': loading}">
 	<!--<i></i>-->
@@ -2373,7 +2381,7 @@
 										ng-options="(contact.venduser + '' + contact.tel) for contact in contacts">
 										<option value="">{{order.venduser}}</option>
 								</select>
-								<a class="add-address" ng-if="order.vendUU != null" ng-click="addContact(venduu)">+增加联系人</a>
+								<a ng-if="order.vendUU != null" ng-click="addContact(venduu)" style="float: right;color: #5078cb;"><i class="fa fa-plus-square fa-fw"></i>增加联系人</a>
 							</span>
 					</div>
 				</li>
@@ -2381,12 +2389,15 @@
 					<div class="fl">
 						<em>付款方式：</em>
 						<span>
-								<input ng-model="order.payments" list="paymentmethod" class="select02 wid152" placeholder="选择付款方式" />
-								<datalist id="paymentmethod">
+								<select class="select02 wid100" ng-model="order.payments" ng-init="order.payments = '月结30天'">
 									<option value="月结30天">月结30天</option>
 									<option value="月结60天">月结60天</option>
 									<option value="现金支付">现金支付</option>
-								</datalist>
+								</select>
+								<!--<input ng-model="order.payments" list="paymentmethod" class="select02 wid152" placeholder="选择付款方式" />-->
+								<!--<datalist id="paymentmethod">-->
+									<!---->
+								<!--</datalist>-->
 							</span>
 					</div>
 					<div class="fr">
@@ -2438,32 +2449,32 @@
 			</ul>
 			<div class="com_title01"
 				 ng-if="order.orderItems.length == 0 && order.receiveCode">
-				<span>请先选择供应商产品</span> <a ng-click="uplodaByBatch()">批量导入</a>
+				<span class="b2b-com-title" style="margin-left: 20px;color:#3578ba">请先选择供应商产品</span> <a ng-click="uplodaByBatch()"><i class="fa fa-arrow-circle-o-up"></i>批量导入</a>
 			</div>
-			<div class="com_title01"
+			<div class="com_title01" style="padding: 0"
 				 ng-if="order.orderItems.length > 0 && order.receiveCode">
-				<span>产品信息</span> <a ng-click="uplodaByBatch()">批量导入</a>
+				<span class="b2b-com-title" style="margin-left: 20px;color:#3578ba">产品信息</span> <a ng-click="uplodaByBatch()"><i class="fa fa-arrow-circle-o-up"></i>批量导入</a>
 			</div>
 			<!--产品信息-->
 			<dl ng-if="order.orderItems.length > 0" class="delect-hover">
 				<dt>
-					<b>序号</b> <b class="wid01">产品信息</b> <b>单位</b> <b>数量</b> <b>单价</b>
+					<b style="width: 6%">序号</b> <b class="wid01" style="width: 30%">产品信息</b> <b style="width: 8%">单位</b> <b>数量</b> <b>单价</b>
 					<b>税率(%)</b> <b>交货日期</b> <b>备注</b> <b class="wid02">&nbsp;</b>
 				</dt>
 				<dd ng-repeat="item in order.orderItems">
-					<b>{{$index + 1}}</b>
-					<b class="wid01" ng-if="item.id != null">
-						<p>{{item.product.code}}</p>
-						<p>{{item.product.title}}</p>
-						<p>{{item.product.spec}}</p>
+					<b style="width: 6%">{{$index + 1}}</b>
+					<b class="wid01" ng-if="item.id != null" style="width: 30%">
+						<p>物料编号：{{item.product.code}}</p>
+						<p>物料名称：{{item.product.title}}</p>
+						<p>物料规格：{{item.product.spec}}</p>
 					</b>
-					<b class="wid01" ng-if="item.id == null">
-						<p>{{item.code}}</p>
-						<p>{{item.title}}</p>
-						<p>{{item.spec}}</p>
+					<b class="wid01" ng-if="item.id == null" style="width: 30%">
+						<p>物料编号：{{item.code}}</p>
+						<p>物料名称：{{item.title}}</p>
+						<p>物料规格：{{item.spec}}</p>
 					</b>
-					<b ng-if="item.id != null"><span ng-bind="item.product.unit != null ? item.product.unit : 'PCS'"></span></b>
-					<b ng-if="item.id == null">{{item.unit}}</b>
+					<b ng-if="item.id != null" style="width: 8%"><span ng-bind="item.product.unit != null ? item.product.unit : 'PCS'"></span></b>
+					<b ng-if="item.id == null" style="width: 8%">{{item.unit}}</b>
 					<b><input class="editable" type="text" ng-model="item.qty" placeholder="数量" style="cursor: pointer;" required="true"
 							  ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" />
 					</b>
@@ -2478,13 +2489,14 @@
 						<input class="editable" type="text" style="cursor: pointer;" value="0"
 							   readonly="readonly" />
 					</b>
+					<!--ng-focus="openDatePicker($event, item.$endDateOpen, $index)"-->
 					<b><input ng-model="item.delivery"
 							  type="text" class="editable" placeholder="选择时间"
 							  datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
 							  min-date="getMinDate()" ng-required="true" current-text="今天"
 							  clear-text="清除" close-text="关闭"
 							  datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							  ng-focus="openDatePicker($event, item.$endDateOpen)"
+
 							  readonly="readonly"
 							  ng-click="openDatePicker($event, item.$endDateOpen, $index)">
 					</b>
@@ -2505,16 +2517,17 @@
 		<div class="pro-add-data02" style="min-height: 500px;"
 			 ng-if="order.receiveCode">
 			<div class="pro-search">
-				<div class="col-xs-2 search-title fl">供应商产品库</div>
-				<div class="col-xs-8 fr">
-					<div class="col-xs-9 search" style="margin-right: 0;">
+				<div class="search-title b2b-com-title"  style="margin-left: 20px">供应商产品库</div>
+				<div class="col-xs-12" style="height: 40px;line-height: 40px;background: #f5f8fe;border: 1px solid #e8e8e8;font-size: 14px;">
+					<div class="result-title fl">
+						搜索到<em>{{total}}</em>条
+					</div>
+					<div class="search fr" style="margin-right: 90px;">
 						<input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword"
 							   ng-search="onSearch(keyword)" /> <a class="seek"
 																   ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
 					</div>
-					<div class="col-xs-3 result-title fr">
-						搜索到<em>{{total}}</em>条
-					</div>
+
 				</div>
 			</div>
 			<table class="block table table-default table-striped"

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

@@ -116,7 +116,7 @@
 		color: #323232;
 		min-height: 140px;
 		position: relative;
-		padding-top: 25px
+		/*padding-top: 25px*/
 	}
 	[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
 		display: none !important;
@@ -217,7 +217,7 @@
 				<span class="title">采购单号</span>
 				<div class="content">
 					<a ng-bind="::change.orderCode"
-						ui-sref="purc.order_detail({id:change.orderId})" target="_blank"></a>
+						ui-sref="purc_order_detail({id:change.orderId})" target="_blank"></a>
 				</div>
 			</div>
 		</div>
@@ -293,22 +293,27 @@
 					<tr ng-repeat="item in change.orderChangeItems track by item.id">
 						<td width="380">
 							<div>
-								<span class="text-num text-bold" ng-class="{'text-inverse'}" ng-bind="::item.oldProduct.code"></span><span class="text-muted">（型号）</span>
+								<!--ng-class="{'text-inverse'}"-->
+								<span class="text-num text-bold">物料编号：{{::item.oldProduct.code}}</span>
+								<!--<span class="text-muted">（型号）</span>-->
 								<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
 							</div>
 							<!--<div>-->
 								<!--<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span>-->
 							<!--</div>-->
 							<div>
-								<span ng-bind="::item.oldProduct.title"></span><span class="text-muted">（名称）</span>
+								<span style="font-size: 14px">物料名称：{{::item.oldProduct.title}}</span>
+								<!--<span class="text-muted">（名称）</span>-->
 							</div>
 							<!--<div><span ng-bind="::item.oldProduct.title"></span></div>-->
 							<div>
-								<span ng-class="{'text-inverse'}" ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
+								<!--ng-class="{'text-inverse'}"-->
+								<span style="font-size: 14px">物料规格：{{::item.oldProduct.spec}}</span>
+								<!--<span class="text-muted">（规格）</span>-->
 							</div>
 							<!--<div><span class="text-muted"  ng-bind="::item.oldProduct.spec"></span></div>-->
 						</td>
-						<td class="text-center" width="100">
+						<td class="text-center" width="100" style="font-size: 14px">
 							<div class="text-num" ng-if="!isUser"
 								ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 								title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
@@ -328,7 +333,7 @@
 								<span ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate == null)">{{::item.oldTaxrate}}%</span>
 							</div>
 						</td>
-						<td class="text-center" width="60">
+						<td class="text-center" width="60" style="font-size: 14px">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newQty != item.oldQty}"
 								title="{{item.newQty}}" ng-bind="::item.newQty"></div>
@@ -342,7 +347,7 @@
 							</div>
 							<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 						</td>
-						<td class="text-center" width="120">
+						<td class="text-center" width="120" style="font-size: 14px">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 								ng-bind="::item.newDelivery | date:'yyyy-MM-dd'" style="width: 100%"></div>
@@ -356,7 +361,7 @@
 							</div>
 						</td>
 						<td colspan="2" width="210">
-							<div ng-bind="change.description"></div>
+							<div ng-bind="change.description" style="font-size: 14px"></div>
 							<div ng-if="change.agreed == 1" class="block">
 								<span class="text-trans success">已同意</span>
 							</div>

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

@@ -104,9 +104,10 @@
 		height: 34px;
 		z-index: 3;
 		position: absolute;
-		background: #bfbfbf;
-		border: 1px solid #bfbfbf;
+		background: #5078cb;
+		border: 1px solid #5078cb;
 		margin-left: 60px;
+		border-radius: 0px;
 	}
 
 	.purchase .savebtn {

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

@@ -147,9 +147,9 @@
 
     .purc-tender .date-picker span .btn-open {
         color: #fff;
-        background-color: #bfbfbf;
+        background-color: #5078cb;
         border-radius: 0;
-        border: 1px solid #bfbfbf;
+        border: 1px solid #5078cb;
         border-left: none;
     }
     .purc-tender .date-picker input:focus{
@@ -924,6 +924,12 @@
     .line35 {
         line-height: 35px;
     }
+    .b2b-com-title .operate {
+        color: #5078cb
+    }
+    i.fa-plus-circle {
+        color: #5078cb !important;
+    }
 </style>
 <div class="user_right fr inquiry-new">
     <div class="b2b-com-head">询价单</div>
@@ -993,12 +999,22 @@
                             <div class="col-xs-12" id="isOpenChoice">
                                 <div class="tender-desc" style="margin-left: 0;">询价类型：</div>
                                 <div class="input-select col-xs-1">
-                                    <input  class="tender-input" name="inquirytype" type="radio" value="询价" ng-model="inquiry.inquirytype"/>
-                                    <span>询价</span>
+                                    <label class="com-check-radio">
+                                        <input type="radio" id="oneDay_1" name="inquirytype"  ng-model="inquiry.inquirytype" checked="checked" value="询价">
+                                        <label for="oneDay_1"></label>
+                                        询价
+                                    </label>
+                                    <!--<input  class="tender-input" name="inquirytype" type="radio" value="询价" ng-model="inquiry.inquirytype"/>-->
+                                    <!--<span>询价</span>-->
                                 </div>
                                 <div class="input-select col-xs-1">
-                                    <input class="tender-input" name="inquirytype" type="radio" value="求购" ng-model="inquiry.inquirytype"/>
-                                    <span>求购</span>
+                                    <label class="com-check-radio">
+                                        <input type="radio" id="oneDay_2" name="inquirytype"  ng-model="inquiry.inquirytype" value="求购">
+                                        <label for="oneDay_2"></label>
+                                        求购
+                                    </label>
+                                    <!--<input class="tender-input" name="inquirytype" type="radio" value="求购" ng-model="inquiry.inquirytype"/>-->
+                                    <!--<span>求购</span>-->
                                 </div>
                             </div>
                         </div>

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

@@ -790,4 +790,7 @@
     </tr>
     </tbody>
   </table>
+  <div ng-if="infoCommon.totalElements > 0" class="text-mns text-right" ng-class="infoCommon.totalElements >= 20 ? '': 'Boom18'">
+    显示&nbsp;{{(infoCommon .number - 1 ) * infoCommon.size + 1}}-{{infoCommon.numberOfElements >= 20 ? infoCommon.number *  infoCommon.size: (infoCommon.number - 1 ) * infoCommon.size + infoCommon.numberOfElements}}&nbsp;条，共&nbsp;{{infoCommon.totalElements}}&nbsp;条
+  </div>
 </div>

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

@@ -142,7 +142,7 @@
 		color: #323232;
 		min-height: 140px;
 		position: relative;
-		padding-top: 25px
+		/*padding-top: 25px*/
 	}
 	[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
 		display: none !important;
@@ -301,13 +301,13 @@
 					<!--</td>-->
 					<td class="product">
 						<div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{::item.number}}行">{{::item.number}}</div>
-						<div class="text-num text-bold text-overflow" title="{{::item.product.code}}">
+						<div class="text-num text-bold text-overflow" title="{{::item.product.code}}" style="font-size: 14px">
 							物料编号：<span ng-bind="::item.product.code"></span>
 						</div>
-						<div class="text-overflow" title="{{::item.product.title}}">
+						<div class="text-overflow" title="{{::item.product.title}}" style="font-size: 14px">
 							物料名称：<span ng-bind="::item.product.title"></span>
 						</div>
-						<div class="text-muted text-over" title="{{::item.product.spec}}">
+						<div class="text-muted text-over" title="{{::item.product.spec}}" style="font-size: 14px">
 							物料规格：{{::item.product.spec}}
 						</div>
 						<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>

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

@@ -1262,7 +1262,7 @@
         </div>
       </div>
     </div>
-    <table class="block table table-default table-striped" ng-table="tableParams" style="margin:0 30px 20px;width: auto">
+    <table class="block table table-default table-striped" ng-table="tableParams" style="margin:0 30px 20px;width: 966px">
       <thead>
       <tr class="header">
         <th width="160px">型号</th>

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

@@ -112,6 +112,7 @@
     font-size: 14px;
     color: #323232;
     border: 1px solid transparent;
+    background: #fff;
   }
 
   .tender-table > tbody.not-done > tr:nth-child(odd) {

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

@@ -3,6 +3,9 @@
 		color: #5078cb;
 		font-size: 14px;
 	}
+	.modal-content .btn-default:hover {
+		background: #5078cb !important;
+	}
 </style>
 <div class="modal-header">
 	<h3 class="modal-title">
@@ -11,7 +14,7 @@
 </div>
 <div class="modal-body">
 	<div >
-		<table width="50%" class="block table table-bordered table-striped table-hover">
+		<table width="50%" class="table table-bordered table-striped table-hover">
 			<thead>
 				<th width="120px;" class="text-center">已处理</th>
 			</thead>

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

@@ -483,6 +483,7 @@
 		padding: 70px 0;
 		margin: 0 auto;
 		text-align: center;
+		background: #fff;
 	}
 	#empty .left_img {
 		display: inline-block;

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder_detail.html

@@ -75,7 +75,7 @@
 		border: 1px solid #bfbfbf;
 	}
 	.purchase_form01 ul li .input-group .form-control {
-		width:152px;
+		width:220px;
 		border: #bfbfbf 1px solid;
 	}
 	.purchase_form01 ul li .dropdown-menu li{
@@ -97,7 +97,7 @@
 
 	.purchase_xq dd input{
 		border: none;
-		border-bottom: 1px solid #333;
+		/*border-bottom: 1px solid #333;*/
 		height: 35px;
 		width: 80px;
 		font-size: 14px;
@@ -120,7 +120,7 @@
 		width: 37px;
 		height: 34px;
 		position: absolute;
-		right: 74px;
+		right: -2px;
 	}
 	.purchase_xq dl span.wid01{
 		width: 4% !important;
@@ -137,19 +137,35 @@
 	.purchase_form01 b {
 		color: red;
 	}
-	.com_title01 span{
-		margin-left: 37px;
-	}
 	.purchase_xq span button {
 		border: none;
 		background-color: #fff;
-		height: 49px;
+		height: 48px;
 	}
 	.width100 {
 		 width: 100%;
 		 max-width: 100%;
 		margin: 0 auto;
 	}
+	.purchase_form01 ul li .select {
+		width: 256px;
+
+	}
+	.purchase_form01 ul li .input01 {
+		text-indent: 12px;
+	}
+	.com_title01 {
+		border-bottom: #5078cb 0px dotted;
+	}
+	.com_title01 span{
+		border-left: 5px solid #5078cb;
+		padding-left: 10px;
+		color: #5078cb
+	}
+	.purchase_form01 {
+		width: 100%;
+		border-bottom: 2px solid #f5f5f5
+	}
 </style>
 <div class="warp">
 	<div class="purchase fr block user_right">
@@ -157,7 +173,7 @@
 			<!-- <div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
 			<div class="com_head">
 				<span>代采订单</span>
-				<div class="pull-right" style="font-size: 16px">
+				<div class="pull-right" style="font-size: 14px">
 					<a ng-click="copyorder(deOrder.id)" title="复制生成一张新的订单，除了采购单号和合同编号不同，其他信息基本相同"><i class="fa fa-copy"></i> 复制订单</a>
 				</div>
 			</div>
@@ -213,7 +229,7 @@
 							<div class="fl">
 								<em><b>*</b>终端供应商名称：</em>
 								<span><!-- <input type="text" class="input01" ng-model="deOrder.tervendor" ng-readonly="!deOrder.$editing"> -->
-                                	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select" style="width: 200px">
+                                	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select">
 	                                    <datalist id="hisvendors">
 	                                    	 <option  ng-repeat="vendor in hisvendors" value="{{vendor.vendorname}}">{{vendor.vendorname}}</option>
 	                                    </datalist>
@@ -274,7 +290,7 @@
 							<div class="fr">
 								<em><b>*</b>我方付款方式：</em>
 								<span>
-                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" style="width: 200px">
+                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select">
 	                                    <datalist id="paymentmethod">
 	                                    	 <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
 	                                    </datalist>
@@ -302,7 +318,7 @@
 							<div class="fl">
 								<em><b>*</b>代采企业：</em>
 								<span>
-                               		<select name="" class="select" ng-model="deOrder.deputyname" style="width: 200px" ng-change="change(deOrder.deputyname)" ng-disabled="!deOrder.$editing">
+                               		<select name="" class="select" ng-model="deOrder.deputyname" ng-change="change(deOrder.deputyname)" ng-disabled="!deOrder.$editing">
                                		<option ng-value="'请选择代采企业'">请选择代采企业</option>
                                     <option ng-repeat="deputyEn in deputyEnterprises" ng-selected="deputyEn.deputyenname == deOrder.deputyname">{{deputyEn.deputyenname}}</option>
                                		</select>
@@ -312,8 +328,8 @@
 					</ul>
 				</div>
 				<div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span>
-					<a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing">批量导入</a>
-					<span style="margin-left: 345px;">费率：<input ng-model="deOrder.rate" style="width: 80px; height: 30px; font-size: 14px; text-align: center;"> %</span>
+					<a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing"><i class="fa fa-arrow-circle-o-up"></i>批量导入</a>
+					<span style="margin-left: 345px;padding:0;border:0">费率：<input ng-model="deOrder.rate" style="width: 80px; height: 30px; font-size: 14px; text-align: center;"> %</span>
 					<a ng-click="checkPrice(deOrder.rate)">更新订单单价</a>  </div>
 				<div class="purchase_xq clearfix">
 					<dl>

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder_new.html

@@ -50,6 +50,10 @@
 		border: 1px solid #e1e1e1;
 		color: #888 !important;
 	}
+	.purchase_form01 {
+		width: 100%;
+		border-bottom: 2px solid #f5f5f5
+	}
 	.purchase_form01 ul li .dropdown-menu {
 		width: 257px;
 		height: 300px;
@@ -78,7 +82,7 @@
 		background: #5078cb;
 	}
 	.purchase_form01 ul li .input-group .form-control {
-		width:146px;
+		width: 218px;
 		background: #fff;
 		border: #bfbfbf 1px solid;
 	}
@@ -111,7 +115,7 @@
 	}
 
 	.purchase_xq dd input:focus {
-		border-bottom: 1px solid blue;
+		/*border-bottom: 1px solid blue;*/
 	}
 
 	.purchase .input-group .form-control{
@@ -127,7 +131,7 @@
 		width: 37px;
 		height: 34px;
 		position: absolute;
-		right: 74px;
+		right: 0px;
 	}
 	.purchase_xq dl span.wid01{
 		width: 4% !important;
@@ -144,8 +148,19 @@
 	.purchase_form01 b {
 		color: red;
 	}
+	.com_title01 {
+		border-bottom: #5078cb 0px dotted;
+	}
 	.com_title01 span{
-		margin-left: 37px;
+		border-left: 5px solid #5078cb;
+		padding-left: 10px;
+		color: #5078cb
+	}
+	.purchase_form01 ul li .select {
+		width: 256px
+	}
+	.purchase_form01 ul li .input01 {
+		text-indent:12px;
 	}
 </style>
 <div class="warp">
@@ -205,7 +220,7 @@
 							<div class="fl">
 								<em><b>*</b>终端供应商名称：</em>
 								<span><!-- <input type="text" class="input01" ng-model="deOrder.tervendor"> -->
-                                	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select" style="width: 200px" ng-change="getHisKeyword(deOrder.tervendor)">
+                                	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select"  ng-change="getHisKeyword(deOrder.tervendor)">
 	                                    <datalist id="hisvendors">
 	                                    	 <option ng-repeat="vendor in hisvendors" value="{{vendor.vendorname}}">{{vendor.vendorname}}</option>
 	                                    </datalist>
@@ -266,7 +281,7 @@
 							<div class="fr">
 								<em><b>*</b>我方付款方式：</em>
 								<span>
-                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" style="width: 200px">
+                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" >
 	                                    <datalist id="paymentmethod">
 	                                    	 <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
 	                                    </datalist>
@@ -293,7 +308,7 @@
 							<div class="fl">
 								<em><b>*</b>代采企业：</em>
 								<span>
-                               		<select name="" class="select" ng-model="deOrder.deputyname" style="width: 200px" ng-change="change(deOrder.deputyname)"
+                               		<select name="" class="select" ng-model="deOrder.deputyname"  ng-change="change(deOrder.deputyname)"
 											ng-options="deputyEn.deputyenname as deputyEn.deputyenname for deputyEn in deputyEnterprises">
                                		<option value="">请选择代采企业</option>
                                		</select>
@@ -302,8 +317,8 @@
 						</li>
 					</ul>
 				</div>
-				<div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span><a ng-click="uplodaByBatch()">批量导入</a>
-					<span style="margin-left: 345px;">费率：<input ng-model="deOrder.rate" style="width: 80px; height: 30px; font-size: 14px; text-align: center;"> %</span>
+				<div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span><a ng-click="uplodaByBatch()"><i class="fa fa-arrow-circle-o-up"></i>	批量导入</a>
+					<span style="margin-left: 345px;border:0px;padding:0">费率：<input ng-model="deOrder.rate" style="width: 80px; height: 30px; font-size: 14px; text-align: center;"> %</span>
 					<a ng-click="checkPrice(deOrder.rate)">更新订单单价</a>
 				</div>
 				<div class="purchase_xq clearfix">

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

@@ -17,7 +17,7 @@
 
   .add-apCheckList .table-header-wrap {
     background: #f9f9f9;
-    overflow-x: hidden;
+    /*overflow-x: hidden;*/
     overflow-y: scroll;
   }
 

src/main/webapp/resources/view/vendor/b2b/change/sale_inquiry_details.html

@@ -143,7 +143,7 @@
   }
   .bottomB {
     border-bottom: 2px solid #f5f5f5;
-    padding: 15px 30px 15px 15px;
+    /*padding: 15px 30px 15px 15px;*/
   }
 
   .title-div .f14{
@@ -193,6 +193,7 @@
     <span class="fr"><em>制单人：{{inquiry.recorder}}</em><time>制单日期：{{inquiry.date | date:'yyyy-MM-dd'}}</time></span>
   </div>
   <div class="pane-body">
+    <div class="bottomB">
     <div class="title-div">
       <span class="f14">单据信息</span>
     </div>
@@ -216,6 +217,7 @@
         <div class="unchanged-info">{{inquiry.ship}}</div>
       </div>
     </div>
+
     <!--<div class="row row-sm item">
         <div class="col-xs-3">
             <span class="title">审核人：</span>
@@ -263,6 +265,7 @@
         </div>
       </div>
     </div>
+    </div>
     <div class="title-div">
       <span class="f14">产品价格详情</span>&nbsp;
     </div>
@@ -291,10 +294,9 @@
             {{$index + 1}}
           </td>
           <td>
-            <div class="text-num text-bold"
-                 ng-bind="::inquiryItem.product.code"></div>
-            <div ng-bind="::inquiryItem.product.title"></div>
-            <div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>
+            <div class="text-num text-bold" title="{{::inquiryItem.product.code}}">物料编号：{{::inquiryItem.product.code}}</div>
+            <div title="{{::inquiryItem.product.title}}">物料名称：{{::inquiryItem.product.title}}</div>
+            <div class="text-muted" title="{{::inquiryItem.product.spec}}">物料规格：{{::inquiryItem.product.spec}}</div>
             <div ng-if="::inquiryItem.needquantity" class="text-num text-bold">
               需求数量：<span ng-bind="::inquiryItem.needquantity"></span>
             </div>

src/main/webapp/resources/view/vendor/b2b/change/sale_inquiry_mould_detail.html

@@ -336,7 +336,7 @@
         </div>
         <div class="title" ng-bind="::file.name"></div>
         <div class="download">
-          <a target="_blank" href="file/{{file.id}}">下载</a>
+          <a target="_blank"  ng-click="downFile(file.id)">下载</a>
         </div>
       </div>
     </div>
@@ -451,7 +451,7 @@
                      ng-change="pushFile(myFiles);notZero(inquiryMould)">
               <div ng-repeat="file in inquiryMould.sellAttachs track by $index">
                 <p class="text-left">
-                  <a style="color: #0000cc" target="_blank" href="file/{{file.id}}">{{file.name}}</a>&nbsp;&nbsp;&nbsp;
+                  <a style="color: #0000cc" target="_blank" ng-click="downFile(file.id)">{{file.name}}</a>&nbsp;&nbsp;&nbsp;
                   <a style="color: #ff2222" ng-click="removeFile(file)">删除</a>
                 </p>
               </div>

src/main/webapp/resources/view/vendor/b2b/change/sale_order_details.html

@@ -449,7 +449,7 @@
                   <a ng-click="item.$editing=!item.$editing">取消</a>
                 </div>
                 <br>
-                <div class="text-left" style="text-align: center">
+                <div class="" style="text-align: center">
                   <a ng-click="onReplyClick(item)" class="text-inverse f14">
                     <i class="fa fa-arrow-up"></i> 确认回复
                   </a>

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

@@ -433,18 +433,18 @@
     </tr>
     <tr class="order-bd">
       <td class="product" title="{{approval.prodSpec}}">
-        <div class="text-num text-bold">
+        <div class="text-num text-bold" title="{{approval.prodCode}}">
           <span>
-            物料型号：{{approval.prodCode}}
+            物料型号：{{approval.prodCode || '-'}}
           </span>
         </div>
-        <div>
+        <div title="{{approval.prodDetail}}">
           <span>
-            物料名称：{{approval.prodDetail}}
+            物料名称：{{approval.prodDetail|| '-'}}
           </span>
         </div>
-        <div class="text-muted">
-          物料规格：{{approval.prodSpec}}
+        <div class="text-muted" title="{{approval.prodSpec}}">
+          物料规格：{{approval.prodSpec|| '-'}}
         </div>
       </td>
       <td class="text-center">

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

@@ -416,30 +416,30 @@
         <div class="text-num text-bold">
 						<span  title="{{item.orderItem.product.code}}"
                   ng-if="item.orderItem.product.code != null">
-              物料编号：{{item.orderItem.product.code}}
+              物料编号：{{item.orderItem.product.code || '-'}}
             </span>
           <span title="{{item.product.code}}"
             ng-if="item.orderItem.product.code == null">
-            物料编号：{{item.product.code}}
+            物料编号：{{item.product.code || '-'}}
           </span>
         </div>
         <div>
 						<span style="color: #666 !important;" title="{{item.orderItem.product.title}}"
                   ng-if="item.orderItem.product.title != null">
-              物料名称：{{item.orderItem.product.title}}
+              物料名称：{{item.orderItem.product.title || '-'}}
             </span> <span style="color: #666 !important;"
             title="{{item.product.title}}"
             ng-if="item.orderItem.product.title == null">
-          物料名称：{{item.product.title}}
+          物料名称：{{item.product.title || '-'}}
         </span>
         </div>
         <div style="color: #666 !important;" class="text-muted" title="{{item.orderItem.product.spec}}"
              ng-if="item.orderItem.product.spec != null">
-          物料规格：{{item.orderItem.product.spec}}
+          物料规格：{{item.orderItem.product.spec || '-'}}
         </div>
         <div style="color: #666 !important;" class="text-muted" title="{{item.product.spec}}"
              ng-if="item.orderItem.product.spec == null">
-          物料规格：{{item.product.spec}}
+          物料规格：{{item.product.spec || '-'}}
         </div>
         <div class="text-bold text-inverse" title="送货工厂"
              ng-if="item.orderItem.factory">

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

@@ -423,19 +423,19 @@
     </tr>
     <tr class="order-bd" ng-repeat="item in badIn.badInItems">
       <td class="product" style="text-align: left">
-
+        <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{$index + 1}}行">{{$index + 1}}</div>
         <div class="text-num text-bold">
           <span title="{{::item.orderItem.product.code}}" >
-            物料编号：{{::item.orderItem.product.code}}
+            物料编号：{{::item.orderItem.product.code|| '-'}}
           </span>
         </div>
         <div>
           <span title="{{::item.orderItem.product.title}}" style="color: #666 !important;">
-            物料名称：{{::item.orderItem.product.title}}
+            物料名称：{{::item.orderItem.product.title|| '-'}}
           </span>
         </div>
         <div class="text-muted" title="{{::item.orderItem.product.spec}}" style="color: #666 !important;">
-          物料规格：{{::item.orderItem.product.spec}}
+          物料规格：{{::item.orderItem.product.spec|| '-'}}
         </div>
       </td>
       <td>

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

@@ -424,19 +424,19 @@
     </tr>
     <tr class="order-bd" ng-repeat="item in badOut.badOutItems">
       <td class="product" style="text-align: left">
-
+        <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{$index + 1}}行">{{$index + 1}}</div>
         <div class="text-num text-bold" title="{{::item.orderItem.product.code}}">
           <span >
-            物料编号：{{::item.orderItem.product.code}}
+            物料编号：{{::item.orderItem.product.code || '-'}}
           </span>
         </div>
         <div title="{{::item.orderItem.product.title}}">
           <span style="color: #666">
-            物料名称：{{::item.orderItem.product.title}}
+            物料名称：{{::item.orderItem.product.title || '-'}}
           </span>
         </div>
         <div style="color: #666 !important;" class="text-muted" title="{{::item.orderItem.product.spec}}" >
-          物料规格：{{::item.orderItem.product.spec}}
+          物料规格：{{::item.orderItem.product.spec || '-'}}
         </div>
       </td>
       <td>

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

@@ -442,16 +442,16 @@
         <div class="text-num order-number" class="key" title="第{{$index + 1}}行">{{$index + 1}}</div>
         <div class="text-num text-bold" title="{{item.order.product.code}}">
           <span>
-            物料编号：{{item.order.product.code}}
+            物料编号：{{item.order.product.code|| '-'}}
           </span>
         </div>
         <div title="{{item.order.product.title}}">
           <span  style="color: #666 !important;">
-             物料名称：{{item.order.product.title}}
+             物料名称：{{item.order.product.title|| '-'}}
           </span>
         </div>
         <div class="text-muted" title="{{item.order.product.spec}}"  style="color: #666 !important;">
-          物料规格：{{item.order.product.spec}}
+          物料规格：{{item.order.product.spec|| '-'}}
         </div>
         <div class="text-bold text-inverse" ng-if="item.order.factory">
           送货工厂：<span ng-bind="::item.order.factory"></span>

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

@@ -421,16 +421,17 @@
     </tr>
     <tr class="order-bd" ng-repeat="item in returns.returnItems">
       <td class="product" style="text-align: left">
+        <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{$index + 1}}行">{{$index + 1}}</div>
         <div class="text-num text-bold" title="{{::item.order.product.code}}">
-          <span>物料编号：{{::item.order.product.code}}</span>
+          <span>物料编号：{{::item.order.product.code || '-'}}</span>
         </div>
         <div title="{{::item.order.product.title}}">
           <span style="color: #666 !important;">
-            物料名称：{{::item.order.product.title}}
+            物料名称：{{::item.order.product.title || '-'}}
           </span>
         </div>
         <div class="text-muted" title="{{::item.order.product.spec}}" style="color: #666 !important;">
-          物料规格：{{::item.order.product.spec}}
+          物料规格：{{::item.order.product.spec || '-'}}
         </div>
         <div class="text-bold text-inverse" ng-if="item.order.factory">送货工厂：<span ng-bind="::item.order.factory"></span></div>
       </td>

src/main/webapp/resources/view/vendor/b2b/sale/sale_makeorder_detail.html

@@ -118,6 +118,7 @@
     color: #323232;
     position: relative;
     padding: 25px 0px;
+    font-size: 14px;
   }
   [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
     display: none !important;

src/main/webapp/resources/view/vendor/b2b/sale/sale_returns.html

@@ -425,18 +425,19 @@
     </tr>
     <tr class="order-bd" ng-repeat="item in returns.returnItems">
       <td class="product" style="text-align: left">
+        <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{$index + 1}}行">{{$index + 1}}</div>
         <div class="text-num text-bold">
           <span>
-            物料编号：{{::item.product.code}}
+            物料编号：{{::item.product.code|| '-'}}
           </span>
         </div>
         <div>
           <span title="{{::item.product.title}}" style="color: #666 !important;">
-            物料名称：{{::item.product.title}}
+            物料名称：{{::item.product.title|| '-'}}
           </span>
         </div>
         <div class="text-muted" title="{{::item.product.spec}}" style="color: #666 !important;">
-          物料规格：{{::item.product.spec}}
+          物料规格：{{::item.product.spec|| '-'}}
         </div>
         <div class="text-bold text-inverse" title="送货工厂"
              ng-if="item.orderItem.factory">

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

@@ -445,18 +445,18 @@
     </tr>
     <tr class="order-bd">
       <td class="product">
-        <div class="text-num text-bold">
+        <div class="text-num text-bold" title="{{sample.proofing.product.code}}">
           <span>
-            物料编码：{{sample.proofing.product.code}}
+            物料编码：{{sample.proofing.product.code || '-'}}
           </span>
         </div>
-        <div>
+        <div title="{{sample.proofing.product.title}}">
           <span>
-            物料名称：{{sample.proofing.product.title}}
+            物料名称：{{sample.proofing.product.title  || '-'}}
           </span>
         </div>
         <div class="text-muted" title="{{sample.proofing.product.spec}}">
-          物料规格：{{sample.proofing.product.spec}}
+          物料规格：{{sample.proofing.product.spec  || '-'}}
         </div>
         <div ng-if="sample.proofing.envrequiry" title="环保要求">
           <i class="fa fa-tree fa-fw" style="color: #33CC33; font-size: 18px;"></i> 环保要求：<span ng-bind="::sample.proofing.envrequiry"></span>

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

@@ -330,16 +330,16 @@
 						<span class="text-num text-bold">
 							日期: {{::change.orderChange.date | date:'yyyy-MM-dd'}}
 						</span>
-						<span style="margin-left: 66px">
+						<span style="margin-left: 33px">
 							<img src="static/img/user/images/shop_home.png" style="margin-right: 5px">
 							{{::change.orderChange.enterprise.enName}}
 						</span>
-						<span style="margin-left: 66px">流水号：<a title="查看变更单详情" class="text-num order-detail"
+						<span style="margin-left: 33px">流水号：<a title="查看变更单详情" class="text-num order-detail"
 												 ng-bind="::change.orderChange.code"
 												 style="color: #3c7cf5"
 												 ui-sref="sale_makechange_detail({id:change.id})" target="_self"></a>
 						</span>
-						<span style="margin-left: 66px">订单：<a class="text-num text-bold order-detail"
+						<span style="margin-left: 33px">订单：<a class="text-num text-bold order-detail"
 												title="查看委外单详情" ng-bind="::change.orderCode"
 												style="color: #3c7cf5"
 												ui-sref="sale_makeorder_detail({id:change.orderId})" target="_blank"></a>

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

@@ -492,6 +492,10 @@
 	.com_tab ul li.active:after{
 		display: block
 	}
+	.switch .checkbox span:after {
+		height: 0;
+		width: 0
+	}
 </style>
 <script src="static/lib/ui-tour/tour.js"></script>
 <!--右侧主体部分-->