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

Accept Merge Request #86: (feature/dgg -> develop)

Browse Source 
Merge Request: feat: 【后端API】后台跟进列表增加当前进度相关字段

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/86
This commit is contained in:
大狗哥 2025-05-30 14:16:28 +08:00 committed by Coding
commit e2d99f31c2
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
return value; return value;
} }
}}, }},
{
field: 'is_finish_today',
title: '今日完成',
searchList: {
'0':'不能',
"1": '能',
},
formatter: Table.api.formatter.label,
custom: {
'0': 'warning',
'1': 'success',
},
},
{field: 'estimated_finish_time', title: __('师傅预估完成时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'work_progress', title: __('当前施工进度'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
//{field: 'order.source_shop', title: __('Order.source_shop'), operate: '='}, //{field: 'order.source_shop', title: __('Order.source_shop'), operate: '='},
// {field: 'order.source', title: __('Order.source')}, // {field: 'order.source', title: __('Order.source')},
@ -109,21 +124,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
// {field: 'is_notice', title: __('Is_notice'), searchList: {"0":__('Is_notice 0'),"1":__('Is_notice 1')}, formatter: Table.api.formatter.normal}, // {field: 'is_notice', title: __('Is_notice'), searchList: {"0":__('Is_notice 0'),"1":__('Is_notice 1')}, formatter: Table.api.formatter.normal},
// {field: 'admin_id', title: __('Admin_id')}, // {field: 'admin_id', title: __('Admin_id')},
{
field: 'is_finish_today',
title: '今日完成',
searchList: {
'0':'不能',
"1": '能',
},
formatter: Table.api.formatter.label,
custom: {
'0': 'warning',
'1': 'success',
},
},
{field: 'estimated_finish_time', title: __('师傅预估完成时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'work_progress', title: __('当前施工进度'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'}, {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'},
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false},