调整MRB、不良品入库、出库出货单号宽度，能显示完全

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7997 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -230,9 +230,9 @@
 						class="text-num" ng-bind="::MRB.code"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><a title="客户名称"
+			<td colspan="2"><a title="客户名称"
 				ng-bind="::MRB.orderItem.order.enterprise.enName"></a></td>
-			<td colspan="1" class="order-sum">
+			<td colspan="2" class="order-sum">
 				<a ng-if="MRB.sendCode != null" title="送货单号"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::MRB.sendCode"></span></a>
 			</td>
 			<td colspan="1" class="text-center">

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -108,88 +108,98 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
-	<div class="search-bg condition block">
-		<div class="row">
-			<div id="topSearch" style="float: left">
-				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
-				单据{{tableParams.total()}}条
-			</div>
-			<div class="col-xs-6">
-				<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()" placeholder="输入商品、客户名称或单据流水号搜索" />
-						<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+	<div class="condition block">
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i>
+						搜索"{{tip}}",为您找到结果:</span> 单据{{tableParams.total()}}条
+				</div>
+				<div class="col-xs-6">
+					<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()"
+								placeholder="输入商品、客户名称或单据流水号搜索" /> <a
+								class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
 					</div>
 				</div>
+				<div class="fr toggle">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span
+						ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i
+						class="fa fa-fw"
+						ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
+				</div>
 			</div>
-			<div class="fr toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
-			</div>
-		</div>
-		<div class="more" ng-class="{'open': condition.$open}">
-			<form class="form-inline">
-				<div class="form-group ">
-					<label>日期：</label>
-					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-						</button>
-						<ul class="dropdown-menu">
-							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-							<li><a ng-click="changeDateZone(6)">半年内</a></li>
-							<li><a ng-click="changeDateZone()">半年前</a></li>
-						</ul>
-					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateFrom"
-							   class="form-control" placeholder="从"
-							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							   ng-required="true"
-							   current-text="今天" clear-text="清除" close-text="关闭"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
-						<span class="input-group-btn">
-<button type="button" class="btn btn-default"
-		ng-click="openDatePicker($event, condition, '$fromOpened')">
-	<i class="fa fa-calendar"></i>
-</button>
-</span>
+			<div class="more" ng-class="{'open': condition.$open}">
+				<form class="form-inline">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown
+							is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;"
+								class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateFrom"
+								class="form-control" placeholder="从"
+								datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								ng-required="true" current-text="今天" clear-text="清除"
+								close-text="关闭"
+								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default"
+									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									<i class="fa fa-calendar"></i>
+								</button>
+							</span>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateTo"
+								class="form-control" placeholder="到"
+								datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								ng-required="true" current-text="今天" clear-text="清除"
+								close-text="关闭"
+								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								ng-focus="openDatePicker($event, condition, '$toOpened')">
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default"
+									ng-click="openDatePicker($event, condition, '$toOpened')">
+									<i class="fa fa-calendar"></i>
+								</button>
+							</span>
+						</div>
 					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateTo"
-							   class="form-control" placeholder="到"
-							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							   ng-required="true"
-							   current-text="今天" clear-text="清除" close-text="关闭"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							   ng-focus="openDatePicker($event, condition, '$toOpened')">
-						<span class="input-group-btn">
-<button type="button" class="btn btn-default"
-		ng-click="openDatePicker($event, condition, '$toOpened')">
-	<i class="fa fa-calendar"></i>
-</button>
-</span>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown
+							is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;"
+								class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<label>采纳结果：</label>
-					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-						</button>
-						<ul class="dropdown-menu">
-							<li><a ng-click="changeAgreed()">全部</a></li>
-							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
-							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
-						</ul>
-					</div>
-				</div>
-			</form>
+				</form>
+			</div>
 		</div>
 	</div>
-</div>
-<table class="order-table block" ng-table="tableParams">
+	<table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
 			<th>商品</th>
@@ -229,10 +239,10 @@
 						class="text-num" ng-bind="::badIn.code"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><a title="客户名称"
+			<td colspan="2"><a title="客户名称"
 				ng-bind="::badIn.badInItems[0].orderItem.order.enterprise.enName"></a></td>
-			<td colspan="1" class="order-sum">
-				<div class="text-ellipsis" ng-if="badIn.sendCode != null" style="width: 120px;" title="送货单号：{{::badIn.sendCode}}" > 
+			<td colspan="2" class="order-sum">
+				<div class="text-ellipsis" ng-if="badIn.sendCode != null" style="width: 240px;" title="送货单号：{{::badIn.sendCode}}" > 
 					<i style="color: #CC9933;" class="fa fa-truck"></i> 
 					<span ng-bind="badIn.sendCode"></span>
 				</div>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -229,10 +229,10 @@
 						class="text-num" ng-bind="::badOut.code"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><a title="客户名称"
+			<td colspan="2"><a title="客户名称"
 				ng-bind="::badOut.badOutItems[0].orderItem.order.enterprise.enName"></a></td>
-			<td colspan="1" class="order-sum">
-				<div class="text-ellipsis" ng-if="badOut.sendCode != null" style="width: 120px;" title="送货单号：{{::badOut.sendCode}}" > 
+			<td colspan="2" class="order-sum">
+				<div class="text-ellipsis" ng-if="badOut.sendCode != null" style="width: 240px;" title="送货单号：{{::badOut.sendCode}}" > 
 					<i style="color: #CC9933;" class="fa fa-truck"></i> 
 					<span ng-bind="badOut.sendCode"></span>
 				</div>