新增委外变更单明细，修改委外验退单实现日期分类查询

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

src/main/webapp/resources/tpl/index/make/change.html

@@ -217,8 +217,8 @@
 						ng-model="change.$selected">
 					</span> <span class="text-num text-bold"
 						ng-bind="::change.orderChange.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-						class="text-num" ng-bind="::change.orderChange.code" ui-sref="sale.change_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
-						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a></span>
+						class="text-num" ng-bind="::change.orderChange.code" ui-sref="make.change_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
+						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="make.order_detail({id:change.orderId})" target="_blank"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a

src/main/webapp/resources/tpl/index/make/change_detail.html

@@ -0,0 +1,150 @@
+<div class="pane base-info">
+	<div class="pane-header">
+		客户委外变更单<!-- <a href="#" class="pull-right text-simple"><i
+			class="fa fa-print fa-fw"></i>打印</a> -->
+	</div>
+	<div class="pane-body">
+		<div class="headerline">
+			<span class="index">1</span> <span class="content">单据信息</span>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">流水号</span>
+				<div class="content" ng-bind="::change.orderChange.code"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">日期</span>
+				<div class="content" ng-bind="::change.orderChange.date | date:'yyyy-MM-dd'"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">客户</span>
+				<div class="content" ng-bind="::change.orderChange.enterprise.enName"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">录单人</span>
+				<div class="content" ng-bind="::change.orderChange.recorder"></div>
+			</div>
+			<div class="col-xs-9">
+				<span class="title">备注</span>
+				<div class="content" ng-bind="::change.remark"></div>
+			</div>
+		</div>
+		<div class="headerline">
+			<span class="index">2</span> <span class="content">原委外加工单</span>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">采购单号</span>
+				<div class="content">
+					<a ng-bind="::change.orderCode"
+						ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a>
+				</div>
+			</div>
+		</div>
+		<div class="headerline">
+			<div class="index">4</div>
+			<div class="content">商品变更详情</div>
+			<div class="end" ng-show="change.status == 200">
+				<a class="btn btn-sm btn-default"
+					ng-click="change.$editing=!change.$editing"><i
+					class="fa fa-share fa-fw"></i>我要回复</a>
+			</div>
+		</div>
+		<div class="row row-sm item" ng-if="change.$editing">
+			<div class="col-xs-3">
+				<div class="form-group pull-right" ng-init="change.$agreed = 1">
+					<label class="radio-inline"> <input type="radio"
+						ng-model="change.$agreed" value="1"> 同意
+					</label> <label class="radio-inline"> <input type="radio"
+						ng-model="change.$agreed" value="0"> 不同意
+					</label>
+				</div>
+			</div>
+			<div class="col-xs-7">
+				<div class="form-group">
+					<input type="text" ng-model="change.replyRemark"
+						class="form-control input-xs" placeholder="回复备注">
+				</div>
+			</div>
+			<div class="col-xs-2">
+				<div class="btn-group btn-group-xs btn-group-justified">
+					<div class="btn-group btn-group-xs">
+						<button type="button" class="btn btn-info btn-line" ng-click="onReplyClick(change)">确认回复</button>
+					</div>
+					<div class="btn-group btn-group-xs">
+						<button type="button" class="btn btn-default btn-line" ng-click="change.$editing=!change.$editing">取消</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="block">
+			<table class="block table table-default table-striped table-hover">
+				<thead>
+					<tr class="header">
+						<th>商品</th>
+						<th width="100">单价</th>
+						<th>数量</th>
+						<th width="120">开工日期</th>
+						<th width="140">变更内容</th>
+						<th width="70">操作</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr >
+						<td>
+							<div>
+								<span class="text-num text-bold" ng-bind="::change.product.code"></span>
+								<span class="text-light">&nbsp;&nbsp;&nbsp;订单序号：<span class="text-num">{{::change.number}}</span></span>
+							</div>
+							<div ng-bind="::change.newProduct.title"></div>
+							<div class="text-muted" ng-bind="::change.product.spec"></div>
+						</td>
+						<td class="text-center">
+							<div class="text-num"
+								ng-class="{'text-inverse': change.newPrice != change.oldPrice}"
+								title="{{change.newPrice}}" ng-bind="::change.newPrice | number:6"></div>
+							<div ng-show="change.newPrice != change.oldPrice">
+								<s class="text-num text-muted" ng-bind="::change.oldPrice | number:6"></s>
+							</div>
+							<div class="text-muted">
+								税率 <span class="text-num" ng-class="{'text-inverse': change.newTaxrate != change.oldTaxrate}">
+									{{::change.newTaxrate}}%
+								</span> <s ng-if="change.newTaxrate != change.oldTaxrate">{{::change.oldTaxrate}}%</s>
+							</div>
+						</td>
+						<td class="text-center">
+							<div class="text-num"
+								ng-class="{'text-inverse': change.newQty != change.oldQty}"
+								title="{{change.newQty}}" ng-bind="::change.newQty"></div>
+							<div ng-show="change.newQty != change.oldQty">
+								<s class="text-num text-muted" title="{{change.oldQty}}"
+									ng-bind="::change.oldQty"></s>
+							</div>
+							<div class="text-muted" ng-bind="::change.newProduct.unit"></div>
+						</td>
+						<td class="text-center">
+							<div class="text-num"
+								ng-class="{'text-inverse': change.newCommence != change.oldCommence}"
+								ng-bind="::change.newCommence | date:'yyyy-MM-dd'"></div>
+							<div ng-show="change.newCommence != change.oldCommence">
+								<s class="text-num text-muted"
+									ng-bind="::change.oldCommence | date:'yyyy-MM-dd'"></s>
+							</div>
+						</td>
+						<td colspan="2">
+							<div ng-bind="::change.reason" style="margin:0 0 0 35px"></div>
+							<div ng-if="change.agreed == 1" class="block">
+								<span class="text-trans success">已同意</span>
+							</div>
+							<div ng-if="change.agreed == 0" class="block">
+								<span class="text-trans warning">不同意</span>
+							</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>

src/main/webapp/resources/tpl/index/make/returns.html

@@ -157,7 +157,8 @@
 							ng-required="true" current-text="今天" clear-text="清除"
 							close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							ng-focus="openDatePicker($event, condition, '$fromOpened')"
+							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
@@ -172,7 +173,8 @@
 							ng-required="true" current-text="今天" clear-text="清除"
 							close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							ng-focus="openDatePicker($event, condition, '$toOpened')"
+							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
@@ -207,7 +209,7 @@
 					</div> <!-- 分页 -->
 				</td>
 				<td class="text-center"><a
-					href="sale/accept/xls?keyword={{keywordXls}}" target="_self"
+					href="make/return/xls?_state={{active}}&searchFilter={{keywordXls}}"" target="_self"
 					class="text-simple" title="导出Excel表格"><i
 						class="fa fa-file-excel-o fa-fw"></i>导出</a></td>
 			</tr>