Browse Source

新增qc模块,新添加MRB,不良品出入库等界面

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1937 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof 10 years ago
parent
commit
35bbd8728c

+ 105 - 0
src/main/webapp/resources/tpl/index_mobile/qc/MRB.html

@@ -0,0 +1,105 @@
+<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="MRB in data.content" ui-sref="qc.MRB_detail({id:MRB.id})">
+		<div class="row">
+			<div class="col-xs-8 text-num text-inverse">{{MRB.code}}</div>
+			<div class="col-xs-4 text-muted f12 text-right">{{MRB.date | date:'MM月dd日'}}</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12 f14 text-light">
+				<span>{{MRB.orderItem.order.enterprise.enName}}</span>
+				<a ng-if="MRB.sendCode != null" title="送货单号" class="pull-right"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span class="text-light">送货单号:{{MRB.sendCode}}</span></a>
+			</div>
+			<div class="col-xs-12 f14 text-light">
+				<span>收料数量:{{MRB.inQty}}</span>&nbsp;&nbsp;<span class="text-muted" ng-bind="MRB.orderItem.product.unit"></span>
+				<span class="pull-right">
+					<span class="text-success text-bold f12" >合格:{{::MRB.okQty}}</span>
+					<span class="text-danger text-bold f12" >不合格:{{::MRB.ngQty}}</span>
+				</span>
+			</div>
+			<div class="col-xs-12 f14">
+				<i class="fa fa-cube text-primary"></i>
+				<span class="text-primary">商品: {{MRB.orderItem.product.title}}</span>
+				<span class="pull-right">
+					<span ng-if="::MRB.result" class="label label-success">{{MRB.result}}</span>
+				</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>
+<!-- order list end -->
+

+ 1 - 0
src/main/webapp/resources/tpl/index_mobile/qc/MRB_detail.html

@@ -0,0 +1 @@
+<div><h1>MRB--入</h1></div>

+ 97 - 0
src/main/webapp/resources/tpl/index_mobile/qc/badIn.html

@@ -0,0 +1,97 @@
+<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="badIn in data.content" ui-sref="qc.badIn_detail({id:badIn.id})">
+		<div class="row">
+			<div class="col-xs-8 text-num text-inverse">{{badIn.code}}</div>
+			<div class="col-xs-4 text-muted f12 text-right">{{badIn.date | date:'MM月dd日'}}</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12 f14 text-light">
+				<span>{{badIn.badInItems[0].orderItem.order.enterprise.enName}}</span>
+				<a ng-if="badIn.sendCode != null" title="送货单号" class="pull-right"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span class="text-light">{{badIn.sendCode}}</span></a>
+			</div>
+			<div class="col-xs-12 f14">
+				<i class="fa fa-cube text-primary"></i>
+				<span ng-repeat="item in badIn.badInItems" ng-if="$index<5">
+					<span class="text-primary" ng-bind="::item.orderItem.product.code"></span><span ng-if="!$last && $index<4">、</span>
+				</span>等共 <span class="text-default">{{getProdCount(badIn)}}</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>
+<!-- order list end -->
+

+ 93 - 0
src/main/webapp/resources/tpl/index_mobile/qc/badIn_detail.html

@@ -0,0 +1,93 @@
+<style>
+	table, tr, thead, tbody {
+		width: 100%;
+	}
+	
+	.orderInfo {
+		padding: 18px 0;
+	}
+	
+	.order {
+		position: relative;
+		margin-bottom: 0;
+		background: #eff2f9;
+	}
+
+	.va-top {
+		vertical-align: top;
+	}
+
+	.br-b{
+		  margin-bottom: 5px;
+		  border-bottom: 1px solid #B7ECB7;
+	}
+</style>
+
+<div class="order row">
+	<div class="top bold col-xs-12">
+		<a ui_sref="qc.badIn" 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="badIn.code"></span>&nbsp;&nbsp;&nbsp;
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">客户:</label></td>
+				<td>
+					<span ng-bind="badIn.badInItems[0].orderItem.order.enterprise.enName"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">送货单号:</label></td>
+				<td>
+					<span ng-bind="badIn.sendCode"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">单据时间:</label></td>
+				<td>
+					<span ng-bind="badIn.date | date:'yyyy-MM-dd'"></span>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="f12  col-xs-12" style="min-height: 400px; position: relative;">
+		<div class="loading"  ng-class="{'in': loading}">
+			<i></i>
+		</div>
+		<table class="block table table-default table-striped table-hover">
+			<thead class="text-center bold">
+				<td width="15%" class="br-r">行号</td>
+				<td width="50%" class="br-r">商品信息</td>
+				<td width="35%">关联单据</td>
+			</thead>
+			<tbody >
+				<tr ng-repeat="item in badIn.badInItems">
+					<td class="text-center text-num text-bold f-16 text-success br-r">
+						<span ng-bind="::item.number"></span>
+					</td>
+					<td class="br-r">
+						<div class="text-num text-bold">
+							<span ng-bind="::item.orderItem.product.code"></span>
+						</div>
+						<div>
+							<span ng-bind="::item.orderItem.product.title"></span>
+						</div>
+						<div class="text-muted br-b" ng-bind="::item.orderItem.product.spec"></div>
+						<div class="br-b"><span class="text-muted">入库批号:</span><br>{{::item.batchCode}}</div>
+						<div class="br-b"><span class="text-muted">单价:</span>{{::item.orderPrice}}<span ng-bind="::symbol(badIn.currency)"></span><br>
+							<span class="text-muted">出库数量:</span>{{::item.qty}}</div>
+					</td>
+					<td class="br-r">
+						<div class="br-b"><span class="text-muted">单据编号:</span><br><span>{{::item.orderItem.order.code}}</span></div>
+						<div class="br-b"><span class="text-muted">数量:&nbsp;</span><span ng-bind="::item.orderItem.qty"></span></div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

