采购模块，新增认订单、送样申请界面

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

src/main/webapp/resources/tpl/index_mobile/sale/approval.html

@@ -0,0 +1,115 @@
+<style>
+/* title */
+.title {
+	padding-bottom: 10px;
+	border-bottom: solid 1px #e8e8e8;
+	margin-bottom: 0;
+}
+
+/* status */
+.status {
+	position: relative;
+	display: inline-block;
+}
+
+.status-list {
+	margin-top: 10px;
+	min-width: inherit;
+	width: 100px;
+}
+
+.status-list li {
+	font-size: 16px;
+	line-height: 40px;
+	height: 40px;
+	text-align: center;
+	border-bottom: solid 1px #e8e8e8;
+}
+
+.status-list li:HOVER, .status-list li:ACTIVE, .status-list li:FOCUS {
+	background: #44b549;
+	color: #ffffff;
+}
+
+/* order */
+.order {
+	position: relative;
+	margin-bottom: 0;
+	padding-top: 10px;
+	background: #eff2f9;
+}
+
+.order .order-line {
+	background: #ffffff;
+	margin-bottom: 15px;
+}
+.approval0{
+	position: relative;
+}
+
+</style>
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
+
+<div class="row">
+	<!-- title start -->
+	<h4 class="title col-xs-12">
+		<a ui-sref="index"><i class="fa fa-angle-left fa-lg"></i>&nbsp;&nbsp;客户认定单</a>
+	</h4>
+	<!-- title end -->
+</div>
+
+<!-- order list start -->
+<ul class="list-group order row" ng-if="data.content">
+	<li class="list-group-item col-xs-12 order-line" ng-repeat="approval in data.content" ui-sref="sale.approval_detail({id:approval.id})">
+		<div class="row">
+			<div class="col-xs-8 text-num text-inverse">{{approval.code}}</div>
+			<div class="col-xs-4 text-muted f12 text-right">{{approval.inDate | date:'MM月dd日'}}</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12 f14 text-light">
+				<span>{{approval.enterprise.enName}}</span>
+			</div>
+			<div class="col-xs-12 f14 text-light">
+				样品数量 ：<span ng-bind="approval.sampleqty"></span>&nbsp;<span ng-bind="approval.prodUnit""></span>
+			</div>
+			<div class="col-xs-12 f14 text-light">
+				关联单据（送样单） ：<span ng-bind="approval.pscode"></span>
+			</div>
+			<div class="col-xs-12 f14">
+				<i class="fa fa-cube text-primary"></i>
+					<span class="text-primary">商品：</span><span class="text-primary" ng-bind="approval.prodCode"></span>
+			</div>
+		</div>
+		<div class="row approval0">
+			<div class="col-xs-8 f14">
+				<i class="fa fa-check-square text-primary"></i>
+					<span class="text-primary">客户认定结果：</span>
+			</div>
+			<div class="col-xs-4 text-right" ng-show="approval.finalresult">
+				<span  class="label " ng-class="{'label-success': approval.finalresult == '合格', 'label-warning': approval.finalresult != '合格'}">
+					<i class="fa fa-legal" ></i>
+					 {{::approval.finalresult}}
+				</span>
+			</div>
+			<div class="col-xs-4 text-trans wait" ng-show="!approval.finalresult">
+				未认定
+			</div>
+		</div>
+	</li>
+	<li ng-if="loading" class="list-group-item col-xs-12 text-center text-muted">
+		<br>
+		正在加载中...
+	</li>
+	<li ng-if="!loading && data.number < data.totalPages" class="list-group-item col-xs-12 text-center" ng-click="getMoreData()">
+		{{data.content.length}}/{{data.totalElements}}<br>
+		点击加载更多单据 <i class="fa fa-angle-double-down"></i>
+	</li>
+	<li ng-if="!loading && data.number >= data.totalPages" class="list-group-item col-xs-12 text-default text-bold text-center">
+		{{data.content.length}}/{{data.totalElements}}<br>
+		已加载全部 
+	</li>
+</ul>
+<!-- order list end -->
+

src/main/webapp/resources/tpl/index_mobile/sale/approval_detail.html

