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

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

@@ -325,7 +325,7 @@ define(['app/app'], function(app) {
                 angular.forEach($scope.ids, function(val) {
                     idList.push(val.id)
                 })
-                url = '/trade/goods/background/downloadByIds?idStr=' + idList
+                url = '/trade/goods/background/downloadByIds?idStr=' + angular.toJson(idList)
             } else {
                 // 拼装链接
                 url = "/trade/goods/background/download?page=" + $scope.pageParams.page + "&count=" + $scope.pageParams.count + "&sorting=" + encodeURIComponent(angular.toJson($scope.pageParams.sorting));

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

@@ -326,7 +326,7 @@ define(['app/app'], function(app) {
                 angular.forEach($scope.ids, function(val) {
                     idList.push(val.id)
                 })
-                url = '/trade/products/background/downloadByIds?idStr=' + idList
+                url = '/trade/products/background/downloadByIds?idStr=' + angular.toJson(idList);
             } else {
                 // 拼装链接
                 url = "/trade/products/background/download?page=" + $scope.pageParams.page + "&count=" + $scope.pageParams.count + "&sorting=" + encodeURIComponent(angular.toJson($scope.pageParams.sorting));

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

@@ -200,7 +200,7 @@
                     <a target="_blank" href="admin#/manage/{{list.id}}?type=product">详情</a>
                     <a ng-if="list.audited == 0" ng-click="auditProduct(list)">审核</a>
                     <br/>
-                    <a ng-click="journalProduct(list)" style="margin-left:-1px;">日志</a>
+                    <a ng-if="list.goods" ng-click="journalProduct(list)" style="margin-left:-1px;">日志</a>
                     <a ng-if="list.status == 601 || list.status == 602" ng-click="soldOutProduct([list.batchCode])">下架</a>
                 </td>
                 <td ng-if="titleInShow['商家ID']">
@@ -209,15 +209,15 @@
                 </td>
                 <td ng-if="titleInShow['商家名称']">
                     <span ng-if="list.goods" ng-bind="list.goods.storeName || '-'">商家名称</span>
-                    <span ng-if="!list.goods" ng-bind="list.storeName || '-'">商家名称</span>
+                    <span ng-if="!list.goods" ng-bind="list.enterpriseName || '-'">商家名称</span>
                 </td>
                 <td>
                     <p ng-if="list.goods">物料名称：<span ng-bind="list.goods.kindNameCn || '-'">****</span></p>
-                    <p ng-if="!list.goods">物料名称：<span ng-bind="list.kindNameCn || '-'">****</span></p>
+                    <p ng-if="!list.goods">物料名称：<span ng-bind="list.kind || list.kinden|| '-'">****</span></p>
                     <p ng-if="list.goods">型号：<span ng-bind="list.goods.code || '-'">****</span></p>
-                    <p ng-if="!list.goods">型号：<span ng-bind="list.code || '-'">****</span></p>
+                    <p ng-if="!list.goods">型号：<span ng-bind="list.cmpCode || '-'">****</span></p>
                     <p ng-if="list.goods">品牌：<span ng-bind="list.goods.brandNameEn || '-'">****</span></p>
-                    <p ng-if="!list.goods">品牌：<span ng-bind="list.brandNameEn || '-'">****</span></p>
+                    <p ng-if="!list.goods">品牌：<span ng-bind="list.pbrand || list.pbranden || '-'">****</span></p>
                 </td>
                 <td ng-if="titleInShow['SKU编码']">
                     <span ng-if="list.goods" ng-bind="list.goods.batchCode || '-'">SKU编码</span>
@@ -316,7 +316,7 @@
                 </td>
                 <td ng-if="titleInShow['创建时间']">
                     <span ng-if="list.goods" ng-bind="list.goods.createdDate | date: 'yyyy-MM-dd HH:mm:ss' || '-'">创建时间</span>
-                    <span ng-if="!list.goods" ng-bind="list.createdDate | date: 'yyyy-MM-dd HH:mm:ss' || '-'">创建时间</span>
+                    <span ng-if="!list.goods" ng-bind="list.createTime | date: 'yyyy-MM-dd HH:mm:ss' || '-'">创建时间</span>
                 </td>
                 <td ng-if="titleInShow['产品类型']">
                     <span ng-if="list.goods" ng-bind="list.goods.uuid ? '标准' : '非标'"></span>
@@ -324,11 +324,11 @@
                 </td>
                 <td ng-if="titleInShow['图片类型']">
                     <span ng-if="list.goods" ng-bind="list.goods.img ? '自有图片' : '默认图片'"></span>
-                    <span ng-if="!list.goods" ng-bind="list.img ? '自有图片' : '默认图片'"></span>
+                    <span ng-if="!list.goods" ng-bind="list.cmpImg ? '自有图片' : '默认图片'"></span>
                 </td>
                 <td ng-if="titleInShow['产品图片']">
                     <img ng-if="list.goods" ng-src="{{list.goods.img || 'static/img/store/common/default.png'}}" ng-click="showImg(list.img)" alt="产品图片">
-                    <img ng-if="!list.goods" ng-src="{{list.img || 'static/img/store/common/default.png'}}" ng-click="showImg(list.img)" alt="产品图片">
+                    <img ng-if="!list.goods" ng-src="{{list.cmpImg || 'static/img/store/common/default.png'}}" ng-click="showImg(list.img)" alt="产品图片">
                 </td>
             </tr>
             </tbody>