From 7405585a36dc2943c6e28c85fe00ca31c7893d10 Mon Sep 17 00:00:00 2001 From: hdm Date: Sat, 4 Mar 2023 00:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8=E6=92=A4?= =?UTF-8?q?=E9=94=80=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/contract/controller/Api.php | 3 +++ app/contract/model/Contract.php | 1 - app/contract/view/index/view.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/contract/controller/Api.php b/app/contract/controller/Api.php index 77f12c9..b930a99 100644 --- a/app/contract/controller/Api.php +++ b/app/contract/controller/Api.php @@ -106,6 +106,9 @@ class Api extends BaseController { if (request()->isPost()) { $param = get_params(); + if($param['check_status'] == 0){ + $param['check_step_sort'] = 0; + } if($param['check_status'] == 1){ $check_admin_ids = isset($param['check_admin_ids'])?$param['check_admin_ids']:''; $flow_data = set_flow($param['flow_id'],$check_admin_ids,$this->uid); diff --git a/app/contract/model/Contract.php b/app/contract/model/Contract.php index 814adb5..d9e21eb 100644 --- a/app/contract/model/Contract.php +++ b/app/contract/model/Contract.php @@ -64,7 +64,6 @@ class Contract extends Model $item->interval_time = date('Y-m-d', $item->start_time) . ' 至 ' . date('Y-m-d', $item->end_time); $item->type_name = self::$Type[(int)$item->type_a]; $item->status_name = self::$Status[(int)$item->check_status]; - $item->chack_status_name = self::$Status[(int) $item->CheckStatus]; $item->delay = countDays(date("Y-m-d"),date('Y-m-d', $item->end_time)); if($item->cost == 0){ $item->cost = '-'; diff --git a/app/contract/view/index/view.html b/app/contract/view/index/view.html index dd3995e..66c1290 100644 --- a/app/contract/view/index/view.html +++ b/app/contract/view/index/view.html @@ -301,7 +301,7 @@ html{background-color:#fff;} 撤回 {/if} {if ( $detail.check_status eq 4) AND ( $is_create_admin eq 1) } - 重新编辑 + 重新编辑 {/if}