Merge remote-tracking branch 'origin/feature-201821-wangcz' into feature-201821-wangcz

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -936,6 +936,13 @@
         <div class="publish-purchase">
             <div class="fl">
                 <p>单个发布</p>
+                <div class="form-block">
+                    <span><i>*</i>型号</span>
+                    <input type="text" class="form-group" ng-model="applyObj.code" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" ng-change="onCodeChange()" >
+                    <ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">
+                        <li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code)"></li>
+                    </ul>
+                </div>
                 <div class="form-block">
                     <span><i>*</i>品牌</span>
                     <input type="text" class="form-group" ng-class="{'error': !validObj.brand}" maxlength="20" ng-model="applyObj.brand" ng-blur="checkBrand()" ng-change="onBrandChange()">
@@ -947,13 +954,6 @@
                     <span><i>*</i>物料名称</span>
                     <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-class="{'error': !validObj.prodTitle}" ng-change="onProdTitleInput()" ng-blur="checkProdTitle()">
                 </div>
-                <div class="form-block">
-                    <span><i>*</i>型号</span>
-                    <input type="text" class="form-group" ng-model="applyObj.code" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" ng-change="onCodeChange()" >
-                    <ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">
-                        <li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code)"></li>
-                    </ul>
-                </div>
 
                <!-- <div class="form-block single-price">
                     <span>单价预算</span>

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -626,93 +626,93 @@
                             </div>-->
                         </div>
                         <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品（其中标准产品 <span ng-bind="result.success">200</span> 个，非标产品 <span ng-bind="result.failure">400</span> 个）<b class="success-hidden" ng-if="result.filter != 0">，下载 <a ng-click="downloadExcel()">导入失败产品</a></b></div>
-                        <div ng-show="$$productOn.tab == 'bathOn'">
-                            <table ng-table="relTableParams" class="public-tab table">
-                                <thead>
-                                <tr>
-                                    <th width="60">序号</th>
-                                    <th width="150" style="padding-left: 10px;">器件属性</th>
-                                    <th width="180">产品固有属性</th>
-                                    <th width="200">产品自定义属性</th>
-                                    <th width="100">梯度/pcs</th>
-                                    <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>
-                                    <th width="70">操作</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr ng-repeat="batchCommodity in pageParams.content">
-                                    <td class="check-input">
-                                        <!--<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
-                                        <span ng-bind="$index+1"></span>
-                                    </td>
-                                    <td style="padding-left: 10px;">
-                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>
-                                        <div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
-                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
-                                        <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>
-                                    </td>
-                                    <td>
-                                        <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->
-                                        <div>生产日期：&nbsp;<span ng-bind="batchCommodity.productDate"></span></div>
-                                        <!--<div>封装：&nbsp;<span ng-bind="batchCommodity.encapsulation || '无封装信息'"></span></div>-->
-                                        <div>包装：&nbsp;<span ng-bind="batchCommodity.packaging || '无包装信息'"></span></div>
-                                        <div>
-                                            <span class="label-commodity">交期：</span>
-                                            <span>
-                                                 <span ng-if="batchCommodity.selfMinDelivery == batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMaxDelivery"></span>
-                                                 <span ng-if="batchCommodity.selfMinDelivery != batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMinDelivery + '-' + batchCommodity.selfMaxDelivery"></span>
-                                            </span>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>
-                                        <div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
-                                        <div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>
-                                        <!--<div>倍数/价格：&nbsp;-->
-                                        <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
-                                        <!--<span ng-if="batchCommodity.usdMinPackPrice">-->
-                                        <!--/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>-->
-                                        <!--</span>-->
-                                        <!--<span ng-if="batchCommodity.rmbMinPackPrice">-->
-                                        <!--/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>-->
-                                        <!--</span>-->
+                        <!--<div ng-show="$$productOn.tab == 'bathOn'">-->
+                            <!--<table ng-table="relTableParams" class="public-tab table">-->
+                                <!--<thead>-->
+                                <!--<tr>-->
+                                    <!--<th width="60">序号</th>-->
+                                    <!--<th width="150" style="padding-left: 10px;">器件属性</th>-->
+                                    <!--<th width="180">产品固有属性</th>-->
+                                    <!--<th width="200">产品自定义属性</th>-->
+                                    <!--<th width="100">梯度/pcs</th>-->
+                                    <!--<th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>-->
+                                    <!--<th width="70">操作</th>-->
+                                <!--</tr>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr ng-repeat="batchCommodity in pageParams.content">-->
+                                    <!--<td class="check-input">-->
+                                        <!--&lt;!&ndash;<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>&ndash;&gt;-->
+                                        <!--<span ng-bind="$index+1"></span>-->
+                                    <!--</td>-->
+                                    <!--<td style="padding-left: 10px;">-->
+                                        <!--<div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>-->
+                                        <!--<div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>-->
+                                        <!--<div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>-->
+                                        <!--<div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>-->
+                                    <!--</td>-->
+                                    <!--<td>-->
+                                        <!--&lt;!&ndash;<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>&ndash;&gt;-->
+                                        <!--<div>生产日期：&nbsp;<span ng-bind="batchCommodity.productDate"></span></div>-->
+                                        <!--&lt;!&ndash;<div>封装：&nbsp;<span ng-bind="batchCommodity.encapsulation || '无封装信息'"></span></div>&ndash;&gt;-->
+                                        <!--<div>包装：&nbsp;<span ng-bind="batchCommodity.packaging || '无包装信息'"></span></div>-->
+                                        <!--<div>-->
+                                            <!--<span class="label-commodity">交期：</span>-->
+                                            <!--<span>-->
+                                                 <!--<span ng-if="batchCommodity.selfMinDelivery == batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMaxDelivery"></span>-->
+                                                 <!--<span ng-if="batchCommodity.selfMinDelivery != batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMinDelivery + '-' + batchCommodity.selfMaxDelivery"></span>-->
+                                            <!--</span>-->
                                         <!--</div>-->
