Browse Source

报价增加交货周期字段

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1072 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
6e48c133cf

+ 2 - 2
src/main/webapp/resources/js/index/app.js

@@ -1057,7 +1057,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 		
 		$scope.isValid = function(item, withSteps) {
-			var bool = item.replies && item.replies[0].price > 0;
+			var bool = item.leadtime && item.replies && item.replies[0].price > 0;
 			if(!withSteps || !bool)
 				return bool;
 			angular.forEach(item.replies, function(r, i){
@@ -1152,7 +1152,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 		
 		$scope.isValid = function(item, withSteps) {
-			var bool = item.replies && item.replies[0].price > 0;
+			var bool = item.leadtime && item.replies && item.replies[0].price > 0;
 			if(!withSteps || !bool)
 				return bool;
 			angular.forEach(item.replies, function(r, i){

+ 7 - 0
src/main/webapp/resources/tpl/index/account/index.html

@@ -1,3 +1,10 @@
+<style>
+.line-charts >ul>li {
+	height: 400px;
+	position: relative;
+}
+</style>
+
 <!-- 交易信息 Start -->
 <div class="line-charts data-wrap block" ng-controller="SaleStatCtrl">
 	<ul class="list-unstyled" ng-if="charts">

+ 5 - 0
src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -288,6 +288,11 @@
 						<input type="text" class="form-control input-xs"
 							ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
 					</div>
+					<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">
+						<input type="number" class="form-control input-xs"
+							ng-model="inquiryItem.leadtime" placeholder="交货周期" style="display: inline-block;width: 180px;">
+						<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
+					</div>
 				</td>
 				<td class="text-center">
 					<div ng-show="!inquiryItem.$editing">

+ 13 - 0
src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -83,6 +83,19 @@
 								ng-bind="::inquiryItem.product.code"></div>
 							<div ng-bind="::inquiryItem.product.title"></div>
 							<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>
+							<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
+								<input type="text" class="form-control input-xs"
+									ng-model="inquiryItem.brand" placeholder="物料品牌">
+							</div>
+							<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
+								<input type="text" class="form-control input-xs"
+									ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
+							</div>
+							<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">
+								<input type="number" class="form-control input-xs"
+									ng-model="inquiryItem.leadtime" placeholder="交货周期(天数)" style="display: inline-block;width: 180px;">
+								<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
+							</div>
 						</td>
 						<td class="text-center">
 							<div ng-show="!inquiryItem.$editing">