Browse Source

处理数据统计增加标准与非标

wangcz 7 years ago
parent
commit
5b79d8c1a4

+ 12 - 0
src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -331,6 +331,18 @@ define([ 'app/app' ], function(app) {
                     case '手机UU用户数':
                     case '手机UU用户数':
                         $scope.start31 = value.count;
                         $scope.start31 = value.count;
                         break;
                         break;
+                    case '在售商品类目(标准)':
+                        $scope.start32 = value.count;
+                        break;
+                    case '在售商品类目(非标准)':
+                        $scope.start33 = value.count;
+                        break;
+                    case '在售商品品牌(标准)':
+                        $scope.start34 = value.count;
+                        break;
+                    case '在售商品品牌(非标准)':
+                        $scope.start35 = value.count;
+                        break;
                 }
                 }
             });
             });
         }, function(res) {
         }, function(res) {

+ 6 - 1
src/main/webapp/resources/js/common/query/material.js

@@ -122,11 +122,16 @@ define([ 'ngResource' ], function() {
                 method: 'GET',
                 method: 'GET',
                 isArray: true
                 isArray: true
             },
             },
-            // 单个物料导入
+            // 单个物料导入(卖家)
             importOneMaterail: {
             importOneMaterail: {
               url: 'trade/products/edit/one',
               url: 'trade/products/edit/one',
               method: 'POST'
               method: 'POST'
             },
             },
+            // 单个物料导入(买家)
+            importUserOneMaterail: {
+                url: 'trade/purchaseProduct/edit/one',
+                method: 'POST'
+            },
           // 根据型号联想词,获取品牌,规格,物料名称等字段
           // 根据型号联想词,获取品牌,规格,物料名称等字段
           getSimilarComponents: {
           getSimilarComponents: {
             url: 'trade/products/code/keyword',
             url: 'trade/products/code/keyword',

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/single_entry_ctrl.js

@@ -656,7 +656,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         selfSale: $scope.Regul.selfSale, // 销售方式
         selfSale: $scope.Regul.selfSale, // 销售方式
       }
       }
       $rootScope.singleEntryInfo = false
       $rootScope.singleEntryInfo = false
-      Material.importOneMaterail({}, jsonObject, function(data) {
+      Material.importUserOneMaterail({}, jsonObject, function(data) {
         if (data.code == 1) {
         if (data.code == 1) {
           toaster.pop('success', '保存成功');
           toaster.pop('success', '保存成功');
           $scope.showProductInfo = true
           $scope.showProductInfo = true

+ 17 - 20
src/main/webapp/resources/view/admin/stats_data.html

@@ -198,12 +198,6 @@
 							<span ng-bind="start16 | number"></span>
 							<span ng-bind="start16 | number"></span>
 						</span>
 						</span>
                     </div>
                     </div>
-                    <!--<div class="form-group row">
-                        <span class="col-sm-6 text-right">企业信息库总数:</span>
-                        <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
-                    </div>-->
                     <div class="form-group row">
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">优软云个人用户数:</span>
                         <span class="col-sm-6 text-right">优软云个人用户数:</span>
                         <span class="col-sm-6">
                         <span class="col-sm-6">
@@ -253,12 +247,6 @@
 							<span ng-bind="start9 | number"></span>
 							<span ng-bind="start9 | number"></span>
 						</span>
 						</span>
                     </div>
                     </div>
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数:</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
                 </div>
                 <div class="col-sm-4 f14">
                 <div class="col-sm-4 f14">
                     <div class="form-group row title">
                     <div class="form-group row title">
@@ -269,13 +257,29 @@
                         <span class="col-sm-6" ng-bind="start13 | number"></span>
                         <span class="col-sm-6" ng-bind="start13 | number"></span>
                     </div>
                     </div>
                     <div class="form-group row">
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">在售商品类目:</span>
+                        <span class="col-sm-6 text-right">在售商品类目总数:</span>
                         <span class="col-sm-6" ng-bind="start12 | number"></span>
                         <span class="col-sm-6" ng-bind="start12 | number"></span>
                     </div>
                     </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">在售商品类目(标准):</span>
+                        <span class="col-sm-6" ng-bind="start32 | number"></span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">在售商品类目(非标):</span>
+                        <span class="col-sm-6" ng-bind="start33 | number"></span>
+                    </div>
                     <div class="form-group row">
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品品牌总数:</span>
                         <span class="col-sm-6 text-right">在售商品品牌总数:</span>
                         <span class="col-sm-6" ng-bind="start11 | number"></span>
                         <span class="col-sm-6" ng-bind="start11 | number"></span>
                     </div>
                     </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">在售商品品牌(标准):</span>
+                        <span class="col-sm-6" ng-bind="start34 | number"></span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">在售商品品牌(非标):</span>
+                        <span class="col-sm-6" ng-bind="start35 | number"></span>
+                    </div>
                     <div class="form-group row">
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">库存合计:</span>
                         <span class="col-sm-6 text-right">库存合计:</span>
                         <span class="col-sm-6" ng-bind="start10 | number"></span>
                         <span class="col-sm-6" ng-bind="start10 | number"></span>
@@ -292,13 +296,6 @@
 							<span ng-bind="start15 | number"></span>
 							<span ng-bind="start15 | number"></span>
 						</span>
 						</span>
                     </div>
                     </div>
-
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数:</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>