elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/add_item' of wmtx/platform into master

Browse Source 
聚合汇总bug修正
master
万盟天下 4 years ago committed by Gogs
parent 11c02ca77e a2b085562d
commit 1cb13ebb4c
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File

9
Application/Admin/Controller/AggregateRelationController.class.php
Unescape Escape View File

@ -299,7 +299,7 @@ class AggregateRelationController extends AdminController
$dbres = $this->DBlogModel->field("id,status,verify_log")->where("id in ({$ids})")->select(); $dbres = $this->DBlogModel->field("id,status,verify_log")->where("id in ({$ids})")->select();
foreach($dbres as $k=>&$v){ foreach($dbres as $k=>&$v){
if($v['status'] != 1) continue; if($v['status'] != 1) continue;
$v['verify_log'] = json_decode($v['verify_log'],true); // $v['verify_log'] = json_decode($v['verify_log'],true);
$v['verify_log']['admin_user']=$this->admininfo["username"]; $v['verify_log']['admin_user']=$this->admininfo["username"];
$v['verify_log']['admin_time']=date("Y-m-d H:i:s"); $v['verify_log']['admin_time']=date("Y-m-d H:i:s");
$v['verify_log'] = json_encode($v['verify_log']); $v['verify_log'] = json_encode($v['verify_log']);
@ -317,8 +317,9 @@ class AggregateRelationController extends AdminController
if(!isset($_REQUEST['ids'])) $this->error("参数错误"); if(!isset($_REQUEST['ids'])) $this->error("参数错误");
$ids = $_REQUEST['ids']; $ids = $_REQUEST['ids'];
$dbres = $this->DBlogModel->field("*")->where("id in ({$ids})")->select(); $dbres = $this->DBlogModel->field("*")->where("id in ({$ids})")->select();
foreach($dbres as $k=>&$v){ foreach($dbres as $k=>&$v){
if($v['status'] != 1) continue; if($v['status'] != 1 && $v['status'] != 0) continue;
$v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'] = json_decode($v['verify_log'],true);
$v['verify_log']['admin_user']=$this->admininfo["username"]; $v['verify_log']['admin_user']=$this->admininfo["username"];
$v['verify_log']['admin_time']=date("Y-m-d H:i:s"); $v['verify_log']['admin_time']=date("Y-m-d H:i:s");
@ -739,8 +740,8 @@ class AggregateRelationController extends AdminController
{ {
$mentBtn = [ $mentBtn = [
"marketAgree"=>"<a class='butn' id='marketAgree'>市场部审批通过</a>", // "marketAgree"=>"<a class='butn' id='marketAgree'>市场部审批通过</a>",
"marketRefuse"=>"<a class='butn' id='marketRefuse' style='background-color: red;'>市场部审核拒绝</a>", // "marketRefuse"=>"<a class='butn' id='marketRefuse' style='background-color: red;'>市场部审核拒绝</a>",
"adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>", "adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>",
"adminRefuse"=>"<a class='butn' id='adminRefuse' style='background-color: red;'>管理员审核拒绝</a>" "adminRefuse"=>"<a class='butn' id='adminRefuse' style='background-color: red;'>管理员审核拒绝</a>"
]; ];

2
Application/Admin/View/AggregateFinanceStatement/lists.html
Unescape Escape View File

@ -445,7 +445,7 @@
//重算金额 //重算金额
$("#updateStatement").on("click",function(){ $("#updateStatement").on("click",function(){
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("status") == 0 || $(elem).data("status") == 1 || $(elem).data("status") == -1){ if($(elem).data("status") == 0 || $(elem).data("status") == 1 || $(elem).data("status") == -1 || $(elem).data("status") == -3){
return $(elem).val(); return $(elem).val();
}else{ }else{
flag = true; flag = true;

26
Application/Admin/View/AggregateRelation/lists.html
Unescape Escape View File

@ -150,7 +150,7 @@
<th>开票内容</th> <th>开票内容</th>
<th>收款方</th> <th>收款方</th>
<th>创建记录</th> <th>创建记录</th>
<th>市场部审批</th> <!-- <th>市场部审批</th>-->
<th>管理员审批</th> <th>管理员审批</th>
<th>备注</th> <th>备注</th>
<th>操作</th> <th>操作</th>
@ -182,17 +182,17 @@
{$data.create} {$data.create}
</div> </div>
</td> </td>
<td> <!-- <td>-->
<if condition="$data.status eq -1 "> <!-- <if condition="$data.status eq -1 ">-->
<div style="line-height: 2;color: red;"> <!-- <div style="line-height: 2;color: red;">-->
{$data.market} <!-- {$data.market}-->
</div> <!-- </div>-->
<else /> <!-- <else /> -->
<div style="line-height: 2;"> <!-- <div style="line-height: 2;">-->
{$data.market} <!-- {$data.market}-->
</div> <!-- </div>-->
</if> <!-- </if>-->
</td> <!-- </td>-->
<td> <td>
<if condition="$data.status eq -2 "> <if condition="$data.status eq -2 ">
<div style="line-height: 2;color: red;"> <div style="line-height: 2;color: red;">
@ -341,7 +341,7 @@ $(function(){
var flag = false; var flag = false;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("status") != status){ if($(elem).data("status") != 0 && $(elem).data("status") != 1 ){
flag = true; flag = true;
}else{ }else{
return $(elem).val(); return $(elem).val();

Write Preview
Loading…
Cancel
Save