发布测试版 2.5.0

app/Gdoo/Order/views/order/create.blade.php

@@ -7,16 +7,6 @@
 
     @if(is_customer())
     @else
-        <a href="javascript:promotionDialog();" class="btn btn-sm btn-default">
-            促销
-            <span class="badge badge-sm bg-danger" id="promotion_count">0</span>
-        </a>
-
-        <a href="javascript:costDialog();" class="btn btn-sm btn-default">
-            费用
-            <span class="badge badge-sm bg-danger" id="cost_count">0</span>
-        </a>
-
         <a href="javascript:orderDialog();" class="btn btn-sm btn-default">
             未发货订单
         </a>
@@ -65,15 +55,6 @@ var form_action = '{{$action}}';
         }, 'json');
     }
 
-    function get_cost_count(id) {
-        $.get(app.url('promotion/promotion/useCount'), {customer_id: id}, function (res) {
-            $('#promotion_count').text(res.data);
-        }, 'json');
-        $.get(app.url('customerCost/cost/useCount'), {customer_id: id}, function (res) {
-            $('#cost_count').text(res.data);
-        }, 'json');
-    }
-
     function get_customer_tax(customer_id, tax_id) {
         $.post(app.url('customer/tax/dialog'), {customer_id: customer_id}, function (res) {
             var html = '<option value=""> - </option>';
@@ -91,7 +72,6 @@ var form_action = '{{$action}}';
         var tax_id = "{{$row['tax_id']}}";
         get_customer_tax(customer_id, tax_id);
         serviceCustomerMoney(tax_id);
-        get_cost_count(customer_id);
     }
 
     gdoo.event.set('customer_order.customer_id', {
@@ -108,7 +88,6 @@ var form_action = '{{$action}}';
                 $('#customer_order_warehouse_tel').val(row.warehouse_tel);
                 var $option = $('<option selected>'+ row.warehouse_address + '</option>').val(row.warehouse_address);
                 $('#customer_order_warehouse_address').html($option).trigger('change');
-                get_cost_count(row.id);
                 get_customer_tax(row.id);
                 return true;
             }

app/Gdoo/Order/views/report/category.blade.php

@@ -16,99 +16,6 @@
         
     </div>
 
-    <script src="{{$asset_url}}/vendor/highcharts/highcharts.min.js" type="text/javascript"></script>
-    <script type="text/javascript">
-    var data = {{$json}};
-    $(function() {
-
-        Highcharts.getOptions().colors = Highcharts.map(Highcharts.getOptions().colors, function(color) {
-            return {
-                radialGradient: {cx:0.9,cy:0.9,r: 0.9},
-                stops: [
-                    [0, color],
-                    [1, Highcharts.Color(color).brighten(-0.1).get('rgb')] // darken
-                ]
-            };
-        });
-
-        $.each(data.pie,function(year)
-        {
-            var piediv = "<div id='container_pie_"+year+"' style='height:300px;'></div>";
-            var columndiv = "<div id='container_column_"+year+"' style='height:300px;'></div>";
-            $('#container_pie').append(piediv);
-            $('#container_column').append(columndiv);
-            pie(year);
-            column(year);
-        });
-    });
-
-    function pie(year)
-    {
-        $('#container_pie_'+year).highcharts({
-            chart: {
-                plotBackgroundColor: null,
-                plotBorderWidth: null,
-                plotShadow: false
-            },
-            title: {
-                text: year+'年品类构成分析(金额)'
-            },
-            tooltip: {
-              pointFormat: '{series.name}: <b>{point.y}￥</b>'
-            },
-            plotOptions: {
-                pie: {
-                    allowPointSelect: true,
-                    cursor: 'pointer',
-                    dataLabels: {
-                        enabled: true,
-                        format: '<b>{point.name}</b>: {point.percentage:.1f} %'
-                    }
-                }
-            },
-            series: [{
-                type: 'pie',
-                name: '金额',
-                data: data.pie[year]
-            }]
-        });
-    }
-
-    function column(year)
-    {
-        $('#container_column_'+year).highcharts({
-            chart: {
-                type: 'column'
-            },
-            title: {
-                text: year+'年品类销售额柱体分析(金额)'
-            },
-            xAxis: {
-                categories: data.column.categories
-            },
-            yAxis: {
-                allowDecimals: false,
-                min: 0,
-                title: {
-                    text: '类别'
-                }
-            },
-            tooltip: {
-                formatter: function() {
-                    return '<b>'+ this.x +'</b><br/>'+
-                        this.series.name +': '+ this.y +'<br/>'+
-                        '合计: '+ this.point.stackTotal;
-                }
-            },
-            plotOptions: {
-                column: {
-                    stacking: 'normal'
-                }
-            },
-            series:data.column.series[year]
-        });
-    }
-    </script>
 
     <table class="table table-bordered" id="report_category">
         <tr>
@@ -171,17 +78,107 @@
 </div>
 
 <div class="panel">
-    <table class="table">
-        <tr>
-            <td id="container_pie"></td>
-        </tr>
-    </table>
+    <div class="panel-heading b-b">品类销售额(占比)</div>
+    <div class="panel-body">
+        <div id="container_pie"></div>
+    </div>
 </div>
 
 <div class="panel">
-    <table class="table">
-        <tr>
-            <td id="container_column"></td>
-        </tr>
-    </table>
-</div>
+<div class="panel-heading b-b">品类月销售额</div>
+    <div class="panel-body">
+        <div id="container_column"></div>
+    </div>
+</div>
+
+<script src="{{$asset_url}}/vendor/echarts/echarts.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+var data = {{$json}};
+$(function() {
+    $.each(data.pie,function(year) {
+        var piediv = "<div class='col-sm-3 col-xs-6' id='container_pie_"+year+"' style='height:240px;'></div>";
+        var columndiv = "<div class='col-sm-6 col-xs-12' id='container_column_"+year+"' style='height:280px;'></div>";
+        $('#container_pie').append(piediv);
+        $('#container_column').append(columndiv);
+        pie(year);
+        column(year);
+    });
+});
+
+function pie(year)
+{
+    var myChart = echarts.init(document.getElementById('container_pie_' + year));
+    myChart.setOption({
+        legend: {show:false},
+        tooltip: {
+            trigger: 'item',
+            formatter: '{c} ({d}%)'},
+        title: [{
+            text: year + '年',
+            left: '50%',
+            textAlign: 'center'
+        }],
+        dataset: {
+            source: data.pie[year]
+        },
+        series: [{
+            type: 'pie',
+            radius: '70%',
+            itemStyle: {
+                borderColor: '#fff',
+                borderWidth: 1
+            }
+        }]
+    });
+}
+
+function column(year)
+{
+    var myChart = echarts.init(document.getElementById('container_column_' + year));
+    myChart.setOption({
+        title: {
+            text: year + '年',
+            x:'center',
+            left:'50%',
+            textAlign:'center'
+        },
+        tooltip: {
+            trigger: 'axis',
+            transitionDuration: 0,
+        },
+        legend: {
+            left: "center",
+            bottom:"bottom",
+            align: "left",
+            textStyle: {
+                lineHeight: 16,
+                padding: 5, 
+                borderColor: "#999",
+                borderWidth: 1,
+                borderRadius: 5,
+            }
+        },
+        grid: {
+            left: '3%',
+            right: '3%',
+            bottom: '60',
+            containLabel: true
+        },
+        toolbox: {
+            feature: {
+                magicType: {type: ['line', 'bar']},
+                saveAsImage: {}
+            }
+        },
+        xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: data.column.categories,
+        },
+        yAxis: {
+            type: 'value'
+        },
+        series: data.column.series[year]
+    });
+}
+</script>

app/Gdoo/Order/views/report/index.blade.php

@@ -18,64 +18,10 @@
         
     </div>
 
-<script src="{{$asset_url}}/vendor/highcharts/highcharts.min.js" type="text/javascript"></script>
-<script type="text/javascript">
-var data = {{$json}};
-$(function () {
-    $('#container').highcharts({
-        title: {
-            text: '历史年度销售分析',
-            x: -20 //center
-        },
-        subtitle: {
-            text: 'Historical Annual Sales Analysis',
-            x: -20
-        },
-        xAxis: {
-            categories: data.categories
-        },
-        yAxis: {
-            title: {
-                text: '销售汇总'
-            },
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#808080'
-            }]
-        },
-        tooltip: {
-            valueSuffix: '￥'
-        },
-        legend: {
-            //layout: 'vertical',
-            //align: 'right',
-            //verticalAlign: 'middle',
-            //borderWidth: 0,
-            useHTML:true,
-            labelFormatter: function() {
-              return this.name + '<br/><span style="font-size:10px;color:#666666;">合计: '+ data.total[this.name] +'￥</span>';
-              //return '<div class="' + this.name + '-arrow"></div><span style="font-family: \'Advent Pro\', sans-serif; font-size:16px">' + this.name +'</span><br/><span style="font-size:10px; color:#ababaa">(合计: 12345)</span>';
-            }
-        },
-        plotOptions: {
-            line: {
-                dataLabels: {
-                    enabled: true
-                },
-                //enableMouseTracking: false
-            }
-        },
-        total: data.total,
-        series: data.series
-    });
-});
-</script>
-
     <table class="table">
     <tr>
     	<td>