+ 97 - 0
src/main/webapp/resources/tpl/index_mobile/qc/badOut.html

@@ -0,0 +1,97 @@
+<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="badOut in data.content" ui-sref="qc.badOut_detail({id:badOut.id})">
+		<div class="row">
+			<div class="col-xs-8 text-num text-inverse">{{badOut.code}}</div>
+			<div class="col-xs-4 text-muted f12 text-right">{{badOut.date | date:'MM月dd日'}}</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12 f14 text-light">
+				<span>{{badOut.badOutItems[0].orderItem.order.enterprise.enName}}</span>
+				<a ng-if="badOut.sendCode != null" title="送货单号" class="pull-right"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span class="text-light">{{badOut.sendCode}}</span></a>
+			</div>
+			<div class="col-xs-12 f14">
+				<i class="fa fa-cube text-primary"></i>
+				<span ng-repeat="item in badOut.badOutItems" ng-if="$index<5">
+					<span class="text-primary" ng-bind="::item.orderItem.product.code"></span><span ng-if="!$last && $index<4">、</span>
+				</span>等共 <span class="text-default">{{getProdCount(badOut)}}</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>
+<!-- order list end -->
+

+ 93 - 0
src/main/webapp/resources/tpl/index_mobile/qc/badOut_detail.html

@@ -0,0 +1,93 @@
+<style>
+	table, tr, thead, tbody {
+		width: 100%;
+	}
+	
+	.orderInfo {
+		padding: 18px 0;
+	}
+	
+	.order {
+		position: relative;
+		margin-bottom: 0;
+		background: #eff2f9;
+	}
+
+	.va-top {
+		vertical-align: top;
+	}
+
+	.br-b{
+		  margin-bottom: 5px;
+		  border-bottom: 1px solid #B7ECB7;
+	}
+</style>
+
+<div class="order row">
+	<div class="top bold col-xs-12">
+		<a ui_sref="qc.badOut" 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="badOut.code"></span>&nbsp;&nbsp;&nbsp;
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">客户:</label></td>
+				<td>
+					<span ng-bind="badOut.badOutItems[0].orderItem.order.enterprise.enName"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">送货单号:</label></td>
+				<td>
+					<span ng-bind="badOut.sendCode"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">单据时间:</label></td>
+				<td>
+					<span ng-bind="badOut.date | date:'yyyy-MM-dd'"></span>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="f12  col-xs-12" style="min-height: 400px; position: relative;">
+		<div class="loading"  ng-class="{'in': loading}">
+			<i></i>
+		</div>
+		<table class="block table table-default table-striped table-hover">
+			<thead class="text-center bold">
+				<td width="15%" class="br-r">行号</td>
+				<td width="50%" class="br-r">商品信息</td>
+				<td width="35%">关联单据</td>
+			</thead>
+			<tbody >
+				<tr ng-repeat="item in badOut.badOutItems">
+					<td class="text-center text-num text-bold f-16 text-success br-r">
+						<span ng-bind="::item.number"></span>
+					</td>
+					<td class="br-r">
+						<div class="text-num text-bold">
+							<span ng-bind="::item.orderItem.product.code"></span>
+						</div>
+						<div>
+							<span ng-bind="::item.orderItem.product.title"></span>
+						</div>
+						<div class="text-muted br-b" ng-bind="::item.orderItem.product.spec"></div>
+						<div class="br-b"><span class="text-muted">入库批号:</span><br>{{::item.batchCode}}</div>
+						<div class="br-b"><span class="text-muted">单价:</span>{{::item.orderPrice}}<span ng-bind="::symbol(badOut.currency)"></span><br>
+							<span class="text-muted">出库数量:</span>{{::item.qty}}</div>
+					</td>
+					<td class="br-r">
+						<div class="br-b"><span class="text-muted">单据编号:</span><br><span>{{::item.orderItem.order.code}}</span></div>
+						<div class="br-b"><span class="text-muted">数量:&nbsp;</span><span ng-bind="::item.orderItem.qty"></span></div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

+ 1 - 0
src/main/webapp/resources/tpl/index_mobile/qc/qc.html

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