ouxq 8 лет назад
Родитель
Сommit
b28e460bc3
1 измененных файлов с 119 добавлено и 35 удалено
  1. 119 35
      src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

+ 119 - 35
src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -151,19 +151,27 @@
         background: #dff3fd;
         background: #dff3fd;
     }
     }
     .public-tab.table>tbody>tr>td{
     .public-tab.table>tbody>tr>td{
-        border-bottom: #cfcfcf 1px dashed;
+        /*border-bottom: #cfcfcf 1px dashed;*/
         white-space: normal;
         white-space: normal;
         background: #f0fafe;
         background: #f0fafe;
     }
     }
+    .public-tab.table>tbody>tr td{
+        border-top: #cfcfcf 1px dashed;
+        border-bottom: none;
+    }
+    .public-tab.table>tbody>tr:first-child td{
+        border-top: none;
+    }
     .public-tab.table>thead>tr>th:first-child,.public-tab.table>thead>tr>th:last-child,.public-tab.table>tbody>tr>td:first-child,.public-tab.table>tbody>tr>td:last-child{
     .public-tab.table>thead>tr>th:first-child,.public-tab.table>thead>tr>th:last-child,.public-tab.table>tbody>tr>td:first-child,.public-tab.table>tbody>tr>td:last-child{
         text-align: center;
         text-align: center;
     }
     }
     .public-tab.table>tbody>tr>td div{
     .public-tab.table>tbody>tr>td div{
         min-height: inherit;
         min-height: inherit;
         line-height: 25px;
         line-height: 25px;
+        margin-bottom: 1px;
     }
     }
     .public-tab.table{
     .public-tab.table{
-        margin-top: 10px;
+        margin-top: 15px;
     }
     }
     .load_next .add_category .upload i{
     .load_next .add_category .upload i{
         top: 6px;
         top: 6px;
@@ -172,7 +180,7 @@
         color: #333 !important;
         color: #333 !important;
     }
     }
     .upload-content{
     .upload-content{
-        width: 535px !important;
+        width: 570px !important;
         float: left;
         float: left;
     }
     }
     .user_right .upload .check{
     .user_right .upload .check{
@@ -229,6 +237,62 @@
     label.sellType:hover {
     label.sellType:hover {
         cursor: pointer;
         cursor: pointer;
     }
     }
+    .open-icon{
+        display: inline-block;
+        width: 22px;
+        height: 12px;
+        background: url("static/img/icon/open.png") no-repeat center;
+        margin-top: 37px;
+        transform: rotate(-180deg);
+        float: right;
+        vertical-align: middle;
+        cursor: pointer;
+    }
+    .open-icon.active{
+        transform: rotate(0);
+    }
+    .device .load_next.border-none,.device .load_next p.border-none{
+        border-bottom: none;
+    }
+    .public-tab.table tr td div span.switch{
+        width:39px;
+        height: 14px;
+        display: inline-block;
+    }
+    .public-tab.table tr td div span.switch button{
+        border: none;
+        position: relative;
+        top: 2px;
+        left: 5px;
+        width: 39px;
+        height: 14px;
+        background: url(static/img/icon/check-off.png) no-repeat center;
+    }
+    .public-tab.table tr td div span.switch button.active{
+        background: url("static/img/icon/check-ok.png") no-repeat center;
+    }
+    .public-tab.table tr td div.text-more em{
+        margin: 0 !important;
+    }
+    .public-tab.table>tbody>tr.record-number{
+        height: 30px;
+    }
+    .public-tab.table>tbody>tr.record-number td{
+        border: none;
+        background: none;
+        padding: 0;
+        border-bottom: #cfcfcf 1px dashed;
+        border-top: #cfcfcf 1px solid;
+    }
+    .public-tab.table>tbody>tr.record-number td div{
+        text-align: right;
+        padding-right: 25px;
+        font-size: 12px;
+    }
+    .public-tab.table>tbody>tr>td{
+        padding-top: 15px;
+        padding-bottom: 15px;
+    }
 </style>
 </style>
 <div class="user_right fr">
 <div class="user_right fr">
     <!--货品管理-->
     <!--货品管理-->
@@ -240,16 +304,20 @@
         </div>
         </div>
         <div class="wanted_list01">
         <div class="wanted_list01">
             <div class="tab" ng-if="$$productOn.leadIn == 'bathOn'" ng-class="{'active': leadIn == 'bathOn'}" ng-controller="batchPutOnCtrl">
             <div class="tab" ng-if="$$productOn.leadIn == 'bathOn'" ng-class="{'active': leadIn == 'bathOn'}" ng-controller="batchPutOnCtrl">
-                <div class="load_next">
-                    <p>第一步,下载Excel模板<i class="icon-angle-up"></i></p>
-                    <div class="add_category">
+                <div class="load_next" ng-class="{'border-none':open01}">
+                    <p>第一步,下载Excel模板
+                        <em class="open-icon" ng-click="open01=!open01" ng-class="{'active': !open01}"></em>
+                    </p>
+                    <div class="add_category" ng-if="!open01">
                         <div>下载库存Excel模板,在模板上编辑商品信息,<a ng-click="showImg()" style="color: #e64040">查看表格示例</a></div>
                         <div>下载库存Excel模板,在模板上编辑商品信息,<a ng-click="showImg()" style="color: #e64040">查看表格示例</a></div>
                         <div class="load_tab"><a href="javascript:void(0)" ng-click="download()" class="blue-bg">下载库存模板</a></div>
                         <div class="load_tab"><a href="javascript:void(0)" ng-click="download()" class="blue-bg">下载库存模板</a></div>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="load_next">
-                    <p>第二步,上传库存表格、及发布<i class="icon-angle-up"></i></p>
-                    <div class="add_category">
+                <div class="load_next" ng-class="{'border-none':open02}">
+                    <p>第二步,上传库存表格、及发布
+                        <em class="open-icon" ng-click="open02=!open02" ng-class="{'active': !open02}"></em>
+                    </p>
+                    <div class="add_category" ng-if="!open02">
                         <div>1、请选择是店铺自营还是优软代售</div>
                         <div>1、请选择是店铺自营还是优软代售</div>
                         <div class="sale-label">
                         <div class="sale-label">
                             <label class="sellType">
                             <label class="sellType">
@@ -269,7 +337,7 @@
                                 <input type="text" name="txt" id="upload_text" />
                                 <input type="text" name="txt" id="upload_text" />
                                 <i>选择文件</i>
                                 <i>选择文件</i>
                                 <input type="file" id="uploadCommodity" ng-file-select="" ng-change="selectFile()" accept="*.xls,*.xlsx" ng-model="batch.myFiles" ng-multiple="false" class="upload01" />
                                 <input type="file" id="uploadCommodity" ng-file-select="" ng-change="selectFile()" accept="*.xls,*.xlsx" ng-model="batch.myFiles" ng-multiple="false" class="upload01" />
-                                <a href="javascript:void(0)" ng-click="upload()" ng-disabled="!batch.myFiles[0]" class="blue-bg">确认上传</a>
+                                <a href="javascript:void(0)" ng-click="upload()" ng-disabled="!batch.myFiles[0]" class="blue-bg" style="margin-left: 18px;">确认上传</a>
                             </div>
                             </div>
                             <!--批量删除操作-->
                             <!--批量删除操作-->
                            <!-- <div class="check fr">
                            <!-- <div class="check fr">
@@ -293,12 +361,13 @@
                                     <th width="150" style="padding-left: 10px;">器件属性</th>
                                     <th width="150" style="padding-left: 10px;">器件属性</th>
                                     <th width="150">产品固有属性</th>
                                     <th width="150">产品固有属性</th>
                                     <th width="200">产品自定义属性</th>
                                     <th width="200">产品自定义属性</th>
-                                    <th width="100">价格梯度</th>
-                                    <th width="100">操作</th>
+                                    <th width="100">数量</th>
+                                    <th width="100">单价(¥)</th>
+                                    <th width="70">操作</th>
                                 </tr>
                                 </tr>
                             </thead>
                             </thead>
                             <tbody>
                             <tbody>
-                                <tr ng-repeat="batchCommodity in pageParams.content" class="batch-commodity">
+                                <tr ng-repeat="batchCommodity in pageParams.content">
                                     <td class="check-input">
                                     <td class="check-input">
                                         <!--<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
                                         <!--<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
                                         <span ng-bind="$index+1"></span>
                                         <span ng-bind="$index+1"></span>
@@ -316,40 +385,53 @@
                                         <div>
                                         <div>
                                             <span class="label-commodity">交期:</span>
                                             <span class="label-commodity">交期:</span>
                                             <span>
                                             <span>
-                                                    <span ng-if="batchCommodity.deliveryDemMaxTime" ng-bind="'大陆:' + batchCommodity.deliveryDemMinTime + '-' + batchCommodity.deliveryDemMaxTime"></span><br/>
-                                                    <span ng-if="batchCommodity.deliveryHKMinTime" ng-bind="'香港:' + batchCommodity.deliveryHKMinTime + '-' + batchCommodity.deliveryHKMaxTime"></span>
+                                                    <span ng-if="batchCommodity.deliveryDemMaxTime" ng-bind="'大陆' + batchCommodity.deliveryDemMinTime + '-' + batchCommodity.deliveryDemMaxTime"></span>/
+                                                    <span ng-if="batchCommodity.deliveryHKMinTime" ng-bind="'香港' + batchCommodity.deliveryHKMinTime + '-' + batchCommodity.deliveryHKMaxTime"></span>
                                                 </span>
                                                 </span>
                                         </div>
                                         </div>
                                     </td>
                                     </td>
                                     <td>
                                     <td>
                                         <div>库存:&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>
                                         <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.minBuyQty | 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>
+                                        <!--<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>-->
                                         <div>样品:&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>
                                         <div>样品:&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>
-                                        <div>可拆卖:&nbsp;<span ng-bind="batchCommodity.breakUp ? '是' : '否'"></span></div>
-                                    </td>
-                                    <td>
-                                        <div class="fragment-price" ng-repeat="price in batchCommodity.prices">
-                                            <span ng-bind="price.start+'+'"></span>
-                                            <span ng-if="price.rMBPrice" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>
-                                            <span ng-if="price.uSDPrice" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>
+                                        <div>
+                                            <span>可拆卖:</span>
+                                            <span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>
                                         </div>
                                         </div>
                                     </td>
                                     </td>
+                                    <td style="vertical-align: top !important;">
+                                        <div>&nbsp;</div>
+                                        <div>1+ </div>
+                                        <div>50000000+</div>
+                                    </td>
+                                    <td style="vertical-align: top !important;">
+                                        <div>&nbsp;</div>
+                                        <div>0.000005</div>
+                                        <div>0.000005</div>
+                                    </td>
                                     <td>
                                     <td>
                                         <!--<a ng-click="editBatch(batchCommodity)">编辑</a><br/>-->
                                         <!--<a ng-click="editBatch(batchCommodity)">编辑</a><br/>-->
                                         <a ng-click="deleteBatch(batchCommodity.id)" title="删除">删除</a>
                                         <a ng-click="deleteBatch(batchCommodity.id)" title="删除">删除</a>
                                     </td>
                                     </td>
                                 </tr>
                                 </tr>
-                                <tr class="text-center batch-commodity" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
-                                    <td colspan="6" style="text-align: center; line-height: 80px;"><i class="fa fa-smile-o fa-lg"></i> 请上传需要发布的库存</td>
+                                <tr class="record-number" ng-if="pageParams.content.length > 0">
+                                    <td colspan="7">
+                                        <div>显示 1- <i>10</i> 个,共:<i style="color: #5078cb;">24</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>请上传需要发布的库存!</span></td>
                                 </tr>
                                 </tr>
                             </tbody>
                             </tbody>
                         </table>
                         </table>
@@ -358,8 +440,10 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="load_next">
                 <div class="load_next">
-                    <p>第三步,批量化匹配不成功产品信息下载<i class="icon-angle-up"></i></p>
-                    <div class="add_category">
+                    <p ng-class="{'border-none':open03}">第三步,批量化匹配不成功产品信息下载
+                        <em class="open-icon" ng-click="open03=!open03" ng-class="{'active': !open03}"></em>
+                    </p>
+                    <div class="add_category" ng-if="!open03">
                         <div>文件包含验证不通过的内容信息,请修改其错误信息再重新上传</div>
                         <div>文件包含验证不通过的内容信息,请修改其错误信息再重新上传</div>
                         <div class="load_tab">
                         <div class="load_tab">
                             <a href="javascript:void(0)" style="width: 206px;" ng-disabled="!result.failure" ng-click="downloadExcel()" class="blue-bg">下载匹配不成功产品信息</a>
                             <a href="javascript:void(0)" style="width: 206px;" ng-disabled="!result.failure" ng-click="downloadExcel()" class="blue-bg">下载匹配不成功产品信息</a>