加入发票详情；登录退出弹框；询价详情加入交货地址；主动报价单页反馈问题处理。

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

src/main/webapp/resources/js/index/app.js

@@ -1139,10 +1139,18 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 //				checkTel($scope.userInfo);
 			}
 		});
+
+        $scope.logout = function() {
+            $modal.open({
+                templateUrl: 'static/tpl/index/account/logout.html',
+                controller: 'LogOutCtrl'
+            }).result.then(function(s){
+                if(s) {
+                    AuthenticationService.logout();
+                }
+            });
+        };
 		
-		$scope.logout = function() {
-			AuthenticationService.logout();
-		};
 		$scope.switchto = function(enUU) {// 切换企业
 			AuthenticationService.reSignin(enUU).success(function(){
 				$window.location.reload();
@@ -1165,6 +1173,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		   }
 		};
 	}]);
+
+    app.controller('LogOutCtrl', ['$scope', '$modalInstance', function($scope, $modalInstance) {
+        $scope.close = function(confirm) {
+            $modalInstance.close(confirm);
+        };
+    }]);
 	
 	app.controller('ImageInsertCtrl', ['$scope', '$modalInstance', function($scope, $modalInstance) {
 		$scope.image = {src: null};
@@ -4508,8 +4522,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$scope.loading  = true;
 			$rootScope.enteryStatus = true;
 			Quotation.getItem({id: $stateParams.id}, function(data){
-				data.$editing = false;
-				$scope.item = data;
+				// data.$editing = false;
+                $scope.item = data;
+                $scope.item.$editing = true; // 取消要点击修改才可以编辑的交互
 				staticItem = angular.copy(data);
 				$scope.loading  = false;
 			}, function(response){
@@ -4649,7 +4664,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				toaster.pop('error', '保存失败', response.data);
 			});
 		};
-		
 		// 更新
 		$scope.update = function(){
 			$scope.item.$editing = true;
@@ -4664,7 +4678,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 提交
 		$scope.submit = function(){
 			$scope.loading = true;
-			$scope.item.quotation.status = 101;//在录入
+			$scope.item.quotation.status = 101;//已提交
 			Quotation.save({}, $scope.item, function(data){
 				$scope.loading = false;
 				toaster.pop('success', '成功', '提交成功');
@@ -8402,7 +8416,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.ok = function () {
 			if($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
 				AccountUser.updatePassword({password: $scope.user.password, newPassword: $scope.user.newPassword}, {}, function(data){
-					toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');
+				    var tip = '修改成功，请牢记您的新密码：' + $scope.user.newPassword;
+					toaster.pop('success', '成功', tip);
 					$scope.user.password = null;
 					$scope.user.newPassword = null;
 					$scope.user.newPassword1 = null;

src/main/webapp/resources/tpl/index/account/add_userInfo.html

@@ -17,7 +17,7 @@
 </style>
 <div class="modal-header">
 	<h3 class="modal-title">
-		为企业分配用户
+		客户分配
 	</h3>
 </div>
 <div class="form-group" id="window-search" style="height: 36px; margin-bottom: 0; margin-top: 5px;">
@@ -30,16 +30,18 @@
 	<div>
 		<table width="99%" class="block table table-bordered table-striped table-hover">
 		<thead>
-				<th width="40px;" style="text-align: center"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
-				<th width="100px;">用户名称</th>
-				<th width="80px;">用户UU</th>
+			<th width="80px;">用户UU</th>
+			<th width="100px;">用户名称</th>
+			<th width="40px;" style="text-align: center"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+
+
 		</thead>
 		<tbody>
 				<div style="overflow-y:scroll; width:100%;max-height:500px">			
 					<tr ng-repeat="user in userinfos| filter: keyword">
-						<td width="40px;" style="text-align: center"><input ng-model="user.distribute" name="checkbox" ng-click="checkOne(user)" type="checkbox"></td>
-						<td width="100px;">{{user.userName}}</td>
 						<td width="80px;">{{user.userUU}}</td>
+						<td width="100px;">{{user.userName}}</td>
+						<td width="40px;" style="text-align: center"><input ng-model="user.distribute" name="checkbox" ng-click="checkOne(user)" type="checkbox"></td>
 					</tr>
 				</div>
 		<tbody>
@@ -47,8 +49,6 @@
 	</div>
 </div>
 <div class="modal-footer">
-	<span class="pull-left text-muted"><i
-		class="fa fa-fw fa-warning"></i>点击企业选中或取消</span>
 	<button class="btn btn-primary" ng-click="close(true)">确认</button>
 	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
 </div>

src/main/webapp/resources/tpl/index/account/logout.html

@@ -0,0 +1,32 @@
+<style>
+	.modal-content {
+		width: 350px;
+		height: 200px;
+		top: 100px;
+		left: 100px;
+	}
+
+	.modal-title {
+		text-align: left;
+		font-size: 16px;
+	}
+	.modal-body {
+		text-align: center;
+	}
+	.modal-body .tip-content{
+		font-size: 16px;
+	}
+	.modal-body .btn {
+		margin: 40px;
+	}
+</style>
+<div class="modal-header">
+	<span class="modal-title">
+		提示
+	</span>
+</div>
+<div class="modal-body">
+	<div class="tip-content">是否确认退出？</div>
+	<button class="btn btn-lg btn-danger" ng-click="close(true)">确认</button>
+	<button class="btn btn-lg btn-default" ng-click="close(false)" type="button">取消</button>
+</div>

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -228,8 +228,8 @@
 					<span> <input type="checkbox" class="selector"
 						ng-model="bill.$selected">
 					</span> <span class="text-num text-bold" title="{{::bill.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="bill.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
-						class="text-num" ng-bind="::bill.code"></span></span>
+						ng-bind="bill.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a style="color: #5078cb;" ui-sref="fa.apBill_detail({id:bill.id})"><span
+						class="text-num" ng-bind="::bill.code"></span></a></span>
 				</div>
 			</td>
 			<td colspan="3"><span title="客户名称"

src/main/webapp/resources/tpl/index/fa/apBill_detail.html

@@ -0,0 +1,167 @@
+<style>
+.pane {
+	font-size: 14px;
+}
+.icon-purc {
+	display: inline-block;
+	background: url(static/img/icon/purc.ico);
+	height: 26px;
+	width: 26px;
+}
+.badge-success {
+	background: #5cb85c;
+	color: #ffffff;
+}
+.badge-warning {
+	background: #f0ad4e;
+	color: #ffffff;
+}
+.badge-info {
+	background: #5bc0de;
+	color: #ffffff;
+}
+.badge-primary {
+	background: #337ab7;
+	color: #ffffff;
+}
+.badge-danger {
+	background: #d9534f;
+	color: #ffffff;
+}
+</style>
+
+<div class="loading" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>发票</span>
+		<div class="p-right">
+			<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
+			class="fa fa-print fa-fw"></i>打印</a> -->
+		</div>
+	</div>
+	<div class="pane-body">
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">单据资料</span>&nbsp;
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">客户名称</span>
+				<div class="content" ng-bind="::bill.enterprise.enName"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">单据编号</span>
+				<div class="content text-num" ng-bind="::bill.code"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">录单日期</span>
+				<div class="content" ng-bind="::bill.indate | date:'yyyy/MM/dd'"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">录单人</span>
+				<div class="content" ng-bind="::bill.recorder"></div>
+			</div>
+			<div class="col-xs-6" ng-if="bill.remark">
+				<span class="title">备注</span>
+				<div class="content" ng-bind="::bill.remark"></div>
+			</div>
+		</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">财务信息</span>&nbsp;
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">日期</span>
+				<div class="content" ng-bind="bill.date | date:'yyyy/MM/dd'"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">付款日期</span>
+				<div class="content" ng-bind="bill.paydate | date:'yyyy/MM/dd'"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">币别</span>
+				<div class="content" ng-bind="::bill.currency"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">汇率</span>
+				<div class="content text-num" ng-bind="::bill.rate"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">账期</span>
+				<div class="content" ng-bind="bill.yearMouth"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">应付总额</span>
+				<div class="content text-num" ng-bind="::bill.apAmount | number:2 || 0"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">付款金额</span>
+				<div class="content" ng-bind="bill.payAmount || 0"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">税金合计</span>
+				<div class="content" ng-bind="bill.taxSum || 0"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3" ng-show="bill.refNo">
+				<span class="title">发票号</span>
+				<div class="content" ng-bind="bill.refNo || ''"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">付款方式</span>
+				<div class="content" ng-bind="bill.payments"></div>
+			</div>
+		</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">明细清单</span>&nbsp;
+		</div>
+		<div class="block">
+			<table class="block table table-default table-striped table-hover">
+				<thead>
+					<tr class="header">
+						<th class="br-r">序号</th>
+						<th width="250">商品</th>
+						<th>采购单号</th>
+						<th>出入库单号</th>
+						<th>数量</th>
+						<th>单价</th>
+						<th>税率</th>
+						<th>单据金额</th>
+						<th>本次开票数量</th>
+						<th>本次开票金额</th>
+						<th>已开票数</th>
+						<th>已转开票记录数</th>
+						<th ng-if="item.remark">备注</th>
+					</tr>
+				</thead>
+				<tbody ng-repeat="item in bill.items" style="text-align: center;">
+					<tr>
+						<td ng-bind="item.number"></td>
+						<td style="text-align: left;">
+							<div>物料编号：{{item.product.code}}</div>
+							<div>物料信息：{{item.product.title}}-{{item.product.spec || ''}}</div>
+							<div>单位:{{item.product.unit}}</div>
+						</td>
+						<td ng-bind="item.orderCode"></td>
+						<td ng-bind="item.pdinoutNo"></td>
+						<td ng-bind="item.thisvoQty"></td>
+						<td ng-bind="item.price"></td>
+						<td ng-bind="item.taxrate"></td>
+						<td ng-bind="item.amount"></td>
+						<td ng-bind="item.qty"></td>
+						<td ng-bind="item.apAmount"></td>
+						<td ng-bind="item.invoQty"></td>
+						<td ng-bind="item.yQty"></td>
+						<td ng-if="item.remark" ng-bind="item.remark"></td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -353,7 +353,7 @@ margin-left: 55px;
 			<td colspan="6">
 			</td>
 			<td class="text-center">
-				<a href="sale/inquiry/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="purc/inquiry/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 		</tr>
 		<tr class="sep-row">

src/main/webapp/resources/tpl/index/sale/customer.html

@@ -141,12 +141,10 @@
 						<td class="text-center">
 								<!--<a title="展开" class="text-muted" ng-click="open(customer,$index)"><i class="fa fa-toggle-down fa-lg"></i></a>-->
 								<!--<a ng-click="viewDetail(customer.id)">查看详情</a><br/>-->
-								<a title="新增" style="color: #327ebe;" ng-click="addUserInfo(customer)"><!--<i class="fa fa-plus-circle fa-lg">-->分配</i></a>
-							</div>
+								<a style="color: #327ebe;" ng-click="addUserInfo(customer)"><!--<i class="fa fa-plus-circle fa-lg">-->分配</i></a>
 						</td>
 					</tr>
 			</tbody>
 		</table>
-		</div>
 	</div>
 </div>

src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -36,6 +36,12 @@
 				<div class="content" ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></div>
 			</div>
 		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-12">
+				<div class="title">收货地址：</div>
+				<div class="unchanged-info">{{inquiry.ship}}</div>
+			</div>
+		</div>
 		<!--<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">审核人：</span>
@@ -57,6 +63,12 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<div class="title">发票类型：</div>
+				<div class="unchanged-info" ng-if="inquiry.invoice == 2">增值税专用发票</div>
+				<div class="unchanged-info" ng-if="inquiry.invoice == 1">增值税普通发票</div>
+				<div class="unchanged-info" ng-if="inquiry.invoice == 0">不需要发票</div>
+			</div>
 			<div class="col-xs-6">
 				<span class="title">询价类型：</span>
 				<div class="content" ng-bind="::inquiry.inquirytype"></div>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -320,7 +320,7 @@
 					<label><input type="checkbox" class="selector select_all"
 						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label> <a ng-if="active=='todo'" href="javascript:void(0)"
 						class="btn btn-default btn-xs" ng-click="replyByBatch()" title="选中的单据按照客户需求的数量和交期默认回复">&nbsp;批量回复&nbsp;</a>
-						<div class="btn-group dropdown">
+						<!--<div class="btn-group dropdown">
   							<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
     							&nbsp;&nbsp;标记为&nbsp;&nbsp;<span class="caret"></span>&nbsp;
   							</button>
@@ -329,7 +329,7 @@
     							<li><a href="javascript:void(0)" ng-click="setDisplay('setUnRead')">未查看</a></li>
     							<li><a href="javascript:void(0)" ng-click="setDisplay('setTop')">置顶</a></li>
   							</ul>
-						</div>
+						</div>-->
 						<span class="text-muted">
 							&nbsp;&nbsp;<i class="fa fa-exclamation-triangle"></i> 批量回复是对选中的单据按照满足客户需求的数量和交期默认回复。
 						</span>

src/main/webapp/resources/tpl/index/sale/quotation.html

@@ -164,9 +164,9 @@
 			<a  ui-sref="sale.quotation.new" ui-sref-active="btn-info">
 				<i class="fa fa-plus-square-o"></i> 新增
 			</a>
-			<a ui-sref="sale.quotation.list" ui-sref-active="btn-info">
-				<i class="fa fa-list"></i> 列表
-			</a>
+			<!--<a ui-sref="sale.quotation.list" ui-sref-active="btn-info">-->
+				<!--<i class="fa fa-list"></i> 列表-->
+			<!--</a>-->
 		</div>
 		<span class="time-per fr"  ng-if="enteryStatus"><em>录入人：{{::item.quotation.user.userName}}</em><time>日期：{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span> -->
 	</div>

src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -186,12 +186,11 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm has-feedback">
-			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料规格：</label>
+			<label for="product" class="col-sm-2 control-label">物料规格：</label>
 			<div class="col-sm-10">
 				<div class="">
 					<input ng-model="item.product.spec" type="text" class="form-control input-dbfind" id="product"
-						   placeholder="物料规格" readonly="readonly" style="cursor: pointer;"
-						    ng-required="true">
+						   placeholder="物料规格" readonly="readonly" style="cursor: pointer;">
 				</div>
 			</div>
 		</div>
@@ -297,21 +296,21 @@
 		</div>
 		<div class="form-group form-group-sm" style="margin-top: 50px;">
 			<div class="col-sm-2"></div>
-			<div class="col-sm-2" ng-if="!item.$editing && item.quotation.status == 100">
-				<button class="public-btn01 btn btn-warning btn-sm" style="width: 100%;" ng-click="update()">修改</button>
-			</div>
-			<div class="col-sm-2" ng-if="item.$editing && item.quotation.status == 100">
-				<button class="public-btn01 btn btn-info btn-sm" style="width: 100%;" ng-click="cancel()">取消</button>
-			</div>
+			<!--<div class="col-sm-2" ng-if="!item.$editing && item.quotation.status == 100">-->
+				<!--<button class="public-btn01 btn btn-warning btn-sm" style="width: 100%;" ng-click="update()">修改</button>-->
+			<!--</div>-->
+			<!--<div class="col-sm-2" ng-if="item.$editing && item.quotation.status == 100">-->
+				<!--<button class="public-btn01 btn btn-info btn-sm" style="width: 100%;" ng-click="cancel()">取消</button>-->
+			<!--</div>-->
 			<div class="col-sm-2" ng-if="item.$editing">
 				<button class="public-btn01 btn btn-success btn-sm" style="width: 100%;" ng-disabled="quotationForm.$invalid" ng-click="save()">保存</button>
 			</div>
-			<div class="col-sm-2" ng-if="!item.$editing && item.quotation.status == 100">
+			<div class="col-sm-2" ng-if="item.quotation.status == 100">
 				<button class="public-btn01 btn btn-success btn-sm" style="width: 100%;" ng-click="submit()">提交</button>
 			</div>
 			<div class="col-sm-5 text-muted" style="line-height: 50px;">
-				<div ng-if="item.$editing"><i class="fa fa-info-circle"></i> 保存之后可以删除、修改、提交</div>
-				<div ng-if="!item.$editing && item.quotation.status == 100"><i class="fa fa-info-circle"></i> 提交之后客户才能接收到报价，提交之后无法修改、删除</div>
+				<div ng-if="item.$editing"><i class="fa fa-info-circle"></i> 修改之后保存、提交</div>
+				<div ng-if="!item.$editing && item.quotation.status == 100"><i class="fa fa-info-circle"></i> 提交之后客户才能接收到报价，提交之后无法修改</div>
 			</div>
 		</div>
 	</form>