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

地址

Browse Source
This commit is contained in:
xman 2025-06-16 21:21:46 +08:00
parent 802a14cda5
commit a02eaeb3a8
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/admin/controller/orders/Dispatch2.php
View File

@ -87,16 +87,18 @@ class Dispatch2 extends Backend
if(!in_array($row->status, $this->model->btnActiveStatusList('btn_record')) ){ if(!in_array($row->status, $this->model->btnActiveStatusList('btn_record')) ){
//正常情况，执行不到这里来，不用担心循环执行问题 //正常情况，执行不到这里来，不用担心循环执行问题
$row->follow = 2; if($row->follow != 2){
OrderDispatch::where('id',$row->id)->update(['follow'=>2]); $row->follow = 2;
OrderDispatch::where('id',$row->id)->update(['follow'=>2]);
}
} }
if($row->btn_record){ if($row->btn_record ){
if($row->follow == 2){
if($row->btn_record != 2){
$row->btn_record = true;
}else{
$row->btn_record = false; $row->btn_record = false;
} }
}
/*if($row->follow == 0 ){ /*if($row->follow == 0 ){
$row->btn_record = true; $row->btn_record = true;
@ -125,7 +127,7 @@ class Dispatch2 extends Backend
// } // }
// } // }
// } // }
}
// $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; // $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false;
if($row->status == -10){ //拒绝 if($row->status == -10){ //拒绝

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

@ -204,10 +204,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
extend: 'data-toggle="tooltip" data-container="body"', extend: 'data-toggle="tooltip" data-container="body"',
classname: 'btn btn-xs btn-warning btn-dialog', classname: 'btn btn-xs btn-warning btn-dialog',
visible:function(row){ visible:function(row){
if(row.btn_record){ /*if(row.btn_record){
return true; return true;
} }
return false; return false;*/
return row.btn_record;
} }
}, },