mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：合同协议在未审核前的中止、作废操作提示问题

Browse Source
This commit is contained in:
HDM58\hdm58 2023-09-14 11:57:46 +08:00
parent 580f3848f7
commit aec6d8fd5d
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/contract/controller/Api.php
View File

@ -164,12 +164,12 @@ class Api extends BaseController
$param['check_time'] = time(); $param['check_time'] = time();
$param['check_remark'] = $param['mark']; $param['check_remark'] = $param['mark'];
} }
if($param['check_status'] == 4){ if($param['check_status'] == 5){
$param['stop_uid'] = $this->uid; $param['stop_uid'] = $this->uid;
$param['stop_time'] = time(); $param['stop_time'] = time();
$param['stop_remark'] = $param['mark']; $param['stop_remark'] = $param['mark'];
} }
if($param['check_status'] == 5){ if($param['check_status'] == 6){
$param['void_uid'] = $this->uid; $param['void_uid'] = $this->uid;
$param['void_time'] = time(); $param['void_time'] = time();
$param['void_remark'] = $param['mark']; $param['void_remark'] = $param['mark'];

2
app/contract/model/Contract.php
View File

@ -106,7 +106,7 @@ class Contract extends Model
//作废信息 //作废信息
if($detail['void_uid'] > 0){ if($detail['void_uid'] > 0){
$detail['void_name'] = Db::name('Admin')->where(['id' => $detail['void_uid']])->value('name'); $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){ if($detail['archive_status'] == 1){

24
app/contract/view/index/view.html
View File

@ -93,7 +93,7 @@ html{background-color:#fff;}
{notempty name="$detail.remark"} {notempty name="$detail.remark"}
<tr> <tr>
<td class="layui-td-gray">备注信息</td> <td class="layui-td-gray">备注信息</td>
<td colspan="7">{$detail.remark}</td> <td colspan="7">{$detail.remark|default=''}</td>
</tr> </tr>
{/notempty} {/notempty}
{notempty name="$detail.file_ids"} {notempty name="$detail.file_ids"}
@ -149,9 +149,9 @@ html{background-color:#fff;}
<td class="layui-td-gray-2">合同状态</td> <td class="layui-td-gray-2">合同状态</td>
<td><span class="layui-color-{$detail.check_status}">{$detail.status_name}</span></td> <td><span class="layui-color-{$detail.check_status}">{$detail.status_name}</span></td>
<td class="layui-td-gray-2">录入人</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 class="layui-td-gray-2">录入时间</td>
<td colspan="3">{$detail.create_time}</td> <td colspan="3">{$detail.create_time|default=''}</td>
</tr> </tr>
{notempty name="$check_record"} {notempty name="$check_record"}
<tr> <tr>
@ -175,7 +175,7 @@ html{background-color:#fff;}
{elseif ($detail.check_status == 0) OR ($detail.check_status == 4)} {elseif ($detail.check_status == 0) OR ($detail.check_status == 4)}
{include file="/index/view_set" /} {include file="/index/view_set" /}
{else /} {else /}
<table class="layui-table layui-table-form"> <table class="layui-table">
{eq name="$detail.check_status" value="2" } {eq name="$detail.check_status" value="2" }
<tr> <tr>
<td class="layui-td-gray-2">归档状态</td> <td class="layui-td-gray-2">归档状态</td>
@ -184,9 +184,9 @@ html{background-color:#fff;}
{else/} {else/}
<td><span class="layui-color-{$detail.archive_status}">{$detail.archive_status_name}</span></td> <td><span class="layui-color-{$detail.archive_status}">{$detail.archive_status_name}</span></td>
<td class="layui-td-gray-2">归档人</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 class="layui-td-gray-2">归档时间</td>
<td colspan="3">{$detail.archive_time}</td> <td colspan="3">{$detail.archive_time|default=''}</td>
{/eq} {/eq}
</tr> </tr>
{/eq} {/eq}
@ -194,26 +194,26 @@ html{background-color:#fff;}
{eq name="$detail.check_status" value="5" } {eq name="$detail.check_status" value="5" }
<tr> <tr>
<td class="layui-td-gray-2">中止人</td> <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 class="layui-td-gray-2">中止时间</td>
<td colspan="5">{$detail.stop_time}</td> <td colspan="5">{$detail.stop_time|default=''}</td>
</tr> </tr>
<tr> <tr>
<td class="layui-td-gray-2">中止备注</td> <td class="layui-td-gray-2">中止备注</td>
<td colspan="7">{$detail.stop_remark}</td> <td colspan="7">{$detail.stop_remark|default=''}</td>
</tr> </tr>
{/eq} {/eq}
{eq name="$detail.check_status" value="6" } {eq name="$detail.check_status" value="6" }
<tr> <tr>
<td class="layui-td-gray-2">作废人</td> <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 class="layui-td-gray-2">作废时间</td>
<td colspan="5">{$detail.void_time}</td> <td colspan="5">{$detail.void_time|default=''}</td>
</tr> </tr>
<tr> <tr>
<td class="layui-td-gray-2">作废备注</td> <td class="layui-td-gray-2">作废备注</td>
<td colspan="7">{$detail.void_remark}</td> <td colspan="7">{$detail.void_remark|default=''}</td>
</tr> </tr>
{/eq} {/eq}
</table> </table>

6
app/contract/view/index/view_set.html
View File

@ -33,13 +33,13 @@
<a class="layui-btn" href="/contract/index/add/id/{$detail.id}">编辑合同</a> <a class="layui-btn" href="/contract/index/add/id/{$detail.id}">编辑合同</a>
{/eq} {/eq}
{gt name="$auth" value="0"} {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-warm" data-event="ctrl" data-status="5">中止合同</span>
<span class="layui-btn layui-btn-danger" data-event="check" data-status="6">作废合同</span> <span class="layui-btn layui-btn-danger" data-event="ctrl" data-status="6">作废合同</span>
{/gt} {/gt}
</div> </div>
<script> <script>
function init(form,tool) { function init(form,tool) {
$('body').on('click','[data-event="check"]',function(){ $('body').on('click','[data-event="ctrl"]',function(){
let status = $(this).data('status'); let status = $(this).data('status');
let action = ''; let action = '';
let title = '' let title = ''