diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index 22d3deb..e65a385 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -85,6 +85,7 @@ class Dispatch2 extends Backend if(!in_array($row->status, $this->model->btnActiveStatusList('btn_record')) ){ $row->follow = 2; + OrderDispatch::where('id',$row->id)->update(['follow'=>2]); } if($row->btn_record){ if($row->type == 2) diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index 9aa54b6..ce7c23d 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/public/assets/js/backend/orders/dispatch2.js @@ -90,6 +90,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, return value; } }}, + + {field: 'worker_remark', title: __('师傅备注'), operate: false}, { field: 'is_finish_today', title: '今日完成', @@ -216,7 +218,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, dropdown: "更多", visible: function (row) { - if (row.orderb.status >= 0 && row.orderb.status < 60 && row.status >0) { + if (row.orderb.status >= 0 && row.orderb.status < 60 && row.status >0 && row.status < 60) { return true; } return false; @@ -235,7 +237,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, refresh:true, dropdown: "更多", visible: function (row) { - if (row.orderb.status != 60 && row.status > 0) { + if (row.orderb.status != 60 && row.status > 0 && row.status < 60) { return true; } return false; diff --git a/public/assets/js/backend/statistics/dispatcher.js b/public/assets/js/backend/statistics/dispatcher.js index a5b6b76..129796f 100644 --- a/public/assets/js/backend/statistics/dispatcher.js +++ b/public/assets/js/backend/statistics/dispatcher.js @@ -162,6 +162,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t })) }; barChart.setOption(option); + // 监听窗口大小变化,自动重新绘制图表 + window.addEventListener('resize', function () { + barChart.resize(); + }); }, error: function () { console.error("图表数据加载失败"); @@ -169,9 +173,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t }); } - - - var form = $("#chart-filter"); var ranges = {}; ranges[__('Today')] = [Moment().startOf('day'), Moment().endOf('day')];