hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跟进重构

Browse Source
This commit is contained in:
xman 2025-06-01 14:33:53 +08:00
parent ea2901e902
commit 6d69f99d5a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/controller/orders/Dispatch2.php
View File

@ -85,6 +85,7 @@ class Dispatch2 extends Backend
if(!in_array($row->status, $this->model->btnActiveStatusList('btn_record')) ){ if(!in_array($row->status, $this->model->btnActiveStatusList('btn_record')) ){
$row->follow = 2; $row->follow = 2;
OrderDispatch::where('id',$row->id)->update(['follow'=>2]);
} }
if($row->btn_record){ if($row->btn_record){
if($row->type == 2) if($row->type == 2)

6
public/assets/js/backend/orders/dispatch2.js
View File

@ -90,6 +90,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
return value; return value;
} }
}}, }},
{field: 'worker_remark', title: __('师傅备注'), operate: false},
{ {
field: 'is_finish_today', field: 'is_finish_today',
title: '今日完成', title: '今日完成',
@ -216,7 +218,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
dropdown: "更多", dropdown: "更多",
visible: function (row) { 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 true;
} }
return false; return false;
@ -235,7 +237,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
refresh:true, refresh:true,
dropdown: "更多", dropdown: "更多",
visible: function (row) { 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 true;
} }
return false; return false;

7
public/assets/js/backend/statistics/dispatcher.js
View File

@ -162,6 +162,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
})) }))
}; };
barChart.setOption(option); barChart.setOption(option);
// 监听窗口大小变化，自动重新绘制图表
window.addEventListener('resize', function () {
barChart.resize();
});
}, },
error: function () { error: function () {
console.error("图表数据加载失败"); console.error("图表数据加载失败");
@ -169,9 +173,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
}); });
} }
var form = $("#chart-filter"); var form = $("#chart-filter");
var ranges = {}; var ranges = {};
ranges[__('Today')] = [Moment().startOf('day'), Moment().endOf('day')]; ranges[__('Today')] = [Moment().startOf('day'), Moment().endOf('day')];