-    		<div id="container" style="height:320px"></div>
+    		<div id="container" style="height:360px"></div>
     	</td>
     </tr>
     </table>
@@ -125,4 +71,61 @@ $(function () {
 </div>
 -->
 
-@endif
+@endif
+
+<script src="{{$asset_url}}/vendor/echarts/echarts.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+var data = {{$json}};
+$(function () {
+    var myChart = echarts.init(document.getElementById('container'));
+    myChart.setOption({
+        title: {
+            text: '历史年度销售金额',
+            subtext: "Historical Annual Sales",
+            x:'center',
+            y:'top',
+            textAlign:'center'
+        },
+        tooltip: {
+            trigger: 'axis',
+            transitionDuration: 0,
+        },
+        legend: {
+            formatter: function(key, avb) {
+                return key + "年\n" + data.total[key] + '￥';
+            },
+            left: "center",
+            bottom:"bottom",
+            align: "left",
+            textStyle: {
+                lineHeight: 16,
+                padding: 5, 
+                borderColor: "#999",
+                borderWidth: 1,
+                borderRadius: 5,
+            }
+        },
+        grid: {
+            left: '3%',
+            right: '3%',
+            bottom: '60',
+            containLabel: true
+        },
+        toolbox: {
+            feature: {
+                magicType: {type: ['line', 'bar']},
+                saveAsImage: {}
+            }
+        },
+        xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: data.categories,
+        },
+        yAxis: {
+            type: 'value'
+        },
+        series: data.series
+    });
+});
+</script>

app/Gdoo/Order/views/report/single.blade.php

@@ -24,7 +24,7 @@
             </select>
 
             &nbsp;年份
-            <input type="text" id="year" name="year" autocomplete="off" onclick="datePicker({dateFmt:'yyyy'});" value="{{$select['query']['year']}}" class="form-control input-sm">
+            <input type="text" id="year" name="year" onclick="datePicker({dateFmt:'yyyy'});" value="{{$select['select']['year']}}" class="form-control input-sm">
 
             <button type="submit" class="btn btn-default btn-sm">筛选</button>
         </form>

app/Gdoo/Order/views/widget/goods.blade.php

@@ -1,6 +1,6 @@
 <div class="wrapper-sm p-t-none">
     <div class="gdoo-list-grid">
-        <div id="order-goods-widget" class="ag-theme-balham" style="width:100%;height:200px;"></div>
+        <div id="widget-order-goods" class="ag-theme-balham" style="width:100%;height:200px;"></div>
     </div>
 </div>
 <script>
@@ -8,15 +8,15 @@
     function datetimeFormatter(params) {
         return format_datetime(params.value);
     }
-    var gridDiv = document.querySelector("#order-goods-widget");
+    var gridDiv = document.querySelector("#widget-order-goods");
     var options = new agGridOptions();
     options.remoteDataUrl = '{{url()}}';
     options.remoteParams = {};
     var columnDefs = [
         {suppressMenu: true, type:'sn', cellClass:'text-center', headerName: '序号', width: 60},
-        {suppressMenu: true, field: "sn", headerName: '编号', width: 160},
-        {suppressMenu: true, sortable: false, field: "name", headerName: '客户', width: 160},
-        {suppressMenu: true, sortable: false, field: "freight_arrival_date", headerName: '预计到货日期', width: 140},
+        {suppressMenu: true, field: "sn", cellClass:'text-center', headerName: '订单编号', width: 160},
+        {suppressMenu: true, sortable: false, cellClass:'text-center', field: "name", headerName: '客户名称', width: 160},
+        {suppressMenu: true, sortable: false, cellClass:'text-center', field: "freight_arrival_date", headerName: '预计到货日期', width: 140},
     ];
     options.columnDefs = columnDefs;
     options.onRowDoubleClicked = function (params) {

app/Gdoo/Order/views/widget/orderCount.blade.php

@@ -1,15 +0,0 @@
-<div class="panel panel-shadow info-skin1">
-    <div class="info-l hidden-xs" style="background-color:{{$info['color']}}">
-        <i class="fa fa-2x {{$info['icon']}}"></i>
-    </div>
-    <div class="info-c">
-        <div class="info-name">{{$info['name']}}</div>
-        <a href="javascript:;" data-toggle="addtab" data-url="{{$info['more_url']}}" data-id="{{str_replace(['/', '?', '='], ['_', '_', '_'], $info['more_url'])}}" data-name="{{$info['name']}}">
-            <div class="text-info info-item" data-id="{{$info['id']}}" data-more_url="{{$info['more_url']}}">{{$res['count']}}</div>
-        </a>
-    </div>
-    <div class="info-r">
-        <div>比{{$dates[$info['params']['date']]}}</div>
-        <div class="rate @if($res['rate'] > 100) red @endif">{{$res['rate']}}%</div>
-    </div>
-</div>