@@ -0,0 +1,234 @@
+<style>
+	table, tr, thead, tbody {
+		width: 100%;
+	}
+	
+	.orderInfo {
+		padding: 18px 0;
+	}
+	
+	.order {
+		position: relative;
+		margin-bottom: 0;
+		background: #eff2f9;
+	}
+	
+	.order .order-line {
+		background: #ffffff;
+		padding: 0 15px;
+		line-height: 44px;
+	}
+	
+	.order-line tr{
+		line-height:30px;
+	}
+	.va-top {
+		vertical-align: top;
+	}
+
+	.middle-border {
+		border-top: solid 1px #CCCCCC;
+		margin: 0;
+	}
+	
+	.margin10{
+		margin:10px 0 0 0;
+	}
+	.status {
+		height: 50px;
+		width: 50px;
+		border-radius: 30px;
+		border: dashed 1px #009966;
+		padding-top: 5px;
+		text-align: center;
+		right: 10px;
+		top:10px;
+		background-color: #FFFFFF;
+		color: #009966;
+		-webkit-transform: rotate(15deg);
+		-moz-transform: rotate(15deg);
+		-o-transform: rotate(15deg);
+		transform: rotate(15deg);
+		font-size: 14px;
+		z-index: 9;
+	}
+	
+	.tr-height{
+		position:relative;
+		border: 2px solid rgb(228, 202, 202);
+	}
+	
+	.padding5{
+		padding-left: 5px;
+	}
+	
+	.tdsoild{
+		border-left: 1px solid #e6e6e6;
+	}
+	.statusfinal {
+		position: absolute;
+		height: 50px;
+		width: 110px;
+		border-radius: 30px;
+		border: dashed 1px #009966;
+		padding-top: 5px;
+		text-align: center;
+		right: 10px;
+		bottom:10px;
+		background-color: #B3E8E0;
+		color: black;
+		-webkit-transform: rotate(15deg);
+		-moz-transform: rotate(15deg);
+		-o-transform: rotate(15deg);
+		transform: rotate(15deg);
+		font-size: 14px;
+		z-index: 9;
+	}
+</style>
+
+<div class="order row">
+	<div class="top bold col-xs-12">
+		<a ui_sref="sale.approval" class="f16 topText">&nbsp;<i class="fa fa-angle-left"></i>&nbsp;认定单详情</a>
+	</div>
+	<div class="orderInfo col-xs-12">
+		<table >
+			<tr>
+				<td class="va-top text-right" width="95px"><label class="text-black">订单号：</label></td>
+				<td>
+					<span ng-bind="approval.code"></span>&nbsp;&nbsp;&nbsp;
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">物料信息：</label></td>
+				<td>
+					名称：<span ng-bind="approval.prodCode"></span><br>
+					编号：<span ng-bind="approval.prodDetail"></span><br>
+					规格：<span ng-bind="approval.prodSpec"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">单据时间：</label></td>
+				<td>
+					<span ng-bind="approval.inDate | date:'yyyy-MM-dd'"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">关联单据：</label></td>
+				<td>
+					<span>{{approval.pscode}}（送样单号）</span>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="order-line">
+		<div class="loading"  ng-class="{'in': loading}">
+			<i></i>
+		</div>
+		<div class="col-xs-5 text-num bold  text-left  f16">认定信息&nbsp;:</div>
+		<div class="col-xs-7 text-left" style="position:relative;">
+			<div class="status" ng-show="!approval.finalresult">未认定</div>
+			<div class="status" ng-show="approval.finalresult">已认定</div>
+		</div>
+		<table class="block margin10">
+			<tbody>
+				<tr class="tr-height">
+					<td class="statusfinal">关联单据详情</td>
+					<td class="tdsoild">
+						<div class="padding5">申请单:&nbsp;{{approval.pscode}}</div>
+						<div class="row">
+							<div class="col-xs-3" >&nbsp;&nbsp;附件:</div>
+							<div class="col-xs-9 text-left" ng-if="approval.attachs == 0">无</div>
+							<div class="col-xs-9 file" ng-repeat="attach in approval.attachs" ng-if="approval.attachs.length > 0">
+								<a href="file/{{attach.id}}" ng-bind="::attach.name"></a>
+							</div>
+						</div>
+						<div ng-if="approval.finalresultremark" class="padding5">最终认定：{{::approval.finalresultremark}}<div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		<table class="block margin10" ng-if="approval.material || approval.materialquality || approval.address || approval.addressmark || approval.height">
+			<tbody>
+				<tr class="tr-height">
+					<td  class="statusfinal">送样信息详情</td>
+					<td class="tdsoild">
+						<div ng-if="approval.material || approval.materialquality">
+							<span ng-if="approval.material">材料：{{::approval.material}}&nbsp;&nbsp;</span>
+							<span ng-if="approval.materialquality">材质：{{::approval.materialquality}}</span>
+						</div>
+						<div ng-if="approval.address || approval.addressmark">
+							<span ng-if="approval.address">产地：{{::approval.address}}&nbsp;&nbsp;</span>
+							<span ng-if="approval.addressmark">产地标示：{{::approval.addressmark}}</span>
+						</div>
+						<div ng-if="approval.height">
+							<span ng-if="approval.height">单重：{{::approval.height}}
+								g&nbsp;&nbsp;</span>
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		<table class="block margin10">
+			<tbody>
+				<tr class="tr-height">
+					<td class="tdsoild">
+						<ul class="list-group">
+							<li class="list-group-item text-muted ">
+								<div class="row">
+									<div class="col-md-2">
+										<i class="fa fa-check-square-o fa-fw"></i>&nbsp;研发认定
+									</div>
+									<div class="col-md-10">
+										<span ng-if="approval.prdtime">收到样品时间：{{::approval.prdtime | date: 'yyyy-MM-dd'}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.prdypsl">收到样品数量：{{::approval.prdypsl}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.prdresult">综合判定：{{::approval.prdresult}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.prdadvice">建议：{{::approval.prdadvice}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.prdremark">描述：{{::approval.prdremark}}&nbsp;&nbsp;</span>
+										附件：<span ng-if="approval.prdAttachs.length == 0">无</span>
+										<span ng-repeat="attach in approval.prdAttachs"><a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
+									</div>
+								</div>
+							</li>
+						</ul>
+						<ul class="list-group" style="margin-top: 10px;">
+							<li class="list-group-item text-muted ">
+								<div class="row">
+									<div class="col-md-2">
+										<i class="fa fa-check-square-o fa-fw"></i>&nbsp;IQC认定
+									</div>
+									<div class="col-md-10">
+										<span ng-if="approval.padtime">收到样品时间：{{::approval.padtime | date: 'yyyy-MM-dd'}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.padypsl">收到样品数量：{{::approval.padypsl}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.padresult">综合判定：{{::approval.padresult}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.padadvice">建议：{{::approval.padadvice}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.padremark">描述：{{::approval.padremark}}&nbsp;&nbsp;</span>
+										附件：<span ng-if="approval.padAttachs.length == 0">无</span>
+										<span ng-repeat="attach in approval.padAttachs"><a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
+									</div>
+								</div>
+							</li>
+						</ul>
+						<ul class="list-group" style="margin-top: 10px;">
+							<li class="list-group-item text-muted ">
+								<div class="row">
+									<div class="col-md-2">
+										<i class="fa fa-check-square-o fa-fw"></i>&nbsp;工程认定
+									</div>
+									<div class="col-md-10">
+										<span ng-if="approval.ppdtime">收到样品时间：{{::approval.ppdtime | date: 'yyyy-MM-dd'}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.ppdypsl">收到样品数量：{{::approval.ppdypsl}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.ppdresult">综合判定：{{::approval.ppdresult}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.ppdadvice">建议：{{::approval.ppdadvice}}&nbsp;&nbsp;</span>
+										<span ng-if="approval.ppdremark">描述：{{::approval.ppdremark}}&nbsp;&nbsp;</span>
+										附件：<span ng-if="approval.ppdAttachs.length == 0">无</span>
+										<span ng-repeat="attach in approval.ppdAttachs"><a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
+									</div>
+								</div>
+							</li>
+						</ul>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

src/main/webapp/resources/tpl/index_mobile/sale/qc.html

@@ -0,0 +1 @@
+<div ui-view></div>

src/main/webapp/resources/tpl/index_mobile/sale/sample.html

@@ -0,0 +1,121 @@
+<style>
+/* title */
+.title {
+	padding-bottom: 10px;
+	border-bottom: solid 1px #e8e8e8;
+	margin-bottom: 0;
+}
+
+/* status */
+.status {
+	position: relative;
+	display: inline-block;
+}
+
+.status-list {
+	margin-top: 10px;
+	min-width: inherit;
+	width: 100px;
+}
+
+.status-list li {
+	font-size: 16px;
+	line-height: 40px;
+	height: 40px;
+	text-align: center;
+	border-bottom: solid 1px #e8e8e8;
+}
+
+.status-list li:HOVER, .status-list li:ACTIVE, .status-list li:FOCUS {
+	background: #44b549;
+	color: #ffffff;
+}
+
+.text-trans.wait {
+	color: red;
+	border-color: green;
+}
+/* order */
+.order {
+	position: relative;
+	margin-bottom: 0;
+	padding-top: 10px;
+	background: #eff2f9;
+}
+
+.order .order-line {
+	background: #ffffff;
+	margin-bottom: 15px;
+}
+
+/* .order .order-line:HOVER, .order .order-line:ACTIVE {
+	background: #d7d7d7;
+} */
+
+</style>
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
+
+<div class="row">
+	<!-- title start -->
+	<h4 class="title col-xs-12">
+		<a ui-sref="index"><i class="fa fa-angle-left fa-lg"></i>&nbsp;&nbsp;客户打样申请单</a>
+		<div class="pull-right f16">
+			<span>状态 | </span>
+			<div class="status" dropdown>
+				<span dropdown-toggle>
+					<span ng-if="_state == 'done'">已送样</span>
+					<span ng-if="_state == 'all'">全部&nbsp;&nbsp;&nbsp;</span>
+					<span ng-if="_state == 'todo'">待送样</span>
+					<i class="fa fa-angle-down"></i></span>
+				<ul class="dropdown-menu dropdown-menu-right status-list">
+					<li ng-click="setState('all')">全部</li>
+					<li ng-click="setState('done')">已送样</li>
+					<li ng-click="setState('todo')">待送样</li>
+				</ul>
+			</div>
+		</div>
+	</h4>
+	<!-- title end -->
+</div>
+
+<!-- sample start -->
+<ul class="list-group order row" ng-if="data.content">
+	<li class="list-group-item col-xs-12 order-line" ng-repeat="sample in data.content" ui-sref="sale.sample_detail({id:sample.id})">
+		<div class="row">
+			<div class="col-xs-8 text-num text-inverse">{{sample.proofing.code}}</div>
+			<div class="col-xs-4 text-muted f12 text-right">{{sample.proofing.date | date:'MM月dd日'}}</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12 f14 text-light">
+				<span>{{sample.proofing.enterprise.enName}}</span>
+				<span class="pull-right text-num text-right f18" ng-show="sample.price > 0">{{currency(sample.currency)}}{{sample.price | number:6}}</span>
+				<span class="pull-right text-num text-right label label-default" ng-show="sample.price == 0.0">不收费</span>
+			</div>
+			<div class="col-xs-12 f14 text-light">
+				送样数量 ：<span ng-bind="sample.qty"></span>
+			</div>
+			<div class="col-xs-12 f14">
+				<i class="fa fa-cube text-primary"></i>
+					<span class="text-primary">商品：</span><span class="text-primary" ng-bind="sample.proofing.product.code""></span>
+					<span ng-if="sample.status == 400" class="text-trans success">已送样</span>
+					<span ng-if="sample.status != 400" class="text-trans wait">待送样</span>
+			</div>
+		</div>
+	</li>
+	<li ng-if="loading" class="list-group-item col-xs-12 text-center text-muted">
+		<br>
+		正在加载中...
+	</li>
+	<li ng-if="!loading && data.number < data.totalPages" class="list-group-item col-xs-12 text-center" ng-click="getMoreData()">
+		{{data.content.length}}/{{data.totalElements}}<br>
+		点击加载更多单据 <i class="fa fa-angle-double-down"></i>
+	</li>
+	<li ng-if="!loading && data.number >= data.totalPages" class="list-group-item col-xs-12 text-default text-bold text-center">
+		{{data.content.length}}/{{data.totalElements}}<br>
+		已加载全部 
+	</li>
+</ul>
+<!-- sample end -->
+

src/main/webapp/resources/tpl/index_mobile/sale/sample_detail.html

@@ -0,0 +1,141 @@
+<style>
+	table, tr, thead, tbody {
+		width: 100%;
+	}
+	
+	.orderInfo {
+		padding: 18px 0;
+	}
+	
+	.order {
+		position: relative;
+		margin-bottom: 0;
+		background: #eff2f9;
+	}
+	
+	.order .order-line {
+		background: #ffffff;
+		padding: 0 15px;
+		line-height: 44px;
+	}
+	.order .order-inline{
+		background: #ffffff;
+		margin-bottom: 44px;
+		padding: 0 15px;
+		line-height: 0;
+	}
+	
+	.va-top {
+		vertical-align: top;
+	}
+
+	.margin0 {
+		margin:0;
+	}
+	
+	.margin5{
+		margin:5px 0 0 0;
+	}
+
+	.middle-border {
+		border-top: solid 1px #CCCCCC;
+		margin: 0;
+	}
+</style>
+
+<div class="order row">
+	<div class="top bold col-xs-12">
+		<a ui_sref="sale.sample" class="f16 topText">&nbsp;<i class="fa fa-angle-left"></i>&nbsp;订单详情</a>
+	</div>
+	<div class="orderInfo col-xs-12">
+		<table>
+			<tr>
+				<td class="va-top text-right" width="95px"><label class="text-black">订单号：</label></td>
+				<td>
+					<span ng-bind="sample.proofing.code"></span>&nbsp;&nbsp;&nbsp;
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">客户：</label></td>
+				<td>
+					<span ng-bind="sample.proofing.enterprise.enName"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">送样申请人：</label></td>
+				<td>
+					<span ng-bind="::sample.proofing.user.userName"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">物料信息：</label></td>
+				<td>
+					名称：<span ng-bind="::sample.proofing.product.title"></span><br>
+					编号：<span ng-bind="::sample.proofing.product.code"></span><br>
+					规格：<span ng-bind="::sample.proofing.product.spec"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">单据时间：</label></td>
+				<td>
+					<span ng-bind="sample.proofing.date | date:'yyyy-MM-dd'"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">备注：</label></td>
+				<td>
+					<span ng-bind="::sample.proofing.remark || '(无)'"></span>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="order-line row f16">
+		<div class="loading"  ng-class="{'in': loading}">
+			<i></i>
+		</div>
+		<div class="col-xs-10 text-num bold  text-left text-primary">送样信息</div>
+		<div class="row middle-border">
+			<div class="col-xs-5">送样单号</div>
+			<div class="col-xs-7 text-right text-muted">{{::sample.send.code}}</div>
+		</div>
+		<div class="row middle-border">
+			<div class="col-xs-5">送样时间</div>
+			<div class="col-xs-7 text-right text-muted">{{::sample.send.date | date: 'yyyy-MM-dd HH:mm'}}</div>
+		</div>
+		<div class="row middle-border">
+			<div class="col-xs-7">单价</div>
+			<div ng-show="sample.proofing.isCharge != '是'"
+				class="col-xs-5 text-right text-muted">不收费</div>
+			<div ng-show="sample.proofing.isCharge == '是'" class="text-right text-muted col-xs-5">
+				<span ng-bind="::currency(sample.currency)"></span> <span
+					ng-bind="::sample.price | number:6"></span>
+			</div>
+			<div ng-show="sample.proofing.isCharge == '是'" class="text-muted col-xs-2">
+				税率：<span class="text-num" ng-bind="::sample.taxrate || 0"></span>%
+			</div>
+		</div>
+		<div class="row middle-border">
+			<div class="col-xs-5">需求数</div>
+			<div class="col-xs-7 text-right text-muted">{{sample.qty}}</div>
+		</div>
+		<div class="row middle-border">
+			<div class="col-xs-5">交货日期</div>
+			<div class="col-xs-7 text-right">
+				<span class="text-muted" ng-bind="::sample.proofing.delivery | date: 'yyyy-MM-dd'"></span>
+			</div>
+		</div>
+	</div>
+	<div class="row middle-border" style="margin: 0 0 20px 0;">
+		<div class="col-xs-5 margin5">附加信息</div>
+		<div class="col-xs-7 text-right text-muted margin5">
+			<div ng-if="sample.send.minQty">最小包装量：<span ng-bind="::sample.send.minQty"></span></div>
+			<div ng-if="sample.send.minBuyQty">最小订购量：<span ng-if="sample.send.minBuyQty" ng-bind="::sample.send.minBuyQty"></span></div>
+			<div class="row row-sm" ng-if="sample.send.attachs.length > 0">
+				<div>附件&nbsp;&nbsp;</div>
+				<div class="text-muted">
+					<div ng-repeat="attach in sample.send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}&nbsp;&nbsp;</a></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>