hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

发布测试版 2.5.0

Browse Source
This commit is contained in:
hawind
2021-11-28 12:06:10 +08:00
parent 672cc966db
commit 8408038188
807 changed files with 94347 additions and 47563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Order/Controllers/OrderController.php
+18 -6
View File
@@ -738,15 +738,27 @@ class OrderController extends WorkflowController
$print_type = $template['print_type'];
$this->layout = 'layouts.print_'.$print_type;
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
if ($print_type == 'stiReport') {
$data = OrderService::getPrintData($id);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
$print_data = [
'master' => [$data['master']],
'customer_order_data' => $data['rows'],
];
return $this->display([
'template' => $template,
'print_data' => $print_data,
]);
} else {
$tpl = $this->create('print');
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
$data = OrderService::getPrintData($id);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
} else {
$tpl = $this->create('print');
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
public function dialog()
app/Gdoo/Order/Controllers/ReportController.php
+24 -21
View File
@@ -38,7 +38,7 @@ class ReportController extends DefaultController
View::share('customer_type', $customer_type);
}
// 销售曲线图分析
// 销售曲线
public function index()
{
// 本年时间
@@ -190,6 +190,7 @@ class ReportController extends DefaultController
foreach ($years as $year => $months) {
if ($year > 0) {
$j['name'] = $year;
$j['type'] = 'line';
$j['data'] = [];
for ($i=1; $i <= 12; $i++) {
$i = sprintf("%02d", $i);
@@ -214,7 +215,7 @@ class ReportController extends DefaultController
]);
}
// 全国数据分类方法
// 商品分类
public function category()
{
$customer_type = Request::get('customer_type', 0);
@@ -415,18 +416,14 @@ class ReportController extends DefaultController
$percentData['sum'][$end_year] = $now_year_sum;
$percentData['sum'][$start_year] = $last_year_sum;
//饼图数据
$json = array();
// 饼图数据
$json = [];
if ($pieData) {
foreach ($pieData as $year => $category) {
$pie = array();
$pie = [];
foreach ($category as $category_id => $v) {
$title = $product_categorys[$category_id]['name'];
if (empty($pie)) {
$pie[] = array('name'=>$title,'y'=>$v,'sliced'=>true,'selected'=>true);
} else {
$pie[] = array($title,$v);
}
$pie[] = array($title, $v);
}
$json['pie'][$year] = $pie;
}
@@ -442,14 +439,19 @@ class ReportController extends DefaultController
if ($columnData) {
foreach ($columnData as $year => $category) {
for ($i=1; $i <= 12; $i++) {
$m = sprintf("%02d", $i);
$json['column']['categories'][] = $m.'月';
if (empty($json['column']['categories'])) {
for ($i=1; $i <= 12; $i++) {
$m = sprintf("%02d", $i);
$json['column']['categories'][] = $m.'月';
}
}
foreach ($category as $category_id => $months) {
$series = array();
$series = [];
$title = $product_categorys[$category_id]['name'];
$series['name'] = $title;
$series['type'] = 'line';
for ($i=1; $i <= 12; $i++) {
$m = sprintf("%02d", $i);
$series['data'][] = (int)$months[$m];
@@ -458,6 +460,7 @@ class ReportController extends DefaultController
}
}
}
$query = url().'?'.http_build_query($selects['query']);
$startTime = date('Y', strtotime($this->setting['setup_dt']));
@@ -478,7 +481,7 @@ class ReportController extends DefaultController
));
}
// 客户销售排序
// 客户销售排名
public function ranking()
{
// 客户名称
@@ -671,7 +674,7 @@ class ReportController extends DefaultController
));
}
// 单品查询
// 客户单品销售
public function single()
{
// 客户权限
@@ -815,7 +818,7 @@ class ReportController extends DefaultController
));
}
// 城市数据分析
// 区域销售品类
public function city()
{
// 当前年月日
@@ -1059,7 +1062,7 @@ class ReportController extends DefaultController
));
}
// 单品客户数据分析
// 单品客户销售
public function client()
{
$now_year = Request::get('year', date('Y'));
@@ -1241,7 +1244,7 @@ class ReportController extends DefaultController
));
}
// 客户数据分析
// 单品客户销售详情
public function clientdata()
{
$year = Request::get('year');
@@ -1416,7 +1419,7 @@ class ReportController extends DefaultController
}
/**
* 新客户分析
* 新客户
* 计算本年度有订单去年无订单为新客户
*/
public function newclient()
@@ -1543,7 +1546,7 @@ class ReportController extends DefaultController
}
/**
* 连续3个月未进货的客户
* 连续3个月未发货的客户
*/
public function stockmonth()
{
app/Gdoo/Order/Controllers/WidgetController.php
+2 -7
View File
@@ -3,9 +3,9 @@
use DB;
use Request;
use Auth;
use Gdoo\Index\Services\InfoService;
use Gdoo\Index\Controllers\DefaultController;
use Gdoo\Index\Services\InfoService;
class WidgetController extends DefaultController
{
@@ -267,11 +267,6 @@ class WidgetController extends DefaultController
'count2' => $count2,
'rate' => $rate,
];
return $this->render([
'dates' => $config['dates'],
'info' => $config['info'],
'res' => $res,
]);
return $this->json($res, true);
}
}
app/Gdoo/Order/Services/OrderService.php
+1 -1
View File
@@ -320,7 +320,7 @@ class OrderService
) sdd ON d.sale_data_id = sdd.sale_data_id
LEFT JOIN (SELECT product_id,
sum(isnull(ky_num, (0)::numeric)) AS ky_num
sum(isnull(ky_num, 0)) AS ky_num
FROM (".StockService::getStockSelectSql().") ss
WHERE (warehouse_name like '%成品%') AND warehouse_code <> '25'
GROUP BY product_id
app/Gdoo/Order/config.php
+2 -1
View File
@@ -29,7 +29,7 @@ return [
],
'widgets' => [
'widget_order_index' => [
'name' => '订单统计',
'name' => '销售订单统计',
'type' => 1,
'url' => 'order/widget/index',
'more_url' => 'order/order/index',
@@ -45,6 +45,7 @@ return [
'type' => 2,
'url' => 'order/widget/orderCount',
'more_url' => 'order/order/index',
'params' => ['permission' => 'dept2', 'date' => 'month'],
],
],
"controllers" => [
app/Gdoo/Order/views/order/create.blade.php
-21
View File
@@ -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
+101 -104
View File
@@ -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
+59 -56
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -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
-15
View File
@@ -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>