diff --git a/app/contract/controller/Api.php b/app/contract/controller/Api.php index 92e80e9..b54949a 100644 --- a/app/contract/controller/Api.php +++ b/app/contract/controller/Api.php @@ -164,12 +164,12 @@ class Api extends BaseController $param['check_time'] = time(); $param['check_remark'] = $param['mark']; } - if($param['check_status'] == 4){ + if($param['check_status'] == 5){ $param['stop_uid'] = $this->uid; $param['stop_time'] = time(); $param['stop_remark'] = $param['mark']; } - if($param['check_status'] == 5){ + if($param['check_status'] == 6){ $param['void_uid'] = $this->uid; $param['void_time'] = time(); $param['void_remark'] = $param['mark']; diff --git a/app/contract/model/Contract.php b/app/contract/model/Contract.php index d9e21eb..54a294f 100644 --- a/app/contract/model/Contract.php +++ b/app/contract/model/Contract.php @@ -106,7 +106,7 @@ class Contract extends Model //作废信息 if($detail['void_uid'] > 0){ $detail['void_name'] = Db::name('Admin')->where(['id' => $detail['void_uid']])->value('name'); - $detail['voidtime'] = date('Y-m-d', $detail['void_time']); + $detail['void_time'] = date('Y-m-d', $detail['void_time']); } //归档信息 if($detail['archive_status'] == 1){ diff --git a/app/contract/view/index/view.html b/app/contract/view/index/view.html index 4898aa0..de6661d 100644 --- a/app/contract/view/index/view.html +++ b/app/contract/view/index/view.html @@ -93,7 +93,7 @@ html{background-color:#fff;} {notempty name="$detail.remark"}
归档状态 | @@ -184,9 +184,9 @@ html{background-color:#fff;} {else/}{$detail.archive_status_name} | 归档人 | -{$detail.archive_name} | +{$detail.archive_name|default=''} | 归档时间 | -{$detail.archive_time} | +{$detail.archive_time|default=''} | {/eq}|||||||
中止人 | -{$detail.stop_name} | +{$detail.stop_name|default=''} | 中止时间 | -{$detail.stop_time} | +{$detail.stop_time|default=''} | |||||||||
中止备注 | -{$detail.stop_remark} | +{$detail.stop_remark|default=''} | ||||||||||||
作废人 | -{$detail.void_name} | +{$detail.void_name|default=''} | 作废时间 | -{$detail.void_time} | +{$detail.void_time|default=''} | |||||||||
作废备注 | -{$detail.void_remark} | +{$detail.void_remark|default=''} |