处理BUG

src/main/webapp/resources/js/admin/controllers/product/productManageCtrl.js

@@ -320,7 +320,7 @@ define(['app/app'], function(app) {
         // 产品导出事件
         $scope.exportClick = function () {
             var url = '';
-            if($scope.choosedBatch.length > 0) {
+            if($scope.ids.length > 0) {
                 var idList = [];
                 angular.forEach($scope.ids, function(val) {
                     idList.push(val.id)

src/main/webapp/resources/view/admin/product/productManageDetail.html

@@ -18,14 +18,25 @@
             <div class="panel-body" style="padding:65px 50px 35px 50px;">
                 <div class="row">
                     <div class="col-xs-4">
-                        <div class="img-info">
+                        <div class="img-info" ng-if="goods.goods">
+                            <img ng-src="{{goods.goods.img || 'static/img/store/common/default.png'}}">
+                            <i class="icon-fei" ng-if="!goods.goods.uuid"></i>
+                            <i class="icon-biao" ng-if="goods.goods.uuid"></i>
+                        </div>
+                        <div class="img-info" ng-if="!goods.goods">
                             <img ng-src="{{goods.img || 'static/img/store/common/default.png'}}">
                             <i class="icon-fei" ng-if="!goods.uuid"></i>
                             <i class="icon-biao" ng-if="goods.uuid"></i>
                         </div>
                     </div>
                     <div class="col-xs-4">
-                        <div class="info-text">
+                        <div class="info-text" ng-if="goods.goods">
+                            <p>型号：<span ng-bind="goods.goods.code"></span></p>
+                            <p>物料名称：<span ng-bind="goods.goods.kindNameCn"></span></p>
+                            <p>品牌：<span ng-bind="goods.goods.brandNameEn"></span></p>
+                            <p>封装：<span ng-bind="goods.goods.encapsulation || '-'"></span></p>
+                        </div>
+                        <div class="info-text" ng-if="!goods.goods">
                             <p>型号：<span ng-bind="goods.code"></span></p>
                             <p>物料名称：<span ng-bind="goods.kindNameCn"></span></p>
                             <p>品牌：<span ng-bind="goods.brandNameEn"></span></p>
@@ -33,7 +44,18 @@
                         </div>
                     </div>
                     <div class="col-xs-4">
-                        <div class="info-text">
+                        <div class="info-text" ng-if="goods.goods">
+                            <p>包装：<span ng-bind="goods.goods.packing || '-'"></span></p>
+                            <p>包装数量：<span ng-bind="goods.goods.minPackQty || '-'"></span></p>
+                            <p>单位：<span ng-bind="goods.goods.unit || '-'"></span></p>
+                            <p>生产日期：<span ng-bind="goods.goods.produceDate || '-'"></span></p>
+                            <p>规格书：
+                                <a ng-if="goods.goods.attach" target="_blank" href="{{goods.goods.attach}}">点击查看</a>
+                                <span ng-if="!goods.goods.attach">无</span>
+                            </p>
+                            <p>平台SKU编码：<span ng-bind="goods.batchCode || '-'"></span></p>
+                        </div>
+                        <div class="info-text" ng-if="!goods.goods">
                             <p>包装：<span ng-bind="goods.packaging || '-'"></span></p>
                             <p>包装数量：<span ng-bind="goods.minPackQty || '-'"></span></p>
                             <p>单位：<span ng-bind="goods.unit || '-'"></span></p>
@@ -42,7 +64,7 @@
                                 <a ng-if="goods.attach" target="_blank" href="{{goods.attach}}">点击查看</a>
                                 <span ng-if="!goods.attach">无</span>
                             </p>
-                            <p>平台SKU编码：<span ng-bind="goods.batchCode"></span></p>
+                            <p>平台SKU编码：<span ng-bind="goods.batchCode || '-'"></span></p>
                         </div>
                     </div>
                 </div>
@@ -67,13 +89,21 @@
                         <th>在售数量</th>
                         <th>库存总数</th>
                     </tr>
-                    <tr>
+                    <tr ng-if="goods.goods">
                         <td ng-bind="goods.prodNum || '-'">111</td>
-                        <td ng-bind="goods.frozen">-</td>
+                        <td ng-bind="goods.frozen || '-'">-</td>
                         <!--<td>-</td>-->
                         <td>-</td>
-                        <td ng-bind="goods.reserve">11</td>
-                        <td ng-bind="goods.reserve + goods.frozen">11</td>
+                        <td ng-bind="goods.reserve || '-'">11</td>
+                        <td ng-bind="(goods.reserve + goods.frozen) || '-'">11</td>
+                    </tr>
+                    <tr ng-if="!goods.goods">
+                        <td ng-bind="goods.prodNum || '-'">111</td>
+                        <td ng-bind="goods.frozen || '-'">-</td>
+                        <!--<td>-</td>-->
+                        <td>-</td>
+                        <td ng-bind="goods.reserve || '-'">11</td>
+                        <td ng-bind="(goods.reserve + goods.frozen) || '-'">11</td>
                     </tr>
                 </table>
             </div>
@@ -96,15 +126,25 @@
                         <th>销售方式</th>
                         <th>是否可拆卖</th>
                     </tr>
-                    <tr ng-repeat="price in goods.prices">
+                    <tr ng-repeat="price in goods.goods.prices" ng-if="goods.goods">
+                        <td ng-bind="price.start + '+'">111</td>
+                        <td ng-bind="getPrice(goods.goods.currencyName, price) || '-'">11</td>
+                        <td ng-if="$first" rowspan="{{goods.goods.prices.length}}">
+                            <span ng-bind="goods.goods.minDelivery || '-'"></span>-<span ng-bind="goods.goods.maxDelivery || '-'"></span>
+                        </td>
+                        <td ng-if="$first" rowspan="{{goods.goods.prices.length}}" ng-bind="goods.goods.minBuyQty || '-'">11</td>
+                        <td ng-if="$first" rowspan="{{goods.goods.prices.length}}" ng-bind="goods.goods.selfSale || '-'">11</td>
+                        <td ng-if="$first" rowspan="{{goods.goods.prices.length}}" ng-bind="breakUpStr(goods.goods.breakUp) || '-'">11</td>
+                    </tr>
+                    <tr ng-repeat="price in goods.prices" ng-if="!goods.goods">
                         <td ng-bind="price.start + '+'">111</td>
-                        <td ng-bind="getPrice(goods.currencyName, price)">11</td>
+                        <td ng-bind="getPrice(goods.currencyName, price) || '-'">11</td>
                         <td ng-if="$first" rowspan="{{goods.prices.length}}">
-                            <span ng-bind="goods.minDelivery"></span>-<span ng-bind="goods.maxDelivery"></span>
+                            <span ng-bind="goods.minDelivery || '-'"></span>-<span ng-bind="goods.maxDelivery || '-'"></span>
                         </td>
-                        <td ng-if="$first" rowspan="{{goods.prices.length}}" ng-bind="goods.minBuyQty">11</td>
-                        <td ng-if="$first" rowspan="{{goods.prices.length}}" ng-bind="goods.selfSale">11</td>
-                        <td ng-if="$first" rowspan="{{goods.prices.length}}" ng-bind="breakUpStr(goods.breakUp)">11</td>
+                        <td ng-if="$first" rowspan="{{goods.prices.length}}" ng-bind="goods.minBuyQty || '-'">11</td>
+                        <td ng-if="$first" rowspan="{{goods.prices.length}}" ng-bind="goods.selfSale || '-'">11</td>
+                        <td ng-if="$first" rowspan="{{goods.prices.length}}" ng-bind="breakUpStr(goods.breakUp) || '-'">11</td>
                     </tr>
                 </table>
             </div>