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

合同状态设置bug修正

Browse Source
This commit is contained in:
hdm 2022-08-03 16:51:26 +08:00
parent 727b9d2d09
commit c264c5cc88
6 changed files with 75 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ class Api extends BaseController
} }
} }
//审核等操作 //状态改变等操作
public function check() public function check()
{ {
if (request()->isPost()) { if (request()->isPost()) {

2
app/contract/view/index/archive.html
View File

@ -51,7 +51,7 @@
title: '编号', title: '编号',
align: 'center', align: 'center',
width: 80 width: 80
},{ field: 'status', title: '状态', align: 'center', width: 70, templet: function (d) { },{ field: 'status', title: '状态', align: 'center', width: 80, templet: function (d) {
var html = '<span class="layui-btn layui-btn-xs layui-bg-' + d.status + '">' + d.status_name + '</span>'; var html = '<span class="layui-btn layui-btn-xs layui-bg-' + d.status + '">' + d.status_name + '</span>';
return html; return html;
} }

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

@ -67,7 +67,7 @@
title: '编号', title: '编号',
align: 'center', align: 'center',
width: 80 width: 80
},{ field: 'check_status', title: '状态', align: 'center', width: 70, templet: function (d) { },{ field: 'check_status', title: '状态', align: 'center', width: 80, templet: function (d) {
var html = '<span class="layui-btn layui-btn-xs layui-bg-' + d.check_status + '">' + d.status_name + '</span>'; var html = '<span class="layui-btn layui-btn-xs layui-bg-' + d.check_status + '">' + d.status_name + '</span>';
return html; return html;
} }

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

@ -252,39 +252,41 @@ html{background-color:#fff;}
{eq name="$detail.check_status" value="1" } {eq name="$detail.check_status" value="1" }
{include file="/index/view_step" /} {include file="/index/view_step" /}
{/eq} {/eq}
<div class="py-4">
{gt name="$auth" value="0"} {gt name="$auth" value="0"}
{eq name="$detail.check_status" value="2" } {eq name="$detail.check_status" value="2" }
<div class="py-4"> {eq name="$detail.archive_status" value="1" }
{eq name="$detail.archive_status" value="1" } <span class="layui-btn layui-btn-danger" data-event="archive" data-status="0">反确认归档</span>
<span class="layui-btn layui-btn-danger" data-event="archive" data-status="0">反确认归档</span> {else/}
{else/} <span class="layui-btn layui-btn-normal" data-event="archive" data-status="1">合同归档</span>
<span class="layui-btn layui-btn-normal" data-event="archive" data-status="1">合同归档</span> <span class="layui-btn layui-btn-danger" data-event="check" data-status="0">反确认审核</span>
<span class="layui-btn layui-btn-danger" data-event="check" data-status="0">反确认审核</span> {/eq}
{/eq} {/eq}
</div> {eq name="$detail.check_status" value="5" }
{/eq} <div class="py-2">
<span class="layui-btn layui-btn-danger" data-event="check" data-status="0">反中止合同</span>
{eq name="$detail.check_status" value="5" } </div>
<div class="p-4" style="text-align:center;"> {/eq}
<span class="layui-btn layui-btn-danger" data-event="check" data-status="0">反中止合同</span>
</div> {eq name="$detail.check_status" value="6" }
{/eq} <div class="py-2">
<span class="layui-btn layui-btn-danger" data-event="check" data-status="0">反作废合同</span>
{eq name="$detail.check_status" value="6" } </div>
<div class="p-4" style="text-align:center;"> {/eq}
<span class="layui-btn layui-btn-danger" data-event="check" data-status="0">反作废合同</span> {/gt}
</div> {if ( $detail.check_status eq 3) AND ( $is_create_admin eq 1) }
{/eq} <span class="layui-btn layui-btn-primary check_back"><i class="layui-icon layui-icon-reduce-circle"></i> 撤回</span>
{/gt} {/if}
{if ( $detail.check_status eq 4) AND ( $is_create_admin eq 1) }
<a class="layui-btn" href="/finance/invoice/add?id={$detail.id}">重新编辑</a>
{/if}
</div>
</div> </div>
<div class="layui-tab-item"> <div class="layui-tab-item">
{include file="/index/view_log" /} {include file="/index/view_log" /}
</div> </div>
</div> </div>
</div> </div>
</form> </form>
{/block} {/block}
<!-- /主体 --> <!-- /主体 -->
@ -364,19 +366,11 @@ const moduleInit = ['tool','employeepicker'];
title = '确定要反确认该合同的审核?'; title = '确定要反确认该合同的审核?';
action = 'check_refue'; action = 'check_refue';
} }
if(contract_status == 0 && status == 3){ if(contract_status == 5 && status == 0){
title = '确定要中止该合同?';
action = 'stop_ok';
}
if(contract_status == 3 && status == 0){
title = '确定要反中止该合同?'; title = '确定要反中止该合同?';
action = 'stop_no'; action = 'stop_no';
} }
if(contract_status == 0 && status == 4){ if(contract_status == 6 && status == 0){
title = '确定要作废该合同?';
action = 'void_ok';
}
if(contract_status == 4 && status == 0){
title = '确定要反作废该合同?'; title = '确定要反作废该合同?';
action = 'void_no'; action = 'void_no';
} }
@ -391,37 +385,14 @@ const moduleInit = ['tool','employeepicker'];
location.reload(); location.reload();
},2000) },2000)
} }
tool.post("/contract/api/check", {id: contract_id,check_status:status,mark:''}, callback);
if(status == 3 || status == 4){
layer.open({
type: 1,
title: '请输入原因或理由',
area: ['800px', '360px'],
content: '<div style="padding:5px;"><textarea class="layui-textarea" id="remarkTextarea" style="width: 100%; height: 240px;"></textarea></div>',
btnAlign: 'c',
btn: ['提交保存'],
yes: function () {
let remark = $("#remarkTextarea").val();
if (remark != '') {
tool.post("/contract/api/check", {id: contract_id,check_status:status,mark:remark}, callback);
} else {
layer.msg('请输入原因或理由');
}
}
})
}
else{
tool.post("/contract/api/check", {id: contract_id,check_status:status,mark:''}, callback);
}
layer.close(index); layer.close(index);
}); });
}); });
$('body').on('click','[data-event="archive"]',function(){ $('body').on('click','[data-event="archive"]',function(){
let status = $(this).data('status'); let status = $(this).data('status');
let title = '合同归档后将不能进行任何数据操作，确定要提交归档?'; layer.confirm('合同归档后将不能进行任何数据操作，确定要提交归档?', {
layer.confirm(title, {
icon: 3, icon: 3,
title: '提示' title: '提示'
}, function(index) { }, function(index) {
@ -438,6 +409,35 @@ const moduleInit = ['tool','employeepicker'];
}) })
$('body').on('click','.check_back',function(){
layer.prompt({
formType: 2,
title: '请输入撤回理由',
area: ['500px', '120px'] //自定义文本域宽高
}, function(value, index, elem){
$.ajax({
url: "/api/index/flow_check",
type:'post',
data:{
id:contract_id,
type:4,
check:3,
content:value
},
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
location.reload();
}
}
})
layer.close(index);
});
})
//删除附件 //删除附件
$('#fileList').on('click', '.btn-delete', function () { $('#fileList').on('click', '.btn-delete', function () {
var _id = $(this).data('id'); var _id = $(this).data('id');

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

@ -253,8 +253,8 @@ html{background-color:#fff;}
<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="3">中止合同</span> <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="4">作废合同</span> <span class="layui-btn layui-btn-danger" data-event="check" data-status="6">作废合同</span>
{/gt} {/gt}
</div> </div>
</div> </div>
@ -326,11 +326,11 @@ const moduleInit = ['tool','employeepicker'];
let status = $(this).data('status'); let status = $(this).data('status');
let action = ''; let action = '';
let title = '' let title = ''
if(contract_status == 0 && status == 3){ if(status == 5){
title = '确定要中止该合同?'; title = '确定要中止该合同?';
action = 'stop_ok'; action = 'stop_ok';
} }
if(contract_status == 0 && status == 4){ if(status == 6){
title = '确定要作废该合同?'; title = '确定要作废该合同?';
action = 'void_ok'; action = 'void_ok';
} }
@ -360,8 +360,7 @@ const moduleInit = ['tool','employeepicker'];
layer.msg('请输入原因或理由'); layer.msg('请输入原因或理由');
} }
} }
}) })
tool.post("/contract/api/check", {id: contract_id,check_status:status,mark:''}, callback);
layer.close(index); layer.close(index);
}); });
}); });

