新增询价单修改

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

src/main/webapp/resources/css/add.css

@@ -2222,12 +2222,13 @@ option {
 }
 
 .pro-add-data02 table tbody tr td {
-    line-height: 50px;
+    /*line-height: 50px;*/
     height: 50px;
     padding: 0;
     font-size: 14px !important;
     border-bottom: #e8e8e8 1px solid;
     background: #fff;
+    vertical-align: middle;
 }
 
 .pro-add-data02 table tbody tr {

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

@@ -31,6 +31,7 @@
 
 .tender-content {
 	background-color: #fff;
+    display: inline-block;
 }
 
 .tender-content>div>div {
@@ -130,7 +131,7 @@ select.select-menu::-ms-expand {
 
 /* 日期选择器 */
 .purc-tender .date-picker {
-	padding-top: 10px;
+	/*padding-top: 10px;*/
 }
 
 .purc-tender .date-picker input {
@@ -407,7 +408,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-list02 dl span.wid01 {
-	width: 15%;
+	width: 18%;
 }
 
 .tender-list02 dl span.wid02 {
@@ -808,12 +809,32 @@ input[type="radio"], input[type="checkbox"] {
 .search-bg .form-group{
 	position: relative;
 }
+.title-div span{
+    font-weight: bold;
+    font-size: 14px;
+}
+    .add-vendor{
+        float: right;
+        font-weight: normal;
+        color: #5078cb;
+    }
+    .vend-info{
+        padding-bottom: 10px;
+        padding-top: 10px;
+    }
+.vend-info input{
+    font-size: 14px;
+    width: 200px;
+}
+.base-info{
+    box-shadow: none;
+}
 </style>
 <div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <div class="ng-scope">
     <form name="tenderForm">
         <div class="purc-tender">
-            <div class="com_title">服务>询价单<font>>新增询价单</font></div>
+            <!--<div class="com_title">服务>询价单<font>>新增询价单</font></div>-->
             <!--<div class="loading in" ng-class="{'in': loading}">
             <i></i>
             </div>-->
@@ -846,7 +867,7 @@ input[type="radio"], input[type="checkbox"] {
                         <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark"/>
                     </div>
                     <div class="col-xs-4">
-                        <span class="tender-desc f14" style="padding-top: 15px;">报价截止时间:</span>
+                        <span class="tender-desc f14">报价截止时间:</span>
                         <div class="input-group input-trigger date-picker">
                             <input type="text" ng-model="inquiry.endDate" required
                                    class="form-control" placeholder="点击选择截止日期" readonly="readonly"
@@ -884,7 +905,9 @@ input[type="radio"], input[type="checkbox"] {
                     <div class="content">
                         <div class="tender-list02">
                             <!--产品信息-->
-                            <div class="com_title01"><span>产品明细</span></div>
+                            <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+                                <span class="f14">产品明细</span>
+                            </div>
                             <dl>
                                 <dt>
                                     <span>序号</span>
@@ -926,22 +949,20 @@ input[type="radio"], input[type="checkbox"] {
                 <!-- <div class="com_title01" style="border-bottom: 1px solid #969595;"><a ng-click="add()" style="margin-left: 20px;"><i class="fa fa-plus"></i>新增产品明细</a></div>-->
                 <div  class="title-div" style="border-bottom: 1px dashed #327ebe;">
                     <span>供应商信息</span>
+                    <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">
+                        <i class="fa fa-plus-square"></i>添加供应商&nbsp;
+                    </a>
                 </div>
                 <div class="row vend-info">
-                    <div class="col-xs-12">
-                        <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">
-                            <i class="fa fa-plus-square"></i>添加供应商&nbsp;
-                        </a>
-                    </div>
                     <div class="col-xs-12" style="" ng-repeat="vendor in vendors">
-                        <div class="col-xs-2 control-label" style="width: 100px;">{{$index + 1}}</div>
+                        <div class="col-xs-1 control-label" style="width: 60px;">{{$index + 1}}</div>
                         <div class="col-xs-2" style="width: 100px;">供应商</div>
                         <div class="col-xs-3">
                             <input class="tender-input01" ng-model="vendor.enName" type="text" readonly>
                         </div>
-                        <div class="col-xs-1" style="width: 60px; margin-left: 20px; margin-right: -20px;">UU</div>
-                        <div class="col-xs-2">
-                            <input ng-model="vendor.enuu" type="text" style="width: 100%;" class="tender-input01" readonly>
+                        <div class="col-xs-1" style="width: 60px; margin-left: 20px;">UU</div>
+                        <div class="col-xs-3">
+                            <input ng-model="vendor.enuu" type="text" style="width: 200px;" class="tender-input01" readonly>
                         </div>
                         <div class="col-xs-1">
                             <a class="remove-vendor" href="javascript:void(0)" ng-click="removeVendor($index)" title="删除"><i class="fa fa-trash-o"></i></a>

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

@@ -168,9 +168,6 @@
 						<button type="button" class="btn btn-default btn-line"
 							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已结案</button>
 					</div>
-					<div class="btn-group btn-group-sm">
-						<a id="add" class="btn btn-default btn-line" ui-sref="purc.newOrder"><i class="fa fa-cart-plus" style="margin-left: 330px;"></i>采购单</a>
-					</div>
 				</div>
 			</div>
 			<div class="buy-cart col-xs-2">