From aec6d8fd5d031cd8efef553f90501ee92ebda050 Mon Sep 17 00:00:00 2001
From: "HDM58\\hdm58" <hdm58@qq.com>
Date: Thu, 14 Sep 2023 11:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=9C=A8=E6=9C=AA=E5=AE=A1=E6=A0=B8=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E4=B8=AD=E6=AD=A2=E3=80=81=E4=BD=9C=E5=BA=9F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/contract/controller/Api.php       |  4 ++--
 app/contract/model/Contract.php       |  2 +-
 app/contract/view/index/view.html     | 24 ++++++++++++------------
 app/contract/view/index/view_set.html |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

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"}
 			   <tr>
 				<td class="layui-td-gray">备注信息</td>
-				<td colspan="7">{$detail.remark}</td>
+				<td colspan="7">{$detail.remark|default=''}</td>
 			  </tr>
 			  {/notempty}
 				{notempty name="$detail.file_ids"}
@@ -149,9 +149,9 @@ html{background-color:#fff;}
 				<td class="layui-td-gray-2">合同状态</td>
 				<td><span class="layui-color-{$detail.check_status}">{$detail.status_name}</span></td>
 				<td class="layui-td-gray-2">录入人</td>
-				<td>{$detail.admin_name} </td>
+				<td>{$detail.admin_name|default=''} </td>
 				<td class="layui-td-gray-2">录入时间</td>
-				<td colspan="3">{$detail.create_time}</td>
+				<td colspan="3">{$detail.create_time|default=''}</td>
 			  </tr>		
 			{notempty name="$check_record"}
 			<tr>
@@ -175,7 +175,7 @@ html{background-color:#fff;}
 			{elseif ($detail.check_status == 0) OR ($detail.check_status == 4)}
 				{include file="/index/view_set" /}
 			{else /}
-			<table class="layui-table layui-table-form">
+			<table class="layui-table">
 				{eq name="$detail.check_status" value="2" }
 				  <tr>
 					<td class="layui-td-gray-2">归档状态</td>
@@ -184,9 +184,9 @@ html{background-color:#fff;}
 					{else/}
 					<td><span class="layui-color-{$detail.archive_status}">{$detail.archive_status_name}</span></td>
 					<td class="layui-td-gray-2">归档人</td>
-					<td>{$detail.archive_name} </td>
+					<td>{$detail.archive_name|default=''} </td>
 					<td class="layui-td-gray-2">归档时间</td>
-					<td colspan="3">{$detail.archive_time}</td>
+					<td colspan="3">{$detail.archive_time|default=''}</td>
 					{/eq}
 				  </tr>
 				{/eq}
@@ -194,26 +194,26 @@ html{background-color:#fff;}
 				{eq name="$detail.check_status" value="5" }
 				  <tr>
 					<td class="layui-td-gray-2">中止人</td>
-					<td>{$detail.stop_name} </td>
+					<td>{$detail.stop_name|default=''} </td>
 					<td class="layui-td-gray-2">中止时间</td>
-					<td colspan="5">{$detail.stop_time}</td>
+					<td colspan="5">{$detail.stop_time|default=''}</td>
 				  </tr>
 				  <tr>
 					<td class="layui-td-gray-2">中止备注</td>
-					<td colspan="7">{$detail.stop_remark}</td>
+					<td colspan="7">{$detail.stop_remark|default=''}</td>
 				  </tr>
 				{/eq}
 				
 				{eq name="$detail.check_status" value="6" }
 				  <tr>
 					<td class="layui-td-gray-2">作废人</td>
-					<td>{$detail.void_name} </td>
+					<td>{$detail.void_name|default=''} </td>
 					<td class="layui-td-gray-2">作废时间</td>
-					<td colspan="5">{$detail.void_time}</td>
+					<td colspan="5">{$detail.void_time|default=''}</td>
 				  </tr>
 				  <tr>
 					<td class="layui-td-gray-2">作废备注</td>
-					<td colspan="7">{$detail.void_remark}</td>
+					<td colspan="7">{$detail.void_remark|default=''}</td>
 				  </tr>
 				{/eq}			
 			</table>
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 @@
 	<a class="layui-btn" href="/contract/index/add/id/{$detail.id}">编辑合同</a>
 	{/eq}
 	{gt name="$auth" value="0"}
-	<span class="layui-btn layui-btn-warm" data-event="check" data-status="5">中止合同</span>
-	<span class="layui-btn layui-btn-danger" data-event="check" data-status="6">作废合同</span>
+	<span class="layui-btn layui-btn-warm" data-event="ctrl" data-status="5">中止合同</span>
+	<span class="layui-btn layui-btn-danger" data-event="ctrl" data-status="6">作废合同</span>
 	{/gt}
 </div>
 <script>
 	function init(form,tool) {		
-		$('body').on('click','[data-event="check"]',function(){
+		$('body').on('click','[data-event="ctrl"]',function(){
 			let status = $(this).data('status');
 			let action = '';
 			let title = ''