主动报价新增 详情演示修改。企业圈修改。

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

src/main/webapp/resources/css/index.css

@@ -2918,6 +2918,8 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	display: inline-block;
 	text-align: center;
 	padding: 0;
+	color: #fff;
+	background: #5078cb;
 }
 .public-btn01:disabled {
 	background: #999 !important;

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -145,7 +145,7 @@
 	margin-bottom: 10px;
 }
 .view-slide-in .group-container .btn-group {
-	width: 160px;
+	width: 190px;
 	border: none;
 	height: 45px;
 }
@@ -280,7 +280,7 @@
 	margin: 0;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;">
+<div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -305,7 +305,7 @@
 				</div>
 			</td>
 			<td width="100" class="text-center">
-				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">合作伙伴</a>
+				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">立即添加</a>
 				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
 				<span class="btn01 btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
 				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加</span>

src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html

@@ -13,7 +13,7 @@
 				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myRequest"
-						ng-class="{'btn-info':status=='partner'}" >新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+						ng-class="{'btn-info':status=='partner'}" style="width: 150px;">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
 				</div>
 			</div>
 		</div>

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

@@ -135,18 +135,40 @@
 .btn-group-justified .btn:active{
 	background: none;
 }
+.pub-com_head  .p-right a.btn-info{
+	background: none;
+	color: #999;
+	cursor: default;
+}
+.pub-com_head  .p-right a.btn-info:hover{
+	text-decoration: none;
+	color: #999;
+}
+.pub-com_head  .time-per{
+		margin-right: 20px;
+		color: #959595 !important;
+		float: right;
+	}
+.pub-com_head  .time-per em,.pub-com_head  .time-per time{
+	font-style : normal;
+}
+.pub-com_head span.fr em {
+	margin-right: 50px;
+	font-size: 14px;
+}
 </style>
 <div class="block">
 	<div class="pub-com_head">
 		<span>主动报价单</span>
 		<div class="p-right">
-			<a  ui-sref="sale.quotation.new">
+			<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">
+			<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>
 	<!--<div class="condition block">
 		<div class="row">

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

