指定对象询价功能更新

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

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

@@ -985,13 +985,7 @@ select.disabled {
                             </select>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class = "col-xs-12">
-                            <div class="tender-desc">备注：</div>
-                            <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark" style="width: 738px"/>
-                        </div>
-                    </div>
-                    <div class="row">
+                     <div class="row">
                     	 <div class="col-xs-12">
 	                        <div class="tender-desc">收货地址：</div>
 	                        <span required="required" style="line-height: 34px;">
@@ -1003,23 +997,12 @@ select.disabled {
 	                   		</span>
 	                    </div>
                     </div>
-                  <!--   <div class="row">
-                    	<div class="col-xs-12">
-	                        <div class="tender-desc">发票要求：</div>
-	                        <div class="input-select col-xs-3">
-	                            <input class="tender-input" type="radio" value="2" ng-model="inquiry.invoice"/>
-	                            <span>增值税专用发票</span>
-	                        </div>
-	                        <div class="input-select col-xs-3">
-	                            <input class="tender-input" type="radio" value="1" ng-model="inquiry.invoice" />
-	                            <span>普通发票</span>
-	                        </div>
-	                        <div class="input-select col-xs-3">
-	                            <input class="tender-input" type="radio" value="0" ng-model="inquiry.invoice" />
-	                            <span>不需要发票</span>
-	                        </div>
-	                    </div>
-                    </div> -->
+                    <div class="row">
+                        <div class = "col-xs-12">
+                            <div class="tender-desc">备注：</div>
+                            <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark" style="width: 738px"/>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col-xs-12">
                             <div class="tender-desc">上传附件：</div>

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

@@ -906,10 +906,30 @@ input[type="radio"], input[type="checkbox"] {
                             </div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class = "col-xs-12">
-                            <div class="tender-desc">备注：</div>
-                            <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark" style="width: 738px"/>
+                            <div class="row">
+                         <div class = "col-xs-4">
+                            <div class="tender-desc">交易币别：</div>
+                            <select class="select-menu" data-style="btn-primary" ng-model="inquiry.currency" ng-change="changeCurrency(inquiry)">
+                                <option value ="RMB">RMB</option>
+                                <option value ="USD">USD</option>
+                                <option value ="HKD">HKD</option>
+                                <option value ="EUR">EUR</option>
+                            </select>
+                        </div>
+                        <div class = "col-xs-4">
+                            <div class="tender-desc">是否含税：</div>
+                            <select class="select-menu" ng-model="inquiry.ifTax" ng-disabled="notRMB" ng-class="{'disabled':notRMB}">
+                                <option value ="1">是</option>
+                                <option value ="0">否</option>
+                            </select>
+                        </div>
+                        <div class="col-xs-4">
+                            <div class="tender-desc">发票要求：</div>
+                            <select class="select-menu" ng-model="inquiry.invoice" ng-disabled="notRMB" ng-class="{'disabled':notRMB}">
+                                <option value ="2">增值税专用发票</option>
+                                <option value ="1">普通发票</option>
+                                <option value ="0">不需要发票</option>
+                            </select>
                         </div>
                     </div>
                     <div class="row">
@@ -925,83 +945,98 @@ input[type="radio"], input[type="checkbox"] {
 	                    </div>
                     </div>
                     <div class="row">
-                    	<div class="col-xs-12">
-	                        <div class="tender-desc">发票要求：</div>
-	                        <div class="input-select col-xs-3">
-	                            <input class="tender-input" type="radio" value="2" ng-model="inquiry.invoice"/>
-	                            <span>增值税专用发票</span>
-	                        </div>
-	                        <div class="input-select col-xs-3">
-	                            <input class="tender-input" type="radio" value="1" ng-model="inquiry.invoice" />
-	                            <span>增值税普通发票</span>
-	                        </div>
-	                        <div class="input-select col-xs-3">
-	                            <input class="tender-input" type="radio" value="0" ng-model="inquiry.invoice" />
-	                            <span>不需要发票</span>
-	                        </div>
+	                    <div class = "col-xs-12">
+	                        <div class="tender-desc">备注：</div>
+	                        <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark" style="width: 738px"/>
 	                    </div>
                     </div>
-                   <!--  <div class="col-xs-12">
+                    <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"/>
-                            href="file/{{attach.id}}"
-                        </div>
-                        <div style="margin-left: 100px; color: #969595; font-size: 12px; ">
-                        	   提示：选择附件大小不超过5MB，可上传JPG,PNG,EXCEL,WORD,PDF
-                        </div>
-                        <div style="margin-left: 100px; color: #969595; font-size: 12px; ">
-                       		     如果需要上传多个文件，请尝试同时选取多个文件
                         </div>
-                    </div> -->
-                </div>
-
-                <div class="wrap">
-                    <div class="content">
-                        <div class="tender-list02">
-                            <!--产品信息-->
-                            <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-                                <span class="f14">产品明细</span>
-                            </div>
-                            <dl>
-                                <dt>
-                                    <span>序号</span>
-                                    <span class="wid01">物料编号</span>
-                                    <span class="wid01">名称</span>
-                                    <span class="wid02">规格</span>
-                                    <span>单位</span>
-                                    <span>币别</span>
-                                    <span>价格截止日期</span>
-                                    <span class="wid03">&nbsp;</span>
-                                </dt>
-                                <div class="scroll-y">
-                                    <dd ng-repeat="prod in inquiry.inquiryItems">
-                                        <span>{{$index + 1}}</span>
-                                        <span class="wid01"><input type="text"  ng-model="prod.prodCode"  readonly /></span>
-                                        <span class="wid01"><input type="text" ng-model="prod.prodTitle" readonly /></span>
-                                        <span class="wid02"><input type="text" ng-model="prod.spec" readonly/></span>
-                                        <span><input type="text" ng-model="prod.unit" readonly/></span>
-                                        <span><select class="wid01" data-style="btn-primary" ng-model="prod.currency" ng-init="prod.currency = 'RMB'" style="width: 56px;height: 34px;">
-					                            <option value ="RMB">RMB</option>
-					                            <option value ="USD">USD</option>
-					                            <option value ="HKD">HKD</option>
-					                            <option value ="EUR">EUR</option>
-					                       	  </select></span>
-                                        <span><input ng-model="prod.toDate" type="text" class="editable"  required
-													placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="prod.$toDateOpen"
-													min-date="getMinDate()"
-													current-text="今天" clear-text="清除" close-text="关闭"
-													datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-													ng-focus="openDatePicker($event, prod.$toDateOpen)" readonly="readonly"
-													ng-click="openDatePicker($event, prod.$toDateOpen, $index)"></span>
-                                        <span class="wid03"><a ng-click="del($index)"><i class="fa fa-close"></i></a></span>
-                                    </dd>
+                    </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 ng-if="inquiry.inquiryItems.length == 0" class="no-record">暂无产品信息！</div>
-                            </dl>
+                            </div>
                         </div>
                     </div>
                 </div>
+				<div class="wrap">
+					<div class="content">
+						<div class="tender-list02">
+							<!--产品信息-->
+							<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+								<span class="f14">询价明细</span> <a ng-click="uplodaByBatch()">批量导入</a>
+							</div>
+							<dl>
+								<dt>
+									<span>序号</span> <span class="wid01">型号</span> <span
+										class="wid01">名称</span> <span class="wid02">品牌</span> <span>单位</span>
+									<span>报价有效期</span> <span class="wid03">&nbsp;</span>
+								</dt>
+								<div class="scroll-y">
+									<dd ng-repeat="prod in inquiry.inquiryItems" id="li01">
+										<span>{{$index + 1}}</span> 
+										<span class="com01 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>
+										</span> 
+										<span class="com01 wid01"> 
+											<input type="text" style="width: 165px; text-align: left;" class="input01"
+											name="kindName" ng-model="prod.prodTitle" required placeholder="请输入或选择分类" spellcheck="false" autocomplete="off" />
+											<div class="input-group-addon" ng-click="selectKind(prod)">
+												<i class="fa fa-search" aria-hidden="true"></i>
+											</div>
+										</span> 
+										<span class="com01 wid02 text-center"> 
+											<input type="text" style="width: 93%; text-align: left;" ng-change="getSimilarBrands(prod.inbrand)" class="input01"
+											name="brandName" ng-model="prod.inbrand" required placeholder="请输入或选择品牌" spellcheck="false"
+											typeahead="prod.brandCn for prod in getSimilarBrands($viewValue)" autocomplete="off" typeahead-on-select="onAssociateBrandClick($item, prod)" />
+											<div class="input-group-addon" ng-click="selectBrand(prod)">
+												<i class="fa fa-search" aria-hidden="true"></i>
+											</div>
+										</span> 
+										<span class="text-center">
+											<input type="text" ng-model="prod.unit" placeholder="点击填入单位" required style="width: 105px; margin-left: 8px;" /></span>
+										<span class="left-dropdown-menu">
+										 	<input ng-model="prod.toDate" type="text" class="editable" required placeholder="选择时间" datepicker-popup="yyyy-MM-dd"
+											is-open="prod.$toDateOpen" min-date="getMinDate()" current-text="今天" clear-text="清除" close-text="关闭"
+											datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+											ng-focus="openDatePicker($event, prod.$toDateOpen)"
+											readonly="readonly"
+											ng-click="openDatePicker($event, prod.$toDateOpen, $index)"
+											style="margin-left: 20px;"></span> 
+										<span class="wid03">
+											<a ng-click="del($index)"><i class="fa fa-close"></i></a>
+										</span>
+									</dd>
+								</div>
+								<div ng-if="inquiry.inquiryItems.length == 0" class="no-record">暂无产品信息！</div>
+							</dl>
+						</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="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">