From dd67cb9d1378d3bca985e64ff318e22c84f6f664 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Tue, 15 Apr 2025 17:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/view/orders/dispatchlog/index.html | 38 +++--- .../admin/view/orders/dispatchrecord/add.html | 36 +----- .../assets/js/backend/orders/dispatchlog.js | 121 +++++++++++++++--- 3 files changed, 122 insertions(+), 73 deletions(-) diff --git a/application/admin/view/orders/dispatchlog/index.html b/application/admin/view/orders/dispatchlog/index.html index 88e8e0d..a179e4e 100644 --- a/application/admin/view/orders/dispatchlog/index.html +++ b/application/admin/view/orders/dispatchlog/index.html @@ -1,29 +1,25 @@
- {:build_heading()} + +
+ + +
+
-
-
-
- - - -
- -
-
+
+ +
+
+
+ +
-
+
diff --git a/application/admin/view/orders/dispatchrecord/add.html b/application/admin/view/orders/dispatchrecord/add.html index a5a0f46..d35e0ed 100644 --- a/application/admin/view/orders/dispatchrecord/add.html +++ b/application/admin/view/orders/dispatchrecord/add.html @@ -1,14 +1,9 @@
- {notempty name='records'} -
- {/notempty} + - - -
@@ -34,37 +29,8 @@
- {notempty name='records'} -
- {/notempty} - {notempty name='records'} -
- - - - - - - - - - - - {volist name="records" id="item"} - - - - - - - - {/volist} - -
ID备忘内容通知状态时间
{$item.id}{$item.remark}{$item.need_notice_text}{$item.status_text}{$item.create_time}
-
- {/notempty}
diff --git a/public/assets/js/backend/orders/dispatchlog.js b/public/assets/js/backend/orders/dispatchlog.js index 06aefd9..a3b29c3 100644 --- a/public/assets/js/backend/orders/dispatchlog.js +++ b/public/assets/js/backend/orders/dispatchlog.js @@ -1,24 +1,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { var Controller = { - index: function () { - // 初始化表格参数配置 - Table.api.init({ - extend: { - index_url: 'orders/dispatchlog/index' + location.search, - // add_url: 'orders/dispatchlog/add', - // edit_url: 'orders/dispatchlog/edit', - // del_url: 'orders/dispatchlog/del', - multi_url: 'orders/dispatchlog/multi', - import_url: 'orders/dispatchlog/import', - table: 'order_dispatch_log', - } - }); + index: function () { + // 初始化表格参数配置 + Table.api.init(); + + //绑定事件 + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + var panel = $($(this).attr("href")); + if (panel.length > 0) { + Controller.table[panel.attr("id")].call(this); + $(this).on('click', function (e) { + $($(this).attr("href")).find(".btn-refresh").trigger("click"); + }); + } + //移除绑定的事件 + $(this).unbind('shown.bs.tab'); + }); + + //必须默认触发shown.bs.tab事件 + $('ul.nav-tabs li.active a[data-toggle="tab"]').trigger("shown.bs.tab"); + + + + // var table = $("#table"); + + - var table = $("#table"); // 初始化表格 - table.bootstrapTable({ + /*table.bootstrapTable({ url: $.fn.bootstrapTable.defaults.extend.index_url, pk: 'id', sortName: 'id', @@ -38,11 +49,87 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ] - }); + });*/ // 为表格绑定事件 - Table.api.bindevent(table); + //Table.api.bindevent(table); }, + + + + table: { + first: function () { + // 表格1 + var table1 = $("#table1"); + table1.bootstrapTable({ + url: 'orders/dispatchlog/index' + location.search, + toolbar: '#toolbar1', + sortName: 'id', + search: false, + commonSearch:false, + visible: false, + showToggle: false, + showColumns: false, + showExport: false, + columns: [ + [ + {field: 'id', title: __('Id')}, + // {field: 'dispatch_id', title: __('Dispatch_id')}, + //{field: 'order_id', title: __('Order_id')}, + //{field: 'worker_id', title: __('Worker_id')}, + // {field: 'status', title: __('Status')}, + {field: 'status_text', title: __('Status_text'), operate: 'LIKE'}, + {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table1, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格1绑定事件 + Table.api.bindevent(table1); + }, + second: function () { + // 表格2 + var table2 = $("#table2"); + table2.bootstrapTable({ + url: 'orders/dispatchrecord/index' + location.search, + /* extend: { + index_url: '', + add_url: '', + edit_url: '', + del_url: '', + multi_url: '', + table: '', + },*/ + toolbar: '#toolbar2', + sortName: 'id', + search: false, + commonSearch:false, + visible: false, + showToggle: false, + showColumns: false, + showExport: false, + columns: [ + [ + {field: 'id', title: __('Id')}, + //{field: 'dispatch_id', title: __('Dispatch_id')}, + //{field: 'worker_id', title: __('Worker_id')}, + {field: 'remark', title: __('跟进内容'), operate: 'LIKE', table: table2, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'need_notice', title: __('需要提醒'), searchList: {"0":__('否'),"1":__('是')}, formatter: Table.api.formatter.normal}, + {field: 'notice_time', title: __('提醒时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'status', title: __('状态'), searchList: {"0":__('未完成'),"1":__('已结束')}, formatter: Table.api.formatter.status}, + {field: 'create_time', title: __('创建时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + //{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + ] + ] + }); + // 为表格2绑定事件 + Table.api.bindevent(table2); + } + }, + + add: function () { Controller.api.bindevent(); },