处理BUG

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -342,7 +342,6 @@ define([ 'app/app' ], function(app) {
             type.kind = key.kind;
             type.spec = key.spec;
             type.id = key.id;
-            type.qty = ($scope.storage_tab === 'outBound' ? key.erpReserve : '');
             type.price = key.price;
             type.erpReserve = key.erpReserve;
             if((type.erpReserve <= 0) && $scope.storage_tab === 'outBound'){
@@ -376,8 +375,10 @@ define([ 'app/app' ], function(app) {
                         flag = 1
                     } else if((val.erpReserve < val.qty) && $scope.storage_tab === 'outBound') {
                         flag = 2
-                    } else if(val.qty && val.price) {
-                        $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty), price: Number(val.price)});
+                    } else if(val.qty) {
+                        val.price ?
+                        $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty), price: Number(val.price)}) :
+                        $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty)});
                     } else {
                         flag = 3
                     }
@@ -392,7 +393,7 @@ define([ 'app/app' ], function(app) {
                 return;
             }
             if(flag === 3) {
-                toaster.pop('info', '提示', '请填写数量和单价！');
+                toaster.pop('info', '提示', '请填写数量！');
                 return;
             }
             if($scope.othenParam.detail.length <= 0) {

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

@@ -1224,7 +1224,7 @@
                         ng-click="toggleType(item.id)"></li>
                 </ul>
                 <div class="search fr check" ng-if="handleItem !== 1">
-                    <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="{{storage_tab =='outBound' ? '订单号/买家名称' : ( handleItem === 0 ? '入库订单/卖家名称':'发货单/卖家名称')}}"/>
+                    <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="{{storage_tab =='outBound' ? ( handleItem === 0 ? '出库单号/买家名称':'订单号/买家名称') : ( handleItem === 0 ? '入库单号/卖家名称':'发货单/卖家名称')}}"/>
                     <button ng-click="onSearch(keyword)" style="float: left;">搜索</button>
                 </div>
             </div>
@@ -1288,7 +1288,7 @@
                                     <th>物料名称</th>
                                     <th width="210">规格</th>
                                     <th width="130">{{storage_tab === 'inBound' ? '入库数' : '出库数'}}(PCS)</th>
-                                    <th width="130">单价({{currency === 'RMB' ? '¥' : '$'}})</th>
+                                    <th width="130">{{storage_tab === 'inBound' ? '采购单价' : '销售单价'}}({{currency === 'RMB' ? '¥' : '$'}})</th>
                                 </tr>
                                 </thead>
                             </table>
@@ -1334,7 +1334,7 @@
                                 <th width="180">规格</th>
                                 <th width="130">库存数(PCS)</th>
                                 <th width="130"><em class="red_color">*</em>{{storage_tab === 'inBound' ? '入库数' : '出库数'}}(PCS)</th>
-                                <th width="130">单价({{currency === 'RMB' ? '¥' : '$'}})</th>
+                                <th width="130">{{storage_tab === 'inBound' ? '采购单价' : '销售单价'}}({{currency === 'RMB' ? '¥' : '$'}})</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -1441,7 +1441,7 @@
                                     <th width="100" ng-if="storage_tab === 'outBound'">应出库(PCS)</th>
                                     <th width="100" ng-if="storage_tab === 'outBound'">已出库(PCS)</th>
                                     <th width="100"><em class="red_color">*</em>{{storage_tab === 'inBound' ? '入库数' : '出库数'}}(PCS)</th>
-                                    <th width="80">单价({{currency === 'RMB' ? '¥' : '$'}})</th>
+                                    <th width="80">{{storage_tab === 'inBound' ? '采购单价' : '销售单价'}}({{currency === 'RMB' ? '¥' : '$'}})</th>
                                 </tr>
                                 </thead>
                             </table>

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

@@ -669,7 +669,7 @@
                         <th>产品信息</th>
                         <th width="100">&nbsp;</th>
                         <th width="130">&nbsp;</th>
-                        <th width="110" class="text-left">生产日期</th>
+                        <th width="110" class="text-left">交期</th>
                         <th width="70">梯度</th>
                         <th width="120">单价</th>
                         <th width="130">上/下架时间</th>
@@ -732,9 +732,9 @@
                             </div>
                         </td>
                         <td>
-                            <div>
-                                <span ng-bind="commodity.produceDate" title="{{commodity.produceDate}}"></span>
-                            </div>
+                            <!--<div>-->
+                                <!--<span ng-bind="commodity.produceDate" title="{{commodity.produceDate}}"></span>-->
+                            <!--</div>-->
                             <div>
                                 交期 ：
                                 <em ng-if="commodity.b2cMinDelivery == commodity.b2cMaxDelivery" ng-bind="commodity.b2cMinDelivery"></em>