|
|
@@ -144,16 +144,19 @@ class MoneyBuyStr extends BaseModel {
|
|
|
|
|
|
|
|
|
$data[$i]->settle_status = $data[$i]->settle_status;
|
|
|
-
|
|
|
+ $string = 1;
|
|
|
if($data[$i]->status == 1){
|
|
|
if($data[$i]->settle_status == '未结算'){
|
|
|
$match_status = array();
|
|
|
for($j=0;$j<count($content);$j++){
|
|
|
if($data[$i]->batch_id == $content[$j]->batch_id){
|
|
|
- $match_status[] = $content[$j]->match_status;
|
|
|
+ //$match_status[] = $content[$j]->match_status;
|
|
|
+ if($content[$j]->match_status == 0 || $content[$j]->match_status == 1){
|
|
|
+ $string = 2;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- if(in_array(1,$match_status)){
|
|
|
+ if($string == 2){
|
|
|
$data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
|
|
|
}else{
|
|
|
$data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" lay-filter = "resettlement" uri="/admin/SoccerStringNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerStringNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
|
Jonlin