新增询价单及企业圈修改。

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

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

@@ -3245,7 +3245,6 @@ input::-webkit-clear{display:none;}
 .tab-first .row a.active{
 	background: #fff;
 	color: #d32526;
-	border: none;
 }
 #myquest-public .group-container .btn-group .btn,#myrequest-btn .btn-group .btn{
 	width: 80px;
@@ -3255,6 +3254,14 @@ input::-webkit-clear{display:none;}
 	padding: 0;
 	margin-left: 26%;
 }
+#myquest-public .group-container .btn-group .style-btn, #myrequest-btn .btn-group .style-btn{
+	width: 130px;
+	text-align: center;
+	height: 45px;
+	line-height: 45px;
+	padding: 0;
+	margin-left: 20%;
+}
 #myquest-public .group-container .btn-group .btn.btn-info,#myrequest-btn .btn-group .btn.btn-info{
 	border-bottom: #d32526 2px solid !important;
 	border-radius: 0 !important;
@@ -3270,3 +3277,10 @@ input::-webkit-clear{display:none;}
 .tender-list02 .comment-oder:hover,.tender-list dl dd:hover{
 	border: #d32526 2px solid !important;
 }
+/*2017-05-10*/
+.unPrinted{
+	color: #5078cb !important;
+}
+.left-nav>ul>li:hover a{
+	background: #999;
+}

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

@@ -3053,18 +3053,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			});
 		}
 		//增加商品
