Kaynağa Gözat

处理超级后台数据统计和商机管理时间调整

wangcz 7 yıl önce
ebeveyn
işleme
a6cd6e7bc3

+ 44 - 29
src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -128,18 +128,18 @@ define([ 'app/app' ], function(app) {
                     method: 'get',
                     dataType: 'json',
                     url: $scope.ssoUrl + '/api/userspace/inputTime/count/apps',
-                    params: {start: $scope.startFormatDate, end: $scope.endFormatDate, fromApps:'mall'}
+                    params: {start: $scope.startFormatDate, end: $scope.endFormatDate, fromApps:'mall,b2b'}
                 }).success(function (data) {
                     $scope.newAddUserSpaceData = data.content
                 }).error(function () {
                     toaster.pop('error', '获取未处理审批数据失败');
                 });
-                // 新增企业个人用户
+                // 新增个人用户
                 $http({
                     method: 'get',
                     dataType: 'json',
                     url: $scope.ssoUrl + '/api/user/inputTime/count/apps',
-                    params: {start: $scope.startFormatDate, end: $scope.endFormatDate, fromApps:'mall'}
+                    params: {start: $scope.startFormatDate, end: $scope.endFormatDate, fromApps:'mall,b2b'}
                 }).success(function (data) {
                     $scope.newAddUserData = data.content
                 }).error(function () {
@@ -178,82 +178,97 @@ define([ 'app/app' ], function(app) {
                 switch(value.item)
                 {
                     case '规格书':
-                        $scope.start1 = value.count
+                        $scope.start1 = value.count;
                         break;
                     case '品牌':
-                        $scope.start2 = value.count
+                        $scope.start2 = value.count;
                         break;
                     case '现货':
-                        $scope.start3 = value.count
+                        $scope.start3 = value.count;
                         break;
                     case '当前器件总数':
-                        $scope.start4 = value.count
+                        $scope.start4 = value.count;
                         break;
                     case '本月新增器件数':
-                        $scope.start5 = value.count
+                        $scope.start5 = value.count;
                         break;
                     case '上月新增器件数':
-                        $scope.start6 = value.count
+                        $scope.start6 = value.count;
                         break;
                     case '本月新增品牌数':
-                        $scope.start7 = value.count
+                        $scope.start7 = value.count;
                         break;
                     case '当前类目总数':
-                        $scope.start8 = value.count
+                        $scope.start8 = value.count;
                         break;
                     case '本月更新器件数':
-                        $scope.start9 = value.count
+                        $scope.start9 = value.count;
                         break;
                     case '库存合计':
-                        $scope.start10 = value.count
+                        $scope.start10 = value.count;
                         break;
                     case '在售商品品牌数量':
-                        $scope.start11 = value.count
+                        $scope.start11 = value.count;
                         break;
                     case '在售商品类目数量':
-                        $scope.start12 = value.count
+                        $scope.start12 = value.count;
                         break;
                     case '在售商品型号数量':
-                        $scope.start13 = value.count
+                        $scope.start13 = value.count;
                         break;
                     case '含税金额合计(RMB)':
-                        $scope.start14 = value.count
+                        $scope.start14 = value.count;
                         break;
                     case '未税金额合计(RMB)':
-                        $scope.start15 = value.count
+                        $scope.start15 = value.count;
                         break;
                     case '上年交易金额':
-                        $scope.start16 = value.count
+                        $scope.start16 = value.count;
                         break;
                     case '本年交易金额':
-                        $scope.start17 = value.count
+                        $scope.start17 = value.count;
                         break;
                     case '上月器件总数':
-                        $scope.start18 = value.count
+                        $scope.start18 = value.count;
                         break;
                     case '上月品牌总数':
-                        $scope.start19 = value.count
+                        $scope.start19 = value.count;
                         break;
                     case '上月开通店铺数量':
-                        $scope.start20 = value.count
+                        $scope.start20 = value.count;
                         break;
                     case '上个月用户注册量':
-                        $scope.start21 = value.count
+                        $scope.start21 = value.count;
                         break;
                     case '上个月企业注册量':
-                        $scope.start22 = value.count
+                        $scope.start22 = value.count;
                         break;
                     case '供应商总数':
-                        $scope.start23 = value.count
+                        $scope.start23 = value.count;
                         break;
                     case '店铺总数':
-                        $scope.start24 = value.count
+                        $scope.start24 = value.count;
                         break;
                     case '本月新增店铺数':
-                        $scope.start25 = value.count
+                        $scope.start25 = value.count;
                         break;
                     case '上月新增店铺数':
-                        $scope.start26 = value.count
+                        $scope.start26 = value.count;
+                        break;
+                    case '优软云个人用户数':
+                        $scope.start27 = value.count;
+                        break;
+                    case '注册总数量':
+                        $scope.start28 = value.count;
+                        break;
+                    case '当月注册数量':
+                        $scope.start29 = value.count;
+                        break;
+                    case '上月注册汇总':
+                        $scope.start30 = value.count;
+                        break;
+                    case '手机UU用户数':
+                        $scope.start31 = value.count;
                         break;
                     default:
                         $scope.default = 0

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

@@ -92,15 +92,15 @@
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">注册总数量:</span>
-                        <!--<span class="col-sm-6" ng-bind="statistics.codes | number"></span>-->
+                        <span class="col-sm-6" ng-bind="start28 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">当月注册总量:</span>
-                        <!--<span class="col-sm-6" ng-bind="statistics.kinds | number"></span>-->
+                        <span class="col-sm-6" ng-bind="start29 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">上月注册总量:</span>
-                        <!--<span class="col-sm-6" ng-bind="statistics.brands | number"></span>-->
+                        <span class="col-sm-6" ng-bind="start30 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">商城开店总数:</span>
@@ -119,33 +119,33 @@
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">本年度交易总额折合RMB:</span>
+                        <span class="col-sm-6 text-right">本年度交易总额折合(RMB):</span>
                         <span class="col-sm-6">¥
 							<span ng-bind="start17 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">上年度交易总额折合RMB:</span>
+                        <span class="col-sm-6 text-right">上年度交易总额折合(RMB):</span>
                         <span class="col-sm-6">¥
 							<span ng-bind="start16 | 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">
-							<!--<span ng-bind="statistics.sumPriceRMBNT | number"></span>-->
+							<span ng-bind="statistics.sumPriceRMBNT | number"></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 ng-bind="start27 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">手机UU用户数:</span>
                         <span class="col-sm-6">
-							<!--<span ng-bind="statistics.sumPriceRMBNT | number"></span>-->
+							<span ng-bind="start31 | number"></span>
 						</span>
                     </div>
                 </div>
@@ -219,7 +219,7 @@
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计RMB:</span>
+                        <span class="col-sm-6 text-right">未税金额合计(RMB):</span>
                         <span class="col-sm-6 text-num">¥
 							<span ng-bind="start15 | number"></span>
 						</span>
@@ -297,11 +297,11 @@
                 <div class="col-sm-2 f14">
                     <div class="form-group row title">
                         <span class="col-sm-8 text-right">新增用户数:</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-4" ng-bind="(newAddUserSpaceData.b2b + newAddUserSpaceData.mall + newAddUserData.mall) | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-8 text-right">B2B新增用户数:</span>
-                        <span class="col-sm-4" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-4" ng-bind="newAddUserSpaceData.b2b | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-8 text-right">商城新增企业用户数:</span>

+ 5 - 3
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -963,7 +963,7 @@
                     <th width="245">品牌/物料名称</th>
                     <th width="245">型号/规格</th>
                     <th width="110">采购数量(PCS)</th>
-                    <th width="130">剩余时间</th>
+                    <th width="130">截至日期</th>
                     <th width="90">操作</th>
                 </tr>
             </thead>
@@ -975,7 +975,8 @@
                                 <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
                                 <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
                             </div>
-                            <div class="date-bottom-item" ng-bind="seek.reDate | date:'yyyy-MM-dd HH:mm'"></div>
+                            <div ng-if="vendorType == 'noOppor'" class="date-bottom-item" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></div>
+                            <div ng-if="vendorType != 'noOppor'" class="date-bottom-item" ng-bind="seek.reDate | date:'yyyy-MM-dd HH:mm'"></div>
                         </div>
                     </td>
                     <td>
@@ -1004,7 +1005,8 @@
                             </div>
                         </div>
                     </td>
-                    <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
+                    <!--<td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>-->
+                    <td class="left-time" ng-if="seek.remainingTime > 0" ng-bind="seek.endDate | date:'yyyy-MM-dd'"></td>
                     <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                     <td class="left-time" ng-if="seek.remainingTime == null"><span>-</span></td>
                     <td class="operate">