-                                        <!--<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>-->
-                                        <div>
-                                            <span ng-bind="batchCommodity.breakUp ? '可拆卖' : '不可拆卖'"></span>
-                                            <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
-                                        </div>
-                                    </td>
-                                    <td style="vertical-align: top !important;">
-                                        <div ng-repeat="price in batchCommodity.prices">{{price.start + '+'}}</div>
-                                    </td>
-                                    <td style="vertical-align: top !important;">
-                                        <div ng-repeat="price in batchCommodity.prices">{{batchCommodity.currency=='RMB' ? price.rMBPrice : price.uSDPrice}}</div>
-                                    </td>
-                                    <td>
-                                        <!--<a ng-click="editBatch(batchCommodity)">编辑</a><br/>-->
-                                        <!--<a ng-click="deleteBatch(batchCommodity.id)">删除</a>-->
-                                        <a name = 'delete-material' ng-click="showDelete(batchCommodity)">删除</a>
-                                    </td>
-                                </tr>
-                                <tr class="record-number" ng-if="pageParams.content.length > 0">
-                                    <td colspan="7">
-                                        <div>显示 <i ng-bind="pageParams.start"></i>- <i ng-bind="pageParams.end">10</i> 个，共：<i style="color: #5078cb;" ng-bind="pageParams.totalElements"></i> 个</div>
-                                    </td>
-                                </tr>
-                                </tbody>
-                                <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
-                                <tr class="height200">
-                                    <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>
-                        <div>
-                            <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>
-                            <b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>
-                        </div>
+                                    <!--</td>-->
+                                    <!--<td>-->
+                                        <!--<div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>-->
+                                        <!--<div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>-->
+                                        <!--<div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>-->
+                                        <!--&lt;!&ndash;<div>倍数/价格：&nbsp;&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<span ng-bind="batchCommodity.minBuyQty | number"></span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<span ng-if="batchCommodity.usdMinPackPrice">&ndash;&gt;-->
+                                        <!--&lt;!&ndash;/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<span ng-if="batchCommodity.rmbMinPackPrice">&ndash;&gt;-->
+                                        <!--&lt;!&ndash;/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>&ndash;&gt;-->
+                                        <!--<div>-->
+                                            <!--<span ng-bind="batchCommodity.breakUp ? '可拆卖' : '不可拆卖'"></span>-->
+                                            <!--&lt;!&ndash;<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>&ndash;&gt;-->
+                                        <!--</div>-->
+                                    <!--</td>-->
+                                    <!--<td style="vertical-align: top !important;">-->
+                                        <!--<div ng-repeat="price in batchCommodity.prices">{{price.start + '+'}}</div>-->
+                                    <!--</td>-->
+                                    <!--<td style="vertical-align: top !important;">-->
+                                        <!--<div ng-repeat="price in batchCommodity.prices">{{batchCommodity.currency=='RMB' ? price.rMBPrice : price.uSDPrice}}</div>-->
+                                    <!--</td>-->
+                                    <!--<td>-->
+                                        <!--&lt;!&ndash;<a ng-click="editBatch(batchCommodity)">编辑</a><br/>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<a ng-click="deleteBatch(batchCommodity.id)">删除</a>&ndash;&gt;-->
+                                        <!--<a name = 'delete-material' ng-click="showDelete(batchCommodity)">删除</a>-->
+                                    <!--</td>-->
+                                <!--</tr>-->
+                                <!--<tr class="record-number" ng-if="pageParams.content.length > 0">-->
+                                    <!--<td colspan="7">-->
+                                        <!--<div>显示 <i ng-bind="pageParams.start"></i>- <i ng-bind="pageParams.end">10</i> 个，共：<i style="color: #5078cb;" ng-bind="pageParams.totalElements"></i> 个</div>-->
+                                    <!--</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                                <!--<tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">-->
+                                <!--<tr class="height200">-->
+                                    <!--<td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                        <!--<div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>-->
+                        <!--<div>-->
+                            <!--<span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>-->
+                            <!--<b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>-->
+                        <!--</div>-->
                     </div>
                 </div>
                 <!--<div class="load_next">-->