From 57caec1805c21f719e59fbd58d2e38437ab2b265 Mon Sep 17 00:00:00 2001 From: hant Date: Thu, 17 Apr 2025 23:05:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Order.php | 2 +- application/admin/view/order/add.html | 17 ++++- public/assets/js/backend/order.js | 71 +++++++++++++-------- public/assets/js/backend/orders/dispatch.js | 4 +- 4 files changed, 63 insertions(+), 31 deletions(-) diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index d138884..624463d 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -410,7 +410,7 @@ class Order extends Backend public function addAbnormal($ids = null){ if (false === $this->request->isPost()) { - $abnormals = model('abnormal')->order('sort','desc')->select(); + $abnormals = model('abnormal')->where('type',2)->order('sort','desc')->select(); $abnormals_data = []; foreach ($abnormals as $abnormal){ $abnormals_data [] = $abnormal->toArray(); diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html index 2708ba1..c3e3d3b 100644 --- a/application/admin/view/order/add.html +++ b/application/admin/view/order/add.html @@ -6,7 +6,6 @@
-
录入订单
@@ -56,8 +55,8 @@
@@ -249,6 +248,18 @@ .suggestion-item:hover { background-color: #f0f0f0; } + .control-label{ + text-align: right; + } + .col-xs-12{ + margin: 5px 0; + position: relative; + } + .msg-box{ + position: absolute; + left: 0; + top: 30px; + } diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 0ab76d6..436bc9b 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -67,19 +67,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function url: $.fn.bootstrapTable.defaults.extend.index_url, pk: 'id', sortName: 'id', - fixedColumns: true, + fixedRightNumber: 1, + fixedNumber: 3, + fixedColumns: true, columns: [ [ {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'user.nickname', title: '录单员'}, - {field: 'order_no', title: __('Order_no'), operate: 'LIKE'}, - {field: 'customer', title: __('Customer'), operate: 'LIKE'}, - {field: 'tel', title: __('Tel'), operate: 'LIKE'}, { field: 'status', title: __('Status'), + fixed:true, searchList: { "0": __('Status 0'), "10": __('Status 10'), @@ -95,6 +94,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function }, formatter: Table.api.formatter.status }, + { + field: 'dispatch_type', + title: '派单方式', + searchList: { + "1": '手动派单', + "2": '自动派单', + }, + formatter: Table.api.formatter.label + }, + {field: 'item_title', title: __('Item_title'), operate: 'LIKE'}, + + + {field: 'user.nickname', title: '录单员'}, + {field: 'order_no', title: __('Order_no'), operate: 'LIKE'}, + {field: 'customer', title: __('Customer'), operate: 'LIKE'}, + {field: 'tel', title: __('Tel'), operate: 'LIKE'}, {field: 'area.merge_name', title: __('Area_id')}, { field: 'address', @@ -105,15 +120,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function formatter: Table.api.formatter.content }, - { - field: 'dispatch_type', - title: '派单方式', - searchList: { - "1": '手动派单', - "2": '自动派单', - }, - formatter: Table.api.formatter.label - }, { field: 'receive_type', title: '收款方式', @@ -124,10 +130,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function formatter: Table.api.formatter.label }, + { + field: 'total', + title: '总收款', + formatter: Table.api.formatter.Text + }, + // {field: 'worker_id', title: __('Worker_id')}, {field: 'source_shop', title: __('Source')}, // {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'}, - {field: 'item_title', title: __('Item_title'), operate: 'LIKE'}, { field: 'detail', title: __('Detail'), @@ -179,7 +190,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function icon: 'fa fa-pencil', title: __('Edit'), extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs button-edit btn-editone', + classname: 'btn btn-xs btn-info btn-editone', }, { @@ -189,9 +200,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function text: "复制", url: 'order/copy', extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs button-copy btn-dialog', + classname: 'btn btn-dialog', callback: function ($data) { - console.log($data); + // console.log($data); }, dropdown: "更多" }, @@ -200,8 +211,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function text: "派单", title: "派单", extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs button-dispatch btn-dialog', - //classname:"btn-view btn-dialog", + classname: 'btn btn-xs btn-info btn-dialog', icon: 'fa fa-add', url: function (row) { return 'orders/dispatch/add?order_id=' + row.id; @@ -217,9 +227,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function { name: "reminder", text: "催单", - title: "派单", + title: "催单", extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs button-remind btn-magic btn-ajax', + classname: 'btn btn-ajax', icon: 'fa fa-bolt', url: 'order/reminder', dropdown: "更多", @@ -250,7 +260,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function text: "复制信息", title: "复制信息", extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs button-error btn-click', + classname: 'btn btn-xs btn-info btn-click', icon: 'fa fa-text', click: function (data, item) { const text = assembleOrderMessage(item); @@ -260,7 +270,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function name: 'delete', text: '取消', title: '取消', - classname: 'btn btn-xs button-cancel btn-dialog', + classname: 'btn btn-dialog', icon: 'fa fa-trash', url: 'order/delete', dropdown: "更多", @@ -271,11 +281,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function return false; }, }, + { + name:"error", + text:"订单报错", + title:"订单报错", + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-dialog', + icon: 'fa fa-bolt', + url: 'order/addAbnormal', + refresh:true, + dropdown: "更多", + }, { name: 'invoice', text: '申请开票', title: '申请开票', - classname: 'btn btn-xs button-cancel btn-dialog', + classname: 'btn btn-dialog', icon: 'fa fa-send', url: 'order/invoice/', dropdown: "更多", diff --git a/public/assets/js/backend/orders/dispatch.js b/public/assets/js/backend/orders/dispatch.js index b1745dc..497cc4d 100644 --- a/public/assets/js/backend/orders/dispatch.js +++ b/public/assets/js/backend/orders/dispatch.js @@ -193,12 +193,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer','cascader'], f // {checkbox: true}, {field: 'id', title: __('Id')}, {field: 'name', title: __('Name'), operate: 'LIKE'}, - {field: 'tel', title: __('Tel'), operate: 'LIKE'}, + {field: 'tel', title: '电话', operate: 'LIKE'}, // {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status}, //{field: 'area_id', title: __('Area_id')}, //{field: 'lng', title: __('Lng'), operate:'BETWEEN'}, //{field: 'lat', title: __('Lat'), operate:'BETWEEN'}, - {field: 'area.short_merge_name', title: __('Area.short_merge_name'), operate: 'LIKE'}, + {field: 'area.short_merge_name', title: '区域', operate: 'LIKE'}, // {field: 'deposit_amount', title: __('Deposit_amount'), operate:'BETWEEN'}, {field: 'id', title: '操作',formatter:function (id) { return `

选择

`;