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

sth

Browse Source
This commit is contained in:
xman 2025-04-12 20:08:12 +08:00
parent 8424126ffd
commit 02cd6b94c7
4 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/orders/Review.php
View File

@ -46,11 +46,11 @@ class Review extends Backend
* @return string * @return string
* @throws \think\Exception * @throws \think\Exception
*/ */
public function add() public function edit($ids=null)
{ {
if (false === $this->request->isPost()) { if (false === $this->request->isPost()) {
$ids = $this->request->request('ids'); //$ids = $this->request->request('ids');
if(empty($ids)){ if(empty($ids)){
$this->error('参数错误'); $this->error('参数错误');

3
application/admin/controller/orders/Revisitorder.php
View File

@ -5,6 +5,7 @@ namespace app\admin\controller\orders;
use app\admin\model\Order; use app\admin\model\Order;
use app\admin\model\OrderReview; use app\admin\model\OrderReview;
use app\common\controller\Backend; use app\common\controller\Backend;
use think\Collection;
/** /**
* 订单列管理 * 订单列管理
@ -68,7 +69,7 @@ class Revisitorder extends Backend
} }
if(!empty($reviewIds)){ if(!empty($reviewIds)){
$reviews = OrderReview::whereIn('id',$reviewIds)->select()->toArray(); $reviews = collection(OrderReview::whereIn('id',$reviewIds)->select())->toArray();
$reviews = array_column($reviews,null,'id'); $reviews = array_column($reviews,null,'id');
} }

55
application/admin/view/orders/review/edit.html
View File

@ -1,47 +1,62 @@
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<input name="row[order_id]" type="hidden" value="{$order.id}">
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('订单号')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}"> <input id="c-order_no" readonly class="form-control" type="text" value="{$order.order_no|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('服务项目')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-item_title" readonly class="form-control" type="text" value="{$order.item_title|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Worker_id')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('服务详情')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-worker_id" data-rule="required" data-source="worker/index" class="form-control selectpage" name="row[worker_id]" type="text" value="{$row.worker_id|htmlentities}"> <input id="c-detail" readonly class="form-control" type="text" value="{$order.detail|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('客户姓名')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-customer"readonly class="form-control" type="text" value="{$order.customer|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('客户电话')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-tel" readonly class="form-control" name="row[tel]" type="text" value="{$order.tel|htmlentities}">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pt_star')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Pt_star')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-pt_star" data-rule="required" class="form-control" name="row[pt_star]" type="number" value="{$row.pt_star|htmlentities}"> <input id="c-pt_star" data-rule="required" class="form-control" min="1" max="5" step="1" name="row[pt_star]" type="number" value="5">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Worker_star')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Worker_star')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-worker_star" data-rule="required" class="form-control" name="row[worker_star]" type="number" value="{$row.worker_star|htmlentities}"> <input id="c-worker_star" data-rule="required" min="1" max="5" step="1" class="form-control" name="row[worker_star]" type="number" value="5">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}"> <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Admin_user')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-admin_user" class="form-control" name="row[admin_user]" type="text" value="{$row.admin_user|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{$row.create_time}">
</div> </div>
</div> </div>
<div class="form-group layer-footer"> <div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label> <label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">

33
public/assets/js/backend/orders/revisitorder.js
View File

@ -7,7 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
extend: { extend: {
index_url: 'orders/revisitorder/index' + location.search, index_url: 'orders/revisitorder/index' + location.search,
// add_url: 'orders/revisitorder/add', // add_url: 'orders/revisitorder/add',
edit_url: 'orders/revisitorder/edit', //edit_url: 'orders/revisitorder/edit',
// del_url: 'orders/revisitorder/del', // del_url: 'orders/revisitorder/del',
multi_url: 'orders/revisitorder/multi', multi_url: 'orders/revisitorder/multi',
import_url: 'orders/revisitorder/import', import_url: 'orders/revisitorder/import',
@ -31,17 +31,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// {checkbox: true}, // {checkbox: true},
{field: 'id', title: __('Id')}, {field: 'id', title: __('Id')},
{field: 'order_no', title: __('Order_no'), operate: 'LIKE'}, {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
{field: 'customer', title: __('Customer'), operate: 'LIKE'},
{field: 'tel', title: __('Tel'), operate: 'LIKE'},
// {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status}, // {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status},
// {field: 'area_id', title: __('Area_id'), operate: 'LIKE'}, // {field: 'area_id', title: __('Area_id'), operate: 'LIKE'},
{field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'}, // {field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'},
{field: 'source', title: __('Source')}, // {field: 'source', title: __('Source')},
{field: 'item_title', title: __('Item_title'), operate: 'LIKE'}, {field: 'item_title', title: __('Item_title'), operate: 'LIKE'},
{field: 'detail', title: __('Detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'detail', title: __('Detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'customer', title: __('Customer'), operate: 'LIKE'},
{field: 'tel', title: __('Tel'), operate: 'LIKE'},
{field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
// {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, // {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
@ -61,8 +62,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// {field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, // {field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
// {field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, // {field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
// {field: 'audit_admin_id', title: __('Audit_admin_id')}, // {field: 'audit_admin_id', title: __('Audit_admin_id')},
{field: 'review.pt_star', title: __('Review.pt_star')},
{field: 'review.worker_star', title: __('Review.worker_star')},
{field: 'review.remark', title: __('回访备注'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'review.admin_user', title: __('Review.admin_user'), operate: 'LIKE'},
{field: 'review.create_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{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:'RANGE', addclass:'datetimerange', autocomplete:false}, // {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
// {field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, // {field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
// {field: 'dispatch_type', title: __('Dispatch_type')}, // {field: 'dispatch_type', title: __('Dispatch_type')},
// {field: 'receive_type', title: __('Receive_type')}, // {field: 'receive_type', title: __('Receive_type')},
@ -72,21 +80,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// {field: 'review.id', title: __('Review.id')}, // {field: 'review.id', title: __('Review.id')},
//{field: 'review.order_id', title: __('Review.order_id')}, //{field: 'review.order_id', title: __('Review.order_id')},
// {field: 'review.worker_id', title: __('Review.worker_id')}, // {field: 'review.worker_id', title: __('Review.worker_id')},
{field: 'review.pt_star', title: __('Review.pt_star')},
{field: 'review.worker_star', title: __('Review.worker_star')},
{field: 'review.remark', title: __('回访备注'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
//{field: 'review.admin_id', title: __('Review.admin_id')}, //{field: 'review.admin_id', title: __('Review.admin_id')},
{field: 'review.admin_user', title: __('Review.admin_user'), operate: 'LIKE'},
{field: 'review.create_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
//formatter: Table.api.formatter.operate, formatter: Table.api.formatter.operate,
buttons:[ buttons:[
{ {
name: 'addreview', name: 'addreview',
text:"回访", text:"回访",
title:"填写回访信息", title:"填写回访信息",
icon: 'fa fa-list', icon: 'fa fa-pencil',
url: 'orders/review/add', url: 'orders/review/edit',
extend: 'data-toggle="tooltip" data-container="body"', extend: 'data-toggle="tooltip" data-container="body"',
classname: 'btn btn-xs btn-info btn-dialog', classname: 'btn btn-xs btn-info btn-dialog',
visible:function(row){ visible:function(row){