@@ -1,6 +1,7 @@
 <style>
 .new {
-	padding: 0px 20px 20px 20px;
+	padding: 0px 40px 20px 20px;
+	margin-top: 20px;
 }
 
 .new label {
@@ -49,27 +50,21 @@
 
 .status {
 	position: absolute;
-  	height: 50px;
-  	min-width: 100px;
-  	/* border-radius: 50px; */
-  	border: dashed 2px #999;
-  	border-radius: 13px;
-  	padding-top: 7px;
-  	padding-left: 5px;
-  	text-align: center;
-  	right: 83px;
-  	top: 10px;
-  	background-color: #FFFFFF;
-  	color: #999;
-  	word-spacing: 8px;
-  	letter-spacing: 5px;
-  	-webkit-transform: rotate(15deg);
-  	-moz-transform: rotate(15deg);
-  	-o-transform: rotate(15deg);
-  	transform: rotate(14deg);
-  	font-size: 20px;
-  	z-index: 9;
-  	font-family: '楷体', '微软雅黑';
+	top: -10px;
+	right: 5px;
+	background-color: #fff;
+	border: 1px solid;
+	padding: 3px 14px;
+	font-size: 16px;
+	font-family: "LiShu";
+	border-radius: 10px;
+	-moz-transform: rotate(-10deg);
+	-webkit-transform: rotate(-10deg);
+	-o-transform: rotate(-10deg);
+	transform: rotate(-10deg);
+	border-radius: 10px;
+	opacity: 0.7;
+	white-space: nowrap;
 }
 .num-ctrl{
 	width: 60px;
@@ -84,7 +79,7 @@
 	padding-top: 11px;
 }
 .form-horizontal .control-label{
-	text-align: left;
+	text-align: right;
 	padding-left: 25px;
 }
 .form-horizontal .form-control{
@@ -100,6 +95,18 @@
 	font-size: 14px;
 	color: #fff;
 }
+.customer-input{
+	border: #bfbfbf 1px solid !important;
+	height: 34px;
+	background: #fff;
+	font-size: 14px;
+	border-radius: 5px;
+	width: 100%;
+	display: inline-block;
+	color: #323232;
+	line-height: 34px;
+	padding-left: 10px;
+}
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
@@ -116,15 +123,15 @@
 			<div ng-if="item.quotation.status == 101 && item.agreed == 0" class="status">报价未采纳</div>
 		</div>
 		<div class="form-group form-group-sm" ng-if="item.quotation.code">
-			<label class="col-sm-2 text-right">单据时间</label>
-			<div class="col-sm-2">
-				<div class="">
+			<label class="col-sm-2 text-right">单据时间：</label>
+			<div class="col-sm-4">
+				<div class="" style="font-size: 14px;">
 					{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}
 				</div>
 			</div>
 			<label class="col-sm-2 text-right">录入人：</label>
 			<div class="col-sm-2">
-				<div class="">
+				<div class="" style="font-size: 14px;">
 					{{::item.quotation.user.userName}}
 				</div>
 			</div>
@@ -146,21 +153,16 @@
 						placeholder="点击选择客户" style="cursor: pointer;" ng-click="dbfindCust()" ng-required="true">
 					<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
 				</div>
-				<div ng-if="item.quotation.cust.enAddress" class="text-muted">
+				<!--<div ng-if="item.quotation.cust.enAddress" class="text-muted">
 					<i class="fa fa-map-marker fa-fw"></i> {{item.quotation.cust.enAddress}}
-				</div>
+				</div>-->
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
 			<label for="customerUser" class="col-sm-2 control-label">客户联系人：</label>
 			<div class="col-sm-4">
 				<div class="">
-					<input ng-model="item.quotation.custUser.userName" type="text" class="form-control input-dbfind" id="custUser" 
-						placeholder="点击选择客户联系人" readonly="readonly" style="cursor: pointer;">
-					<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
-				</div>
-				<div ng-if="item.quotation.custUser" class="text-muted">
-					<i class="fa fa-phone fa-fw icon-left"></i>{{item.quotation.custUser.userTel}}
+					<input ng-model="item.quotation.custUser.userName" type="text" class="form-control input-dbfind" id="custUser"
+						   placeholder="点击选择客户联系人" readonly="readonly" style="cursor: pointer;display: none">
+					<span class="customer-input">{{item.quotation.custUser.userName}} {{item.quotation.custUser.userTel}}</span>
 				</div>
 			</div>
 		</div>
@@ -173,74 +175,69 @@
 						ng-click="dbfindCustProd()" ng-required="true">
 					<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
 				</div>
-				<div ng-if="item.product.title" class="text-muted">
-					名称：{{item.product.title}}
-				</div>
-				<div ng-if="item.product.spec" class="text-muted">
-					规格：{{item.product.spec}}
-				</div>
-				<div ng-if="item.product.unit" class="text-muted">
-					单位：{{item.product.unit}}
+			</div>
+			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料名称：</label>
+			<div class="col-sm-4">
+				<div class="">
+					<input ng-model="item.product.title" type="text" class="form-control input-dbfind" id="product"
+						   placeholder="点击选择物料" readonly="readonly" style="cursor: pointer;"
+						   ng-required="true">
 				</div>
 			</div>
 		</div>
-		<div class="form-group form-group-sm">
-			<label for="leadtime" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>交货周期(天)：</label>
-			<div class="col-sm-3">
-				<input ng-model="item.leadtime" type="number" class="form-control" id="leadtime" 
-					placeholder="只可以为整数" ng-readonly="!item.$editing" ng-required="true">
+		<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>
+			<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">
+				</div>
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="brand" class="col-sm-2 control-label">物料品牌：</label>
-			<div class="col-sm-3">
-				<input ng-model="item.brand" type="text" class="form-control" id="brand" 
-				placeholder="物料品牌" ng-readonly="!item.$editing">
+			<label for="brand" class="col-sm-2 control-label">品牌：</label>
+			<div class="col-sm-4">
+				<input ng-model="item.brand" type="text" class="form-control" id="brand"
+					   placeholder="品牌" ng-readonly="!item.$editing">
 			</div>
-			<label for="vendorprodcode" class="col-sm-2 control-label">供应商物料编号：</label>
-			<div class="col-sm-3">
-				<input ng-model="item.vendorprodcode" type="text" class="form-control" id="vendorprodcode" 
-					placeholder="供应商物料编号" ng-readonly="!item.$editing">
+			<label class="col-sm-2 control-label">单位：</label>
+			<div class="col-sm-4">
+				<input ng-model="item.product.unit" type="text" class="form-control input-dbfind" id="product"
+					   placeholder="单位" readonly="readonly" style="cursor: pointer;"
+					  ng-required="true">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
 			<label for="minPackQty" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>最小包装量：</label>
-			<div class="col-sm-3">
-				<input ng-model="item.minPackQty" type="number" class="form-control" id="minPackQty" 
-					placeholder="最小包装量" ng-readonly="!item.$editing" ng-required="true">
+			<div class="col-sm-4">
+				<input ng-model="item.minPackQty" type="number" class="form-control" id="minPackQty"
+					   placeholder="最小包装量" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 			<label for="minOrderQty" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>最小订购量：</label>
-			<div class="col-sm-3">
-				<input ng-model="item.minOrderQty" type="number" class="form-control" id="minOrderQty" 
-					placeholder="最小订购量" ng-readonly="!item.$editing" ng-required="true">
+			<div class="col-sm-4">
+				<input ng-model="item.minOrderQty" type="number" class="form-control" id="minOrderQty"
+					   placeholder="最小订购量" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="date" class="col-sm-2 control-label">录入日期：</label>
-			<div class="col-sm-3">
-				<div class="input-group">
-					<input ng-model="item.quotation.date" type="text" class="form-control" id="date" placeholder="录入日期"
-						readonly="readonly" datepicker-popup="yyyy-MM-dd">
-					<span class="input-group-btn">
-						<button disabled="disabled" type="button" class="btn btn-default btn-sm"
-							ng-click="openDatePicker($event, inquiryItem, '$fromOpened')">
-							<i class="fa fa-calendar"></i>
-						</button>
-					</span>
-				</div>
+			<label for="leadtime" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>交货周期(天)：</label>
+			<div class="col-sm-4">
+				<input ng-model="item.leadtime" type="number" class="form-control" id="leadtime" 
+					placeholder="只可以为整数" ng-readonly="!item.$editing" ng-required="true">
 			</div>
-			<label for="endDate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>价格有效日期：</label>
-			<div class="col-sm-3">
+			<label class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>价格有效日期：</label>
+			<div class="col-sm-4">
 				<div class="input-group">
-					<input ng-model="item.quotation.endDate" type="text" class="form-control" id="endDate" 
-						placeholder="点击右侧图标选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
-						min-date="getMinDate()" ng-required="true"
-						current-text="今天" clear-text="清除" close-text="关闭"
-						datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						ng-focus="openDatePicker($event, item.$endDateOpen)" ng-readonly="!item.$editing">
+					<input ng-model="item.quotation.endDate" type="text" class="form-control" id="endDate"
+						   placeholder="点击右侧图标选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
+						   min-date="getMinDate()" ng-required="true"
+						   current-text="今天" clear-text="清除" close-text="关闭"
+						   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+						   ng-focus="openDatePicker($event, item.$endDateOpen)" ng-readonly="!item.$editing">
 					<span class="input-group-btn">
 						<button type="button" class="btn btn-default btn-sm" ng-disabled="!item.$editing"
-							ng-click="openDatePicker($event, item.$endDateOpen)">
+								ng-click="openDatePicker($event, item.$endDateOpen)">
 							<i class="fa fa-calendar"></i>
 						</button>
 					</span>
@@ -249,7 +246,7 @@
 		</div>
 		<div class="form-group form-group-sm">
 			<label for="currency" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>币别：</label>
-			<div class="col-sm-3">
+			<div class="col-sm-4">
 				<select ng-model="item.quotation.currency" class="form-control" id="currency" ng-readonly="!item.$editing">
 					<option value="RMB">RMB 人民币</option>
 					<option value="USD">USD 美元</option>
@@ -258,14 +255,14 @@
 				</select>
 			</div>
 			<label for="taxrate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>税率：</label>
-			<div class="col-sm-3">
+			<div class="col-sm-4">
 				<input ng-model="item.quotation.taxrate" type="text" class="form-control" id="taxrate" 
 					placeholder="税率" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
 			<label for="remark" class="col-sm-2 control-label">备注：</label>
-			<div class="col-sm-5">
+			<div class="col-sm-10">
 				<textarea ng-model="item.quotation.remark" class="form-control" rows="3" cols="3" id="remark" 
 					placeholder="备注" ng-readonly="!item.$editing">
 				</textarea>
@@ -298,24 +295,21 @@
 				<a ng-if="$last && item.$editing" href="javascript:void(0)" ng-click="addPrice()" class="blue"><i class="fa fa-plus-square-o"></i> 增加</a>
 			</label>
 		</div>
-		<div class="form-group form-group-sm">
+		<div class="form-group form-group-sm" style="margin-top: 50px;">
 			<div class="col-sm-2"></div>
-			<div class="col-sm-3" ng-if="!item.$editing && item.quotation.status == 100">
-				<button class="btn btn-warning btn-sm" style="width: 100%;" ng-click="update()">修改</button>
+			<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-3" ng-if="item.$editing && item.quotation.status == 100">
-				<button class="btn btn-info btn-sm" style="width: 100%;" ng-click="cancel()">取消</button>
+			<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-3" ng-if="!item.$editing && item.quotation.status == 100">
-				<button class="btn btn-success btn-sm" style="width: 100%;" ng-click="submit()">提交</button>
+			<div class="col-sm-2" ng-if="!item.$editing && item.quotation.status == 100">
+				<button class="public-btn01 btn btn-success btn-sm" style="width: 100%;" ng-click="submit()">提交</button>
 			</div>
-		</div>
-		<div class="form-group form-group-sm">
-			<div class="col-sm-2"></div>
-			<div class="col-sm-6 text-muted">
+			<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>