产品后台管理验收反馈

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsModifyInfoController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.prod.commodity.controller;
 
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.prod.commodity.model.GoodsModifyInfo;
+import com.uas.platform.b2c.prod.commodity.model.ModifyInfo;
 import com.uas.platform.b2c.prod.commodity.service.GoodsModifyInfoService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
@@ -30,17 +31,29 @@ public class GoodsModifyInfoController {
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
     /**
-     * 分页获取产品修改历史
+     * 根据批次号分页获取该Goods的修改记录
      * @param params
      * @param batchCode
      * @return
      */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
-    public Page<GoodsModifyInfo> getPageDateByBatchCode(PageParams params, String batchCode) {
+    public Page<GoodsModifyInfo> getPageDataByBatchCode(PageParams params, String batchCode) {
         logger.log("产品信息记录", "分页获取该批次" + batchCode + "的修改记录");
         return modifyInfoService.getPageModifyRecord(params, batchCode);
     }
 
+    /**
+     * 根据批次号分页获取该Goods指定类型的修改记录明细
+     * @param params
+     * @param batchCode
+     * @return
+     */
+    @RequestMapping(value = "/detail/page", method = RequestMethod.GET)
+    public Page<GoodsModifyInfo> getPageDetailByBatchCode(PageParams params, String batchCode) {
+        logger.log("产品信息记录", "分页获取该批次" + batchCode + "的修改记录明细");
+        return modifyInfoService.getPageModifyDetail(params, batchCode);
+    }
+
     /**
      * 根据批次号返回修改的信息
      * @param batchCode 批次号

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ModifyInfoDao.java

@@ -0,0 +1,13 @@
+package com.uas.platform.b2c.prod.commodity.dao;
+
+import com.uas.platform.b2c.prod.commodity.model.ModifyInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * 商品修改明细dao层
+ * @author hulh
+ */
+public interface ModifyInfoDao extends JpaSpecificationExecutor<ModifyInfo>,
+        JpaRepository<ModifyInfo, Long> {
+}

src/main/java/com/uas/platform/b2c/prod/commodity/model/GoodsModifyInfo.java

@@ -26,6 +26,12 @@ public class GoodsModifyInfo {
     @Column(name = "mo_useruu")
     private Long useruu;
 
+    /**
+     * 更新人
+     */
+    @Column(name = "mo_operate_name")
+    private String operateName;
+
     /**
      * 店铺enuu
      */
@@ -46,7 +52,7 @@ public class GoodsModifyInfo {
     private List<ModifyInfo> infoList;
 
     /**
-     * 更新人
+     * 审核人
      */
     @Column(name = "mo_audited_name")
     private String auditedName;
@@ -58,7 +64,7 @@ public class GoodsModifyInfo {
     private Date updateTime;
 
     /**
-     * 审核状态  0：未审核 1：已审核
+     * 审核状态  10：未审核 11：通过 12：不通过
      */
     @Column(name = "mo_status")
     private Integer status;
@@ -69,6 +75,18 @@ public class GoodsModifyInfo {
     @Column(name = "mo_message")
     private String message;
 
+    /**
+     * 基本信息数
+     */
+    @Transient
+    private int basicCount;
+
+    /**
+     * 销售信息数
+     */
+    @Transient
+    private int sellCount;
+
     public Long getId() {
         return id;
     }
@@ -85,6 +103,14 @@ public class GoodsModifyInfo {
         this.useruu = useruu;
     }
 
+    public String getOperateName() {
+        return operateName;
+    }
+
+    public void setOperateName(String operateName) {
+        this.operateName = operateName;
+    }
+
     public Long getEnuu() {
         return enuu;
     }
@@ -140,4 +166,20 @@ public class GoodsModifyInfo {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public int getBasicCount() {
+        return basicCount;
+    }
+
+    public void setBasicCount(int basicCount) {
+        this.basicCount = basicCount;
+    }
+
+    public int getSellCount() {
+        return sellCount;
+    }
+
+    public void setSellCount(int sellCount) {
+        this.sellCount = sellCount;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/ModifyInfo.java

@@ -34,6 +34,12 @@ public class ModifyInfo {
     @Column(name = "mo_id")
     private Long modifyid;
 
+    /**
+     * 关联的商品批次号，方便查询
+     */
+    @Column(name = "mo_batch")
+    private String batchCode;
+
     /**
      * 修改的字段
      */
@@ -105,4 +111,12 @@ public class ModifyInfo {
     public void setType(Short type) {
         this.type = type;
     }
+
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/GoodsModifyInfoService.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.prod.commodity.service;
 
 import com.uas.platform.b2c.prod.commodity.model.GoodsModifyInfo;
+import com.uas.platform.b2c.prod.commodity.model.ModifyInfo;
 import com.uas.platform.core.model.PageParams;
 import org.springframework.data.domain.Page;
 
@@ -13,13 +14,21 @@ import java.util.List;
 public interface GoodsModifyInfoService {
 
     /**
-     * 根据批次号分页获取该Goods的修改记录
+     * 根据批次号分页获取该Goods指定类型的修改记录
      * @param batchCode 批次号
      * @param params    分页参数
      * @return
      */
     Page<GoodsModifyInfo> getPageModifyRecord(PageParams params, String batchCode);
 
+    /**
+     * 根据批次号分页获取该Goods指定类型的修改记录明细
+     * @param batchCode 批次号
+     * @param params    分页参数
+     * @return
+     */
+    Page<GoodsModifyInfo> getPageModifyDetail(PageParams params, String batchCode);
+
     /**
      * 根据批次号获取该Goods的修改记录
      * @param batchCode 批次号

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsModifyInfoServiceImpl.java

@@ -4,18 +4,27 @@ import com.uas.platform.b2c.core.constant.ShortConstant;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsModifyInfoDao;
+import com.uas.platform.b2c.prod.commodity.dao.ModifyInfoDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.GoodsModifyInfo;
+import com.uas.platform.b2c.prod.commodity.model.ModifyInfo;
 import com.uas.platform.b2c.prod.commodity.service.GoodsModifyInfoService;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.status.ModifyInfoStatus;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.util.Date;
 import java.util.List;
 
@@ -27,7 +36,7 @@ import java.util.List;
 public class GoodsModifyInfoServiceImpl implements GoodsModifyInfoService {
 
     @Autowired
-    private GoodsModifyInfoDao modifyInfoDao;
+    private GoodsModifyInfoDao goodsModifyInfoDao;
 
     @Autowired
     private GoodsDao goodsDao;
@@ -35,10 +44,48 @@ public class GoodsModifyInfoServiceImpl implements GoodsModifyInfoService {
     @Autowired
     private GoodsService goodsService;
 
+    @Autowired
+    private ModifyInfoDao modifyInfoDao;
+
     @Override
     public Page<GoodsModifyInfo> getPageModifyRecord(PageParams params, String batchCode) {
-        PageInfo info = new PageInfo(params);
-        return null;
+        final PageInfo info = new PageInfo(params);
+        info.expression(PredicateUtils.eq("batchCode", batchCode, true));
+        info.expression(PredicateUtils.ne("status", ModifyInfoStatus.TO_BE_AUDITED.getCode(), true));
+        return goodsModifyInfoDao.findAll(new Specification<GoodsModifyInfo>() {
+            @Override
+            public Predicate toPredicate(Root<GoodsModifyInfo> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                criteriaQuery.where(info.getPredicates(root, criteriaQuery, criteriaBuilder));
+                return null;
+            }
+        }, info);
+    }
+
+    @Override
+    public Page<GoodsModifyInfo> getPageModifyDetail(PageParams params, String batchCode) {
+        final PageInfo info = new PageInfo(params);
+        info.expression(PredicateUtils.eq("batchCode", batchCode, true));
+        Page<GoodsModifyInfo> page =  goodsModifyInfoDao.findAll(new Specification<GoodsModifyInfo>() {
+            @Override
+            public Predicate toPredicate(Root<GoodsModifyInfo> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                criteriaQuery.where(info.getPredicates(root, criteriaQuery, criteriaBuilder));
+                return null;
+            }
+        }, info);
+        for (GoodsModifyInfo aModify : page.getContent()) {
+            int basicCount = 0;
+            int sellCount = 0;
+            for (ModifyInfo aInfo : aModify.getInfoList()) {
+                if (ModifyInfo.TYPE_BASIC.equals(aInfo.getType())) {
+                    basicCount++;
+                } else {
+                    sellCount++;
+                }
+            }
+            aModify.setBasicCount(basicCount);
+            aModify.setSellCount(sellCount);
+        }
+        return page;
     }
 
     @Override
@@ -46,7 +93,7 @@ public class GoodsModifyInfoServiceImpl implements GoodsModifyInfoService {
         if (StringUtils.isEmpty(batchCode)) {
             throw new IllegalOperatorException("批次号丢失");
         }
-        return modifyInfoDao.findByBatchCodeAndStatus(batchCode, ModifyInfoStatus.TO_BE_AUDITED.getCode());
+        return goodsModifyInfoDao.findByBatchCodeAndStatus(batchCode, ModifyInfoStatus.TO_BE_AUDITED.getCode());
     }
 
     @Override
@@ -74,7 +121,7 @@ public class GoodsModifyInfoServiceImpl implements GoodsModifyInfoService {
             modifyInfo.setUpdateTime(new Date());
             modifyInfo.setAuditedName(SystemSession.getUser().getUserName());
         }
-        modifyInfoDao.save(modifyInfoList);
+        goodsModifyInfoDao.save(modifyInfoList);
         goods.setAudited(ShortConstant.YES_SHORT);
         goods.setAuditedTime(new Date());
         if (!pass) {

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -1376,6 +1376,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(StringConstant.DEFAULT_IMG);
             info.setAfter(StringConstant.NEW_IMG);
             info.setType(ModifyInfo.TYPE_BASIC);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         if (StringUtils.hasText(beforeImg) && !beforeImg.equals(afterImg)) {
@@ -1384,6 +1385,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(StringConstant.OLD_IMG);
             info.setAfter(StringConstant.NEW_IMG);
             info.setType(ModifyInfo.TYPE_BASIC);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         String beforePackage = beforeGoods.getPackaging();
@@ -1394,6 +1396,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforePackage);
             info.setAfter(afterPackage);
             info.setType(ModifyInfo.TYPE_BASIC);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         String beforeProduce = beforeGoods.getProduceDate();
@@ -1404,6 +1407,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforeProduce);
             info.setAfter(afterProduce);
             info.setType(ModifyInfo.TYPE_BASIC);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         Boolean beforeBreak = beforeGoods.getBreakUp();
@@ -1414,6 +1418,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforeBreak.toString());
             info.setAfter(afterBreak.toString());
             info.setType(ModifyInfo.TYPE_SALE);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         Double beforeReserve = beforeGoods.getReserve();
@@ -1423,6 +1428,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_RESERVE.getPhrase());
             info.setBefore(beforeReserve.toString());
             info.setAfter(afterReserve.toString());
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         Double beforePackQty = beforeGoods.getMinPackQty();
@@ -1433,6 +1439,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforePackQty.toString());
             info.setAfter(afterPackQty.toString());
             info.setType(ModifyInfo.TYPE_BASIC);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         Double beforeBuyQty = beforeGoods.getMinBuyQty();
@@ -1443,6 +1450,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforeBuyQty.toString());
             info.setAfter(afterBuyQty.toString());
             info.setType(ModifyInfo.TYPE_SALE);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         Short beforeMinDelivery = beforeGoods.getMinDelivery();
@@ -1453,6 +1461,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforeMinDelivery.toString());
             info.setAfter(afterMinDelivery.toString());
             info.setType(ModifyInfo.TYPE_SALE);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         Short beforeMaxDelivery = beforeGoods.getMaxDelivery();
@@ -1463,6 +1472,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setBefore(beforeMaxDelivery.toString());
             info.setAfter(afterMaxDelivery.toString());
             info.setType(ModifyInfo.TYPE_SALE);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         String beforeStore = beforeGoods.getStoreid();
@@ -1478,6 +1488,7 @@ public class GoodsServiceImpl implements GoodsService {
                 info.setAfter(StringConstant.CONSIGNMENT);
             }
             info.setType(ModifyInfo.TYPE_SALE);
+            info.setBatchCode(beforeGoods.getBatchCode());
             infoList.add(info);
         }
         if (beforeGoods.getCurrencyName().equals(afterGoods.getCurrencyName())) {
@@ -1488,6 +1499,7 @@ public class GoodsServiceImpl implements GoodsService {
                 qtyInfo.setBefore(analyzeQtyNumber(beforeGoods.getPrices()));
                 qtyInfo.setAfter(analyzeQtyNumber(afterGoods.getPrices()));
                 qtyInfo.setType(ModifyInfo.TYPE_SALE);
+                qtyInfo.setBatchCode(beforeGoods.getBatchCode());
                 infoList.add(qtyInfo);
                 // 生成分段价格修改记录
                 ModifyInfo priceInfo = new ModifyInfo();
@@ -1495,6 +1507,7 @@ public class GoodsServiceImpl implements GoodsService {
                 priceInfo.setBefore(analyzeQtyPrice(beforeGoods.getPrices()));
                 priceInfo.setAfter(analyzeQtyPrice(afterGoods.getPrices()));
                 priceInfo.setType(ModifyInfo.TYPE_SALE);
+                priceInfo.setBatchCode(beforeGoods.getBatchCode());
                 infoList.add(priceInfo);
             }
         }
@@ -1503,6 +1516,7 @@ public class GoodsServiceImpl implements GoodsService {
             GoodsModifyInfo modifyInfo = new GoodsModifyInfo();
             modifyInfo.setEnuu(SystemSession.getUser().getEnterprise().getUu());
             modifyInfo.setUseruu(SystemSession.getUser().getUserUU());
+            modifyInfo.setOperateName(SystemSession.getUser().getUserName());
             modifyInfo.setBatchCode(beforeGoods.getBatchCode());
             modifyInfo.setStatus(ModifyInfoStatus.TO_BE_AUDITED.getCode());
             modifyInfo.setUpdateTime(new Date());

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

@@ -393,7 +393,7 @@ define(['app/app'], function(app) {
 
     }]);
 
-    app.register.controller('journalCtrl', ['$scope', 'goods', 'toaster', 'ngTableParams', 'BaseService', 'GoodsHistory', '$modalInstance', function($scope, goods, toaster, ngTableParams, BaseService, GoodsHistory, $modalInstance) {
+    app.register.controller('journalCtrl', ['$scope', 'goods', 'toaster', 'ngTableParams', 'BaseService', 'GoodsHistory', 'GoodsModifyInfo', '$modalInstance', function($scope, goods, toaster, ngTableParams, BaseService, GoodsHistory, GoodsModifyInfo, $modalInstance) {
         $scope.tabs = 'basic';
 
         // 日期选择框部分
@@ -429,7 +429,7 @@ define(['app/app'], function(app) {
             '批量下架公司产品' : '下架'
         };
 
-        // 获取分页Goods数据
+        // 获取分页GoodsHistory数据
         $scope.historyTableParams = new ngTableParams({
             page: 1,
             count: 3
@@ -448,6 +448,43 @@ define(['app/app'], function(app) {
             }
         });
 
+        // 获取分页GoodsHistory数据
+        $scope.auditedTableParams = new ngTableParams({
+            page: 1,
+            count: 3
+        }, {
+            total: 0,
+            getData: function ($defer, params) {
+                var param = BaseService.parseParams(params.url());
+                param.batchCode = goods.batchCode;
+                GoodsModifyInfo.getPageModifyInfo(param, function (data) {
+                    $scope.auditedList = data.content;
+                    params.total(data.totalElements);
+                    $defer.resolve(data.content);
+                }, function () {
+                    toaster.pop('error', '获取数据失败')
+                })
+            }
+        });
+
+        $scope.ModifyDetailTableParams = new ngTableParams({
+            page: 1,
+            count: 3
+        }, {
+            total: 0,
+            getData: function ($defer, params) {
+                var param = BaseService.parseParams(params.url());
+                param.batchCode = goods.batchCode;
+                GoodsModifyInfo.getPageModifyDetail(param, function (data) {
+                    $scope.detailList = data.content;
+                    params.total(data.totalElements);
+                    $defer.resolve(data.content);
+                }, function () {
+                    toaster.pop('error', '获取数据失败')
+                })
+            }
+        });
+
         $scope.cancel = function () {
             $modalInstance.dismiss();
         }

src/main/webapp/resources/js/common/query/goods.js

@@ -287,6 +287,10 @@ define([ 'ngResource' ], function() {
 				url: 'goods/modifyInfo/page',
 				method: 'GET'
 			},
+			getPageModifyDetail : {
+				url: 'goods/modifyInfo/detail/page',
+				method: 'GET'
+			},
 			getModifyInfoByBatchCode : {
 				url: 'goods/modifyInfo/batchCode',
 				method: 'GET',

src/main/webapp/resources/view/admin/modal/manage/journal_modal.html

@@ -8,8 +8,8 @@
     <div class="tab-list">
         <ul class="list-inline">
             <li ng-class="{active:tabs==='basic'}"><span ng-click="tabs='basic'">基本信息</span></li>
-            <li ng-class="{active:tabs==='repertory'}"><span ng-click="tabs='repertory'">库存信息</span></li>
-            <li ng-class="{active:tabs==='frost'}"><span ng-click="tabs='frost'">冻结释放</span></li>
+            <li ng-class="{active:tabs==='repertory'}" ng-if="false"><span ng-click="tabs='repertory'">库存信息</span></li>
+            <li ng-class="{active:tabs==='frost'}" ng-if="false"><span ng-click="tabs='frost'">冻结释放</span></li>
             <li ng-class="{active:tabs==='sell'}"><span ng-click="tabs='sell'">销售信息</span></li>
             <li ng-class="{active:tabs==='correlation'}" ng-if="false"><span ng-click="tabs='correlation'">相关产品</span></li>
             <li ng-class="{active:tabs==='group'}" ng-if="false"><span ng-click="tabs='group'">组合套餐</span></li>
@@ -49,7 +49,7 @@
                 <a class="seek" href="javascript:void(0)" ng-click="search()">搜索</a>
             </div>
         </div>
-        <table ng-if="tabs==='basic'">
+        <table ng-if="tabs==='basic'" ng-table="ModifyDetailTableParams">
             <thead>
             <tr>
                 <th>时间</th>
@@ -59,42 +59,22 @@
             </tr>
             </thead>
             <tbody>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>
-                    <p>包装：<span>盘装</span></p>
-                    <p>产品图片：<span>旧图片</span></p>
-                </td>
-                <td>
-                    <p>包装：<span>盘装</span></p>
-                    <p>产品图片：<span>旧图片</span></p>
-                </td>
-            </tr>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>
-                    <p>包装：<span>盘装</span></p>
-                    <p>产品图片：<span>旧图片</span></p>
-                </td>
-                <td>
-                    <p>包装：<span>盘装</span></p>
-                    <p>产品图片：<span>旧图片</span></p>
-                </td>
-            </tr>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>
-                    <p>包装：<span>盘装</span></p>
-                    <p>产品图片：<span>旧图片</span></p>
-                </td>
-                <td>
-                    <p>包装：<span>盘装</span></p>
-                    <p>产品图片：<span>旧图片</span></p>
-                </td>
-            </tr>
+                <tr ng-repeat="aModify in detailList" ng-if="aModify.basicCount != 0">
+                    <td><span ng-bind="aModify.updateTime | date : 'yyyy-MM-dd hh:mm:ss'">2017-77-77 00.00.00</span></td>
+                    <td><span ng-bind="aModify.operateName"></span></td>
+                    <td>
+                        <p ng-repeat="info in aModify.infoList" ng-if="info.type==1">
+                            <span ng-bind="info.modifyField">盘装</span>:
+                            <span ng-bind="info.before">盘装</span>
+                        </p>
+                    </td>
+                    <td>
+                        <p ng-repeat="info in aModify.infoList" ng-if="info.type==1">
+                            <span ng-bind="info.modifyField">盘装</span>:
+                            <span ng-bind="info.after">盘装</span>
+                        </p>
+                    </td>
+                </tr>
             </tbody>
         </table>
         <table ng-if="tabs==='repertory'">
@@ -159,42 +139,20 @@
             </tr>
             </thead>
             <tbody>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>
-                    <p>起订量：<span>100</span></p>
-                    <p>交期：<span>3-5天</span></p>
-                </td>
-                <td>
-                    <p>起订量：<span>1</span></p>
-                    <p>交期：<span>3-5天</span></p>
-                </td>
-            </tr>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
+            <tr ng-repeat="aModify in detailList" ng-if="aModify.sellCount != 0">
+                <td><span ng-bind="aModify.updateTime | date : 'yyyy-MM-dd hh:mm:ss'">2017-77-77 00.00.00</span></td>
+                <td><span ng-bind="aModify.operateName"></span></td>
                 <td>
-                    <p>梯度：<span>100</span></p>
-                    <p>梯度：<span>3-5天</span></p>
+                    <p ng-repeat="info in aModify.infoList" ng-if="info.type==2">
+                        <span ng-bind="info.modifyField">盘装</span>:
+                        <span ng-bind="info.before">盘装</span>
+                    </p>
                 </td>
                 <td>
-                    <p>梯度：<span>1</span></p>
-                    <p>梅兰芳 ：<span>3-5天</span></p>
-                    <p>梯度：<span>3-5天</span></p>
-                </td>
-            </tr>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>
-                    <p>梯度：<span>100</span></p>
-                    <p>梯度：<span>3-5天</span></p>
-                </td>
-                <td>
-                    <p>梯度：<span>1</span></p>
-                    <p>梅兰芳 ：<span>3-5天</span></p>
-                    <p>梯度：<span>3-5天</span></p>
+                    <p ng-repeat="info in aModify.infoList" ng-if="info.type==2">
+                        <span ng-bind="info.modifyField">盘装</span>:
+                        <span ng-bind="info.after">盘装</span>
+                    </p>
                 </td>
             </tr>
             </tbody>
@@ -269,34 +227,22 @@
             </tr>
             </tbody>
         </table>
-        <table ng-if="tabs==='audit'">
+        <table ng-if="tabs==='audit'" ng-table="auditedTableParams">
             <thead>
-            <tr>
-                <th>时间</th>
-                <th>操作人</th>
-                <th>操作</th>
-                <th>原因</th>
-            </tr>
+                <tr>
+                    <th>时间</th>
+                    <th>操作人</th>
+                    <th>操作</th>
+                    <th>原因</th>
+                </tr>
             </thead>
             <tbody>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>上架</td>
-                <td>图处有酷管家</td>
-            </tr>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>上架</td>
-                <td>图处有酷管家</td>
-            </tr>
-            <tr>
-                <td>2017-07-02 21.21.21</td>
-                <td>张三</td>
-                <td>上架</td>
-                <td>图处有酷管家</td>
-            </tr>
+                <tr ng-repeat="record in auditedList">
+                    <td ng-bind="record.updateTime | date: 'yyyy-MM-dd HH:mm:ss'">2017-07-02 21.21.21</td>
+                    <td ng-bind="record.auditedName">张三</td>
+                    <td ng-bind="record.status == 11 ? '审核通过' : '审核不通过'">上架</td>
+                    <td ng-bind="record.message || '-'">图处有酷管家</td>
+                </tr>
             </tbody>
         </table>
     </div>