-		$scope.add = function(index) {
-			if($scope.inquiry.inquiryItems[index].prodCode == null) {
-				toaster.pop('info', '提示', '请先填写商品信息');
-			}else {
+		$scope.add = function() {
 				$scope.inquiry.inquiryItems.push(
-						{ 	prodCode: null, 
-							prodTitle: null, 
-							unit: null, 
+						{ 	prodCode: null,
+							prodTitle: null,
+							unit: null,
 							ibrand: null,
 							currency: 'RMB',
 							toDate: null});
-			}
 		};
         //删除商品
         $scope.del = function(index) {

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

@@ -298,8 +298,8 @@
 							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">未处理</button>
 					</div>
 					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">未标注</button>
+						<button type="button" class="style-btn btn btn-default btn-line"
+							ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">未标注（合作关系）</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"

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

@@ -430,7 +430,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-list02  .scroll-y dd input {
-	width: 100%;
+	/*width: 100%;*/
 	height: 34px;
 	border: none;
 	font-size: 14px;
@@ -861,6 +861,48 @@ input[type="radio"], input[type="checkbox"] {
 .tender-content .input-select{
     padding: 0;
 }
+.tender-list02  .scroll-y dd input{
+    border: #ccc 1px solid;
+}
+#li01 ul {
+    width: 200px;
+}
+
+#li01 ul li {
+    height: 30px;
+    line-height: 30px;
+    padding: 0;
+}
+
+#li01 ul li a {
+    display: inline-block;
+    height: 30px;
+    width: 100%;
+}
+#li01 .input-group-addon {
+    width: 30px;
+    line-height: 34px;
+    height: 34px;
+    padding: 0;
+    display: inline-block;
+    position: relative;
+    top: -50px;
+    right: -7px;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    left: 40%;
+}
+    .title-div a{
+        float: right;
+        color: #5078cb;
+        font-weight :normal;
+        margin-right: 30px;
+    }
+.well{
+    background-color: #fff;
+    border-radius: 0;
+    padding: 10px;
+}
 </style>
 <div class="ng-scope">
     <form name="tenderForm">
@@ -933,7 +975,7 @@ input[type="radio"], input[type="checkbox"] {
 	                        </div>
 	                        <div class="input-select col-xs-3">
 	                            <input class="tender-input" type="radio" value="1" ng-model="inquiry.invoice" />
-	                            <span>增值税普通发票</span>
+	                            <span>普通发票</span>
 	                        </div>
 	                        <div class="input-select col-xs-3">
 	                            <input class="tender-input" type="radio" value="0" ng-model="inquiry.invoice" />
@@ -941,35 +983,40 @@ input[type="radio"], input[type="checkbox"] {
 	                        </div>
 	                    </div>
                     </div>
-                    <div class="col-xs-12">
-                        <div class="tender-desc">上传附件：</div>
-                        <div class="fileInputContainer">
-                            <input class="fileInput" type="file" ng-file-select name="file" ng-model="myFiles"/>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <div class="tender-desc">上传附件：</div>
+                            <div class="fileInputContainer">
+                                <input class="fileInput" type="file" ng-file-select name="file" ng-model="myFiles"/>
+                            </div>
+                            <div style="margin-left: 100px; color: #969595; font-size: 12px; ">
+                                   提示：选择附件大小不超过5MB，可上传JPG,PNG,EXCEL,WORD,PDF
+                            </div>
                         </div>
-                        <div style="margin-left: 100px; color: #969595; font-size: 12px; ">
-                        	   提示：选择附件大小不超过5MB，可上传JPG,PNG,EXCEL,WORD,PDF
+                    </div>
+                    <div class="row" style="margin-bottom: 0;">
+                        <div class="col-xs-12">
+                            <div ng-show="previewShow">
+                                <div class="fl" style="margin-left: 100px;">
+                                <div class="well margin-b-0">
+                                        <div ng-show="previewShow">
+                                            <img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
+                                            <div>
+                                                &nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+                                            </div>
+                                        </div>
+                                        <div ng-show="pdfShow">
+                                            <img ng-show="pdfShow" src="static/img/all/pdf.jpg" alt="PDF文件" width="30px" height="40px">
+                                            &nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+                                        </div>
+                                        <div ng-show="noneFileShow">
+                                            <span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
-                    <div ng-show="previewShow">
-	                	<div class="fl">&nbsp;</div>
-	                    <div class="fr">
-	                    <div class="well margin-b-0" >
-					      		<div ng-show="previewShow">
-					      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
-					      			<div>
-						      			&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
-						      		</div>
-					      		</div>
-					      		<div ng-show="pdfShow">
-					      			<img ng-show="pdfShow" src="static/img/all/pdf.jpg" alt="PDF文件" width="30px" height="40px">
-						      		&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
-					      		</div>
-					      		<div ng-show="noneFileShow">
-					      			<span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>
-					      		</div>
-					      	</div>
-	                    </div>
-	                </div>
                 </div>
 
                 <div class="wrap">
@@ -987,11 +1034,11 @@ input[type="radio"], input[type="checkbox"] {
                                     <span class="wid02">品牌</span>
                                     <span>单位</span>
                                     <span>币别</span>
-                                    <span>价格有效日期</span>
+                                    <span>报价有效期</span>
                                     <span class="wid03">&nbsp;</span>
                                 </dt>
                                 <div class="scroll-y">
-                                    <dd ng-repeat="prod in inquiry.inquiryItems">
+                                    <dd ng-repeat="prod in inquiry.inquiryItems" id="li01">
                                         <span>{{$index + 1}}</span>
                                         <span class="wid01 text-center">
                                         	<input type="text" name="code" ng-model="prod.prodCode" ng-change="getSimilarCodes(prod.prodCode)" ng-focus="onFocus('code')" placeholder="请输入标准原厂型号" typeahead="prod.code for prod in getSimilarCodes($viewValue)" autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prod)" spellcheck = "false" required>
@@ -1008,8 +1055,8 @@ input[type="radio"], input[type="checkbox"] {
                                                  <i class="fa fa-search" aria-hidden="true"></i>
                                              </div>
 										</span>
-                                        <span class="text-center"><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required/></span>
-                                        <span><select class="wid01" data-style="btn-primary" ng-model="prod.currency" ng-init="prod.currency = 'RMB'" style="width: 56px;height: 34px;">
+                                        <span class="text-center"><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required style="width: 105px; margin-left: 10px;"/></span>
+                                        <span><select class="wid01" data-style="btn-primary" ng-model="prod.currency" ng-init="prod.currency = 'RMB'" style="width: 80px;height: 34px; margin-left: 10px; position: relative; top: 1px; border: #ccc 1px solid;">
 					                            <option value ="RMB">RMB</option>
 					                            <option value ="USD">USD</option>
 					                            <option value ="HKD">HKD</option>
@@ -1030,7 +1077,7 @@ input[type="radio"], input[type="checkbox"] {
                         </div>
                     </div>
                 </div>
-                <!-- <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="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)" ng-if="inquiry.isOpen == 0">