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"} 备注信息 - {$detail.remark} + {$detail.remark|default=''} {/notempty} {notempty name="$detail.file_ids"} @@ -149,9 +149,9 @@ html{background-color:#fff;} 合同状态 {$detail.status_name} 录入人 - {$detail.admin_name} + {$detail.admin_name|default=''} 录入时间 - {$detail.create_time} + {$detail.create_time|default=''} {notempty name="$check_record"} @@ -175,7 +175,7 @@ html{background-color:#fff;} {elseif ($detail.check_status == 0) OR ($detail.check_status == 4)} {include file="/index/view_set" /} {else /} - +
{eq name="$detail.check_status" value="2" } @@ -184,9 +184,9 @@ html{background-color:#fff;} {else/} - + - + {/eq} {/eq} @@ -194,26 +194,26 @@ html{background-color:#fff;} {eq name="$detail.check_status" value="5" } - + - + - + {/eq} {eq name="$detail.check_status" value="6" } - + - + - + {/eq}
归档状态{$detail.archive_status_name} 归档人{$detail.archive_name} {$detail.archive_name|default=''} 归档时间{$detail.archive_time}{$detail.archive_time|default=''}
中止人{$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=''}
diff --git a/app/contract/view/index/view_set.html b/app/contract/view/index/view_set.html index 48d88dd..cfa1c08 100644 --- a/app/contract/view/index/view_set.html +++ b/app/contract/view/index/view_set.html @@ -33,13 +33,13 @@ 编辑合同 {/eq} {gt name="$auth" value="0"} - 中止合同 - 作废合同 + 中止合同 + 作废合同 {/gt}