20
app/contract/view/index/view_step.html
View File

@ -52,21 +52,13 @@
<input type="hidden" name="check_step_sort" value="{$detail.check_step_sort}"> <input type="hidden" name="check_step_sort" value="{$detail.check_step_sort}">
<input type="hidden" name="check_status" value="{$detail.check_status}"> <input type="hidden" name="check_status" value="{$detail.check_status}">
<div id="formBtn" style="padding: 10px 0"> <div id="formBtn" style="padding: 10px 0">
{eq name="$detail.check_status" value='1'} {eq name="$is_check_admin" value='1'}
{eq name="$is_check_admin" value='1'} <span class="layui-btn layui-btn-normal" data-status="1"><i class="layui-icon layui-icon-ok"></i> 通过</span>
<span class="layui-btn layui-btn-normal" data-status="1"><i class="layui-icon layui-icon-ok"></i> 通过</span> <span class="layui-btn layui-btn-danger" data-status="2"><i class="layui-icon layui-icon-close"></i> {$flows.flow_type == 5?'回退':'拒绝'}</span>
<span class="layui-btn layui-btn-danger" data-status="2"><i class="layui-icon layui-icon-close"></i> {$flows.flow_type == 5?'回退':'拒绝'}</span> {/eq}
{/eq} {eq name="$is_create_admin" value='1'}
{eq name="$is_create_admin" value='1'} <span class="layui-btn layui-btn-primary" data-status="3"><i class="layui-icon layui-icon-reduce-circle"></i> 撤回</span>
<span class="layui-btn layui-btn-primary" data-status="3"><i class="layui-icon layui-icon-reduce-circle"></i> 撤回</span>
{/eq}
{/eq} {/eq}
{if ( $detail.check_status eq 3) AND ( $is_create_admin eq 1) }
<span class="layui-btn layui-btn-primary" data-status="3"><i class="layui-icon layui-icon-reduce-circle"></i> 撤回</span>
{/if}
{if ( $detail.check_status eq 4) AND ( $is_create_admin eq 1) }
<a class="layui-btn" href="/finance/invoice/add?id={$detail.id}">重新编辑</a>
{/if}
</div> </div>
<script> <script>
function flowStep(){ function flowStep(){