From 51a42a9b25d71d83c4a605aeda8ddd0abdf4f182 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Wed, 18 Jun 2025 12:00:10 +0800 Subject: [PATCH] sth --- .../admin/view/orders/dispatch2/edit.html | 32 +++++--- public/assets/js/backend/orders/dispatch2.js | 79 +++++++------------ 2 files changed, 50 insertions(+), 61 deletions(-) diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html index 0f6e174..f2a19d3 100644 --- a/application/admin/view/orders/dispatch2/edit.html +++ b/application/admin/view/orders/dispatch2/edit.html @@ -53,7 +53,7 @@ {notempty name ='action'} - +
@@ -82,19 +82,14 @@ -
- -
- -
-
+ {if $row['is_receipt']==0 }
- +
@@ -109,10 +104,17 @@ {if $row['is_receipt']==1 } +
+ +
+ +
+
+
- +
@@ -154,7 +156,7 @@
- +
@@ -209,7 +211,7 @@
- +
@@ -219,6 +221,14 @@
+ +
+ +
+ +
+
+
diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index 66ce7cc..42b7169 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/public/assets/js/backend/orders/dispatch2.js @@ -76,7 +76,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, } }, - //{field: 'order_id', title: __('Order_id')}, {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"25":__('Status 25'),"30":__('Status 30'),"60":__('Status 60'),"-10":__('Status -10'), //"-20":__('Status -20'), @@ -84,9 +83,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, formatter: Table.api.formatter.status, custom:{25:"red"} }, - //{field: 'follow', title: __('跟进状态'), searchList: {"0":__('待跟进'),"1":__('已跟进'),"2":__('已结束')}, formatter: Table.api.formatter.normal}, - // {field: 'worker_id', title: __('Worker_id')}, {field: 'worker_name', title: __('Worker_name'), operate: 'LIKE'}, {field: 'worker_tel', title: __('Worker_tel'), operate: 'LIKE'}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('自动')}, formatter: Table.api.formatter.normal @@ -135,20 +132,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, {field: 'arrive_time', title: __('上门时间'), operate:false, addclass:'datetimerange', autocomplete:false}, {field: 'arrive_image', title: __('上门照片'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, - // {field: 'estimated_finish_time', title: __('预估完成时间'), operate:false, addclass:'datetimerange', autocomplete:false}, - // - // {field: 'is_finish_today', title: __('预估时间能否完成'), operate:false,formatter: function(value, row, index) { - // if (value === 1) { - // return '能'; - // } else { - // return '不能'; - // } - // }}, - // - // {field: 'work_progress', title: __('进度'), operate:false}, - - // {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_user', title: __('Admin_user'), operate: 'LIKE'}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, //{field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false}, @@ -167,21 +150,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, align:'left', buttons: [ - /* { - name: 'edit', - text:"修改", - title:"", - icon: 'fa fa-pencil', - //title: __('Edit'), - extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs btn-info btn-editone', - visible:function(row){ - if(row.btn_edit){ - return true; - } - return false; - } - },*/ + { name: 'dispatchlog', text:"查看轨迹图", @@ -196,24 +165,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, return true; } }, - // { - // name: "dispatch", - // text: "派单", - // title: "派单", - // extend: 'data-toggle="tooltip" data-container="body"', - // classname: 'btn btn-xs btn-info btn-dialog', - // icon: 'fa fa-add', - // url: function (row) { - // return 'orders/dispatch/add?order_id=' + row.order_id; - // }, - // visible: function (row) { - // if (row.type == 2) { - // return true; - // } - // return false; - // }, - // refresh: true, - // }, + { name: 'addrecord', text:"跟进", @@ -459,6 +411,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, }, edit: function () { Controller.api.bindevent(); + + // 判断 #c-action 是否存在且有值 + const $action = $("#c-action"); + if ($action.length && $action.val()) { + + function calculatePerformance() { + const orderOnlineAmount = parseFloat($("#order-online-amount").val()) || 0; + const onlineAmountLast = parseFloat($("#c-online_total").val()) || 0; //线上尾款 + + const offlineAmount = parseFloat($("#c-total").val()) || 0; //线下尾款 + const cost = parseFloat($("#order-cost").val()) || 0; //成本 + const materialCost = parseFloat($("#order-material_cost").val()) || 0;//材料 + + const performance = (orderOnlineAmount + onlineAmountLast + offlineAmount) - (cost + materialCost); + + $("#c-performance").val(performance.toFixed(2)); + } + + ["c-online_total", "c-total", "order-cost", "order-material_cost"].forEach(function(id) { + $("#" + id).on("input", calculatePerformance); + }); + + // 页面加载时先算一次 + calculatePerformance(); + } + + }, finish: function () { Controller.api.bindevent();