diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index a4dbd0aff..7adebc73c 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -468,7 +468,7 @@ class CompanyStatementController extends ThinkController $Statemen = M("company_statement","tab_"); foreach ($datas as $k => $v) { if(count($v['company_list']) <= 0){continue;} - + $v['statement_num'] = "PL_".date('Ymd').date('His').sp_random_num(3); //保存公司信息 $company_list = $v['company_list']; foreach ($company_list as $ke => $va) { @@ -477,12 +477,18 @@ class CompanyStatementController extends ThinkController if(empty($v['create_lack_ids']) && empty($v['del_lack_ids']) && empty($v['info_ids'])){ continue;} $v['statement_ids'] = implode(",",$v['statement_ids']); - $v['statement_num'] = "PL_".date('Ymd').date('His').sp_random_num(3); + $v['create_lack_ids'] = implode(",",$v['create_lack_ids']); $v['del_lack_ids'] = implode(",",$v['del_lack_ids']); $info = implode(",",$v['info_ids']); unset($v['info_ids']); unset($v['company_list']); + + if($v['statement_money'] == 0){ + $v['verify_status'] = 5; + $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + } + $pool_id = $Pool->add($v); if($pool_id == false){ $this->ajaxReturn(array('status' => 0,"info"=>"汇总失败")); @@ -491,7 +497,7 @@ class CompanyStatementController extends ThinkController $save["pool_id"]=$pool_id; M("company_statement_info","tab_")->where("id in ({$info})")->save($save); } - if(!empty($data['del_lack_ids'])){ + if(!empty($v['del_lack_ids'])){ M("company_lack_statement_info","tab_")->where("id in ({$v['del_lack_ids']})")->save(["is_pool"=>1]); } //修改结算单规则 @@ -533,6 +539,12 @@ class CompanyStatementController extends ThinkController unset($value["second_ratio"]); } } + if($k=="ups" || $k=='downs'){ + $is_payment = 1; + }else{ + $is_payment = 2; + } + //创建基础未满基础信息 if($va['statement_money'] < 300){ $lackcompany =[ @@ -547,6 +559,8 @@ class CompanyStatementController extends ThinkController "reward"=>$va['reward'], "statement_begin_time"=>$v['statement_begin_time'], "statement_end_time"=>$v['statement_end_time'], + "is_payment"=>$is_payment, + "statement_pool_num"=>$v['statement_num'], "statement_info"=>json_encode($va['statement_info'],JSON_UNESCAPED_UNICODE), ]; } diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php new file mode 100644 index 000000000..f03a2d5ba --- /dev/null +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -0,0 +1,364 @@ +"下游公司", + "2"=>"下游个人", + "3"=>"上游公司" + ]; + public $IsPayment = [ + "1"=>"是", + "2"=>"否" + ]; + + public $admininfo; + public $DBModel; + public function _initialize() + { + $this->admininfo = $_SESSION['onethink_admin']['user_auth']; + $this->DBModel = M("CompanyLackStatementInfo","tab_"); + parent::_initialize(); + } + public function lists() { + $params = I('get.'); + $page = $params['p'] ? intval($params['p']) : 1; + $row = $params['row'] ? intval($params['row']) : 10; + //权限分配 + if(!IS_ROOT){ + $this->OpAuthList= getModuleControllerAuth(); + } + $this->assign('menubtn',$this->menuAuth()); + + $map = [ + "is_pool"=>0 + ]; + if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { + $time_start = strtotime($_REQUEST['time_start']); + $time_end = strtotime($_REQUEST['time_end'])+ 86399; + $map["_string"] = "(statement_begin_time BETWEEN {$time_start} AND {$time_end}) OR (statement_end_time BETWEEN {$time_start} AND {$time_end})"; + } elseif (isset($_REQUEST['time_start'])) { + $time_start = strtotime($_REQUEST['time_start']); + $map["_string"] = "(statement_begin_time >= {$time_start} ) OR (statement_end_time >= {$time_start})"; + } elseif (isset($_REQUEST['time_end'])) { + $time_end = strtotime($_REQUEST['time_end'])+ 86399; + $map["_string"] = "(statement_begin_time <= {$time_end} ) OR (statement_end_time <= {$time_end})"; + } + + //其他 + if(isset($_REQUEST['company_type'])){ + $map['company_type'] = $_REQUEST['company_type']; + } + if(isset($_REQUEST['company_id'])){ + $map['company_id'] = $_REQUEST['company_id']; + } + + if(isset($_REQUEST['is_payment'])){ + $map['is_payment'] = $_REQUEST['is_payment']; + } + + $this->checkListOrCountAuthRestMap($map);//导出权限 + + //条件end + $data = $this->DBModel + ->field("*") + ->where($map) + ->page($page,$row) + ->select(); + + foreach($data as $k => &$v) { + + $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); + $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); + $v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; + $v['company_type_str'] = $this->CompanyType[$v['company_type']]; + $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; + $v['oplist'] = $this->OpAuth($v); + } + + $count = $this->DBModel->field("count(id) count,sum(statement_money) statement_money")->where($map)->find(); + // dd($count); + $parameter['p'] = $page; + $parameter['row'] = $row; + $page = set_pagination($count['count'], $row, $parameter); + if ($page) { + $this->assign('_page', $page); + } + + $this->assign('data',$data); + $this->assign('count',$count); + $this->assign('CompanyType',$this->CompanyType); + $this->assign('IsPayment',$this->IsPayment); + $this->display(); + + } + //查看 + public function viewStatement() + { + if(!isset($_REQUEST['id'])){ + $this->error('参数错误'); + } + $id = $_REQUEST['id']; + $is_export= false; + if (isset($_REQUEST['export']) && $_REQUEST['export']==1){ + $is_export = true; + } + //获取基本信息 + $dbres = $this->DBModel->where("id='{$id}'")->select(); + if($dbres[0]['company_type'] == 3){ + //上游 + A("CompanyStatementPool")->viewCpPool($dbres,$is_export); + }elseif($infolist[0]['company_type'] == 1){ + //下游公司 + A("CompanyStatementPool")->viewPcPool($dbres,$is_export); + }else{ + A("CompanyStatementPool")->viewPuPool($dbres,$is_export); + } + } + + //汇总 + public function pool() + { + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + $dbres = $this->DBModel->field("*")->where("id in ({$ids})")->select(); + //分单 + $basedata = [ + "pay_amount"=>0, + "statement_money"=>0, + "lack_statement_money"=>0, + "platform_amount"=>0, + "lack_platform_amount"=>0, + "del_lack_ids"=>[], + "info_ids"=>[], + "statement_begin_time"=>0, + "statement_end_time"=>0, + "fine"=>0, + "reward"=>0, + "verify_status"=>0, + "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]), + "op_time"=>time(), + "company_list"=>[] + ]; + $datas = ["ups","up","downs","down","user","users"]; + //初始化数据 + foreach($datas as $k=>$v){ + if($v =="ups"){ + $basedata['company_type']=3; + $basedata['is_payment']=1; + } + if($v =="up"){ + $basedata['company_type']=3; + $basedata['is_payment']=2; + } + + if($v =="downs"){ + $basedata['company_type']=1; + $basedata['is_payment']=1; + } + if($v =="down"){ + $basedata['company_type']=1; + $basedata['is_payment']=2; + } + if($v =="users"){ + $basedata['company_type']=2; + $basedata['is_payment']=1; + } + if($v =="user"){ + $basedata['company_type']=2; + $basedata['is_payment']=2; + } + $datas[$v]=$basedata; + unset($datas[$k]); + } + + + foreach ($dbres as $k=>$v) { + if($v['company_type'] == 3){ + //上游 + if($v['is_payment'] == 1){ + $this->setDf($datas['ups'],$v); + }else{ + $this->setDf($datas['up'],$v); + } + }elseif($v['company_type'] == 1){ + if($v['is_payment'] == 1){ + $this->setDf($datas['downs'],$v); + }else{ + $this->setDf($datas['down'],$v); + } + }else{ + if($v['is_payment'] == 1){ + $this->setDf($datas['users'],$v); + }else{ + $this->setDf($datas['user'],$v); + } + } + } + $Pool = M("company_statement_pool","tab_"); + $Statemen = M("company_statement","tab_"); + foreach ($datas as $k => $v) { + if(count($v['company_list']) <= 0){continue;} + //保存公司信息 + $company_list = $v['company_list']; + foreach ($company_list as $ke => $va) { + $this->addStatementInfo($va,$ke,$v); + } + + if(empty($v['create_lack_ids']) && empty($v['del_lack_ids']) && empty($v['info_ids'])){ continue;} + + $v['statement_num'] = "QZ_".date('Ymd').date('His').sp_random_num(3); + + $v['del_lack_ids'] = implode(",",$v['del_lack_ids']) ?? ''; + $info = implode(",",$v['info_ids']); + unset($v['info_ids']); + unset($v['company_list']); + $pool_id = $Pool->add($v); + if($pool_id == false){ + $this->ajaxReturn(array('status' => 0,"info"=>"汇总失败")); + } + if(!empty($info)){ + $save["pool_id"]=$pool_id; + M("company_statement_info","tab_")->where("id in ({$info})")->save($save); + } + if(!empty($v['del_lack_ids'])){ + M("company_lack_statement_info","tab_")->where("id in ({$v['del_lack_ids']})")->save(["is_pool"=>1]); + } + } + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"汇总成功" + )); + } + protected function addStatementInfo($va,$ke,&$v){ + $StatementInfo = M("company_statement_info","tab_"); + if($va['pay_amount'] > 0){ + //存成功 + $company =[ + "pool_id"=>0, + "company_id"=>$ke, + "company_type"=>$v['company_type'], + "company_name"=>$va['company_name'], + "company_info"=>$va['company_info'], + "fine"=>$va['fine'], + "reward"=>$va['reward'], + "statement_money"=>$va['statement_money'], + "pay_amount"=>$va['pay_amount'], + "platform_amount"=>$va['platform_amount'], + "statement_money"=>$va['statement_money'], + "statement_begin_time"=>$v['statement_begin_time'], + "statement_end_time"=>$v['statement_end_time'], + "statement_info"=>json_encode($va['statement_info'],JSON_UNESCAPED_UNICODE), + "statement_num"=>$va['statement_num'] + ]; + $companyid = $StatementInfo->add($company); + $v['info_ids'][] =$companyid; + $v['statement_money'] +=$va['statement_money']; + $v['pay_amount'] +=$va['pay_amount']; + $v['platform_amount'] +=$va['platform_amount']; + $v['fine'] +=$va['fine']; + $v['reward'] +=$va['reward']; + } + } + + + //设定组合的子操作 + protected function setDf(&$savedata,$v) + { + $savedata['del_lack_ids'][] = $v['id']; + unset($v['id']); + $v['statement_info'] = json_decode( $v['statement_info'],true); + $fine = $v['fine']; + $reward = $v['reward']; + + if(isset($savedata['company_list'][$v['company_id']])){ + //存在游戏合并 + $a = &$savedata['company_list'][$v['company_id']]; + $a['fine'] += $fine; + $a['reward'] += $reward; + $a['statement_info'] = array_merge($a['statement_info'],$v['statement_info']); + // dump($a['statement_info']); + $a['platform_amount'] += $v['platform_amount']; + $a['pay_amount'] += $v['pay_amount']; + $a['statement_money'] += $v['statement_money']; + }else{ + //先分配好订单号，防止重复提交 + $tdata = [ + "company_info"=>$v['company_info'], + "company_name"=>$v['company_name'], + "platform_amount"=>$v['platform_amount'], + "pay_amount"=>$v['pay_amount'], + "statement_money"=>$v['statement_money'], + "fine"=>$fine, + "reward"=>$reward, + "statement_info"=>$v['statement_info'], + "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) + ]; + $savedata['company_list'][$v['company_id']] = $tdata; + } + // $savedata['fine'] += $v['fine']; + // $savedata['reward'] += $v['reward']; + // $savedata['pay_amount'] += $v['pay_amount']; + // $savedata['statement_money'] += $v['statement_money']; + // $savedata['platform_amount'] += $v['platform_amount']; + if($savedata['statement_begin_time'] == 0){ + $savedata['statement_begin_time'] = $v['statement_begin_time']; + }elseif($v['statement_begin_time'] < $savedata['statement_begin_time']){ + $savedata['statement_begin_time'] = $v['statement_begin_time']; + } + if($savedata['statement_end_time'] == 0){ + $savedata['statement_end_time'] = $v['statement_end_time']; + }elseif($v['statement_end_time'] > $savedata['statement_end_time']){ + $savedata['statement_end_time'] = $v['statement_end_time']; + } + } + //设定并保存数据 + + + public function OpAuth($info) + { + $id = $info['id']; + $type = $info['company_type']; + //原始列表 + $opBtn = [ + "viewStatement"=>"查看", + ]; + //操作对应菜单 + $optist = ["viewStatement"]; + $resarr = []; + foreach ($optist as $k => $v) { + if(IS_ROOT){ + $resarr[] = $opBtn[$v]; + }else{ + if(in_array($v,$this->OpAuthList)){ + $resarr[] = $opBtn[$v]; + } + } + } + return $resarr; + } + public function menuAuth() + { + $mentBtn = [ + "pool"=>"发起汇总", + "export"=>"批量导出" + ]; + $resarr = []; + foreach ($mentBtn as $k => $v) { + if(IS_ROOT){ + $resarr[] = $v; + }else{ + if(in_array($k,$this->OpAuthList)){ + $resarr[] = $v; + } + } + } + return $resarr; + } + +} diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 5e302f35c..60a3f893f 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -24,7 +24,8 @@ class CompanyStatementPoolController extends ThinkController "1"=>"审批通过", "2"=>"待打款", "3"=>"打款中", - "4"=>"打款成功" + "4"=>"打款成功", + "5"=>"无需打款" ]; public $admininfo; public $DBModel; @@ -95,8 +96,9 @@ class CompanyStatementPoolController extends ThinkController $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); - $v['company_type'] = $this->CompanyType[$v['company_type']]; + $v['company_type_str'] = $this->CompanyType[$v['company_type']]; $v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; + $v['can_export'] = $v['statement_money'] == 0 ? "0" : '1'; $v['op_time'] = date('Y-m-d H:i:s',$v['op_time']); $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; @@ -139,6 +141,9 @@ class CompanyStatementPoolController extends ThinkController $ts="线下打款成功"; } $v["payment"]= "{$ts}({$v['verify_log']['payment_user']}){$symbol} {$v['verify_log']['payment_time']}"; + }elseif($v['verify_status'] == 5){ + $ts="无需打款"; + $v["payment"]= "{$ts}({$v['verify_log']['payment_user']}){$symbol} {$v['verify_log']['payment_time']}"; } }else{ $v["payment"] = '--'; @@ -189,7 +194,7 @@ class CompanyStatementPoolController extends ThinkController } //个人汇总结算查看 - protected function viewPuPool(&$infolist,$is_export){ + public function viewPuPool(&$infolist,$is_export){ $line = 1; $count = []; //获取对接人 @@ -231,10 +236,10 @@ class CompanyStatementPoolController extends ThinkController $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); - $this->display("viewPuPool"); + $this->display("CompanyStatementPool/viewPuPool"); } //下游汇总结算查看 - protected function viewPcPool(&$infolist,$is_export){ + public function viewPcPool(&$infolist,$is_export){ $line = 1; $count = []; //获取对接人 @@ -307,12 +312,12 @@ class CompanyStatementPoolController extends ThinkController $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); - $this->display("viewPcPool"); + $this->display("CompanyStatementPool/viewPcPool"); } //上游汇总查看及导出 - protected function viewCpPool(&$infolist,$is_export) + public function viewCpPool(&$infolist,$is_export) { $line = 2; $count = []; @@ -376,7 +381,7 @@ class CompanyStatementPoolController extends ThinkController $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); - $this->display("viewCpPool"); + $this->display("CompanyStatementPool/viewCpPool"); } //审批通过 @@ -584,6 +589,18 @@ class CompanyStatementPoolController extends ThinkController $id = $info['id']; $img = $info['ext_file']; $remark = $info['remark']; + $create_lack_ids = $info['create_lack_ids']; + $is_qz = (substr($info['statement_num'],0,2) == "QZ" ? true :false); //强制汇总的都允许回退 + + $re_op = true; + if(!empty($create_lack_ids) && !$is_qz){ + $clsi = M("company_lack_statement_info","tab_")->where("is_pool = 1 and id in ({$create_lack_ids})")->find(); + $re_op = true; + if(!empty($clsi)){ + $re_op = false; //被引用无法重算 + } + } + //原始列表 $opBtn = [ "viewPool"=>"查看", @@ -600,6 +617,9 @@ class CompanyStatementPoolController extends ThinkController "editPayment"=>"打款信息编辑", "viePayment"=>"打款详情", + 'reCount'=>"重算", + 'cancelPool'=>"撤销汇总", + ]; //操作对应菜单 $optist = []; @@ -607,7 +627,7 @@ class CompanyStatementPoolController extends ThinkController case '-2': case '-1': case '0': - $optist = ["viewPool"]; + $optist = ["viewPool","reCount","cancelPool"]; break; case '1': $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","setPayment"]; @@ -618,6 +638,12 @@ class CompanyStatementPoolController extends ThinkController case '3': $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","viePayment"]; break; + case '4': + $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","viePayment"]; + break; + case '5': + $optist = ["viewPool","addRemark","viewRemark","editRemark","reCount","cancelPool"]; + break; default: break; } @@ -625,6 +651,23 @@ class CompanyStatementPoolController extends ThinkController if($info['platform_amount'] <= 0){ $optist = array_diff($optist, ["viewPool"]); } + //个人重算，上游撤销 + if($re_op){ + + if($is_qz){ + $optist = array_diff($optist, ["reCount"]); + }else{ + if($info['company_type'] == 2){ + $optist = array_diff($optist, ["cancelPool"]); + }else{ + $optist = array_diff($optist, ["reCount"]); + } + } + + }else{ + $optist = array_diff($optist, ["cancelPool","reCount"]); + } + if(empty($info['ext_file'])){ //未上传凭证 $optist = array_diff($optist, ["viewVoucher", "editVoucher"]); @@ -656,7 +699,6 @@ class CompanyStatementPoolController extends ThinkController $mentBtn = [ "verifyAgree"=>"审批通过", "verifyRefuse"=>"审核拒绝", - "cancelPool"=>"撤销汇总", "export"=>"批量导出" ]; $resarr = []; diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 5e59fefff..a00e66ea4 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -832,6 +832,10 @@ class CompanyStatementSetController extends Controller { "reward"=>$v['reward'], "statement_begin_time"=>$begintime, "statement_end_time"=>$endtime, + + "statement_pool_num"=>$countdata['statement_num'],//母单 + + "is_payment"=>$v['is_payment'], "statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE) ]; } @@ -865,7 +869,7 @@ class CompanyStatementSetController extends Controller { } }else{ if($v['pay_amount'] > 0){ - //存成功 + //存成功配置单号 $company =[ "pool_id"=>0, "company_id"=>$k, @@ -879,7 +883,8 @@ class CompanyStatementSetController extends Controller { "reward"=>$v['reward'], "statement_begin_time"=>$begintime, "statement_end_time"=>$endtime, - "statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE) + "statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE), + "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) ]; $companyid = $StatementInfo->add($company); $countdata['info_ids'][] =$companyid; @@ -900,6 +905,10 @@ class CompanyStatementSetController extends Controller { */ protected function savePromotateUserPool($data){ if(empty($data['create_lack_ids']) && empty($data['del_lack_ids']) && empty($data['info_ids'])){ return;} + if($data['statement_money'] == 0){ + $data['verify_status'] = 5; + $data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + } $data['create_lack_ids'] = implode(",",$data['create_lack_ids']); $data['del_lack_ids'] = implode(",",$data['del_lack_ids']); $info = implode(",",$data['info_ids']); diff --git a/Application/Admin/View/CompanyStatementLack/lists.html b/Application/Admin/View/CompanyStatementLack/lists.html new file mode 100644 index 000000000..641cd384f --- /dev/null +++ b/Application/Admin/View/CompanyStatementLack/lists.html @@ -0,0 +1,407 @@ + + + + + + + + + + + + + +
+

未汇总打款管理

+

未达到打款条件的汇总单列表，强制汇总后将不可回退

+
+ + + +
+ +
+ +
+ +
+ +
+ +
+ + + + + +
+ +  -  +
+ + +
+
+ + + +
+ 搜索 +
+ +
+
+ +
+
+ + {$vo} + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
合作公司公司类型结算时间打卡流程结算金额结算流水生成母单来源的汇总单，母单重算将影响子单操作
aOh! 暂时还没有内容!
{$data.company_name}{$data.company_type_str}{$data.valid}{$data.is_payment_str}{$data.statement_money}{$data.platform_amount}{$data.statement_pool_num} + + {$vo} + +
合计结算总金额: {$count.statement_money}
+
+ +
+
+ + 导出 + + {$_page|default=''} +
+ + + + + if(C('COLOR_STYLE')=='blue_color') echo ' + + '; + + + + + + + + + + diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 86053b1bb..882d6beee 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -168,10 +168,10 @@ - + {$data.statement_num} {$data.valid} - {$data.company_type} + {$data.company_type_str} {$data.is_payment_str} {$data.statement_money} @@ -286,7 +286,7 @@ }); - $("#verifyAgree,#verifyRefuse,#cancelPool").on("click",function(){ + $("#verifyAgree,#verifyRefuse").on("click",function(){ var id = $(this).attr("id"); if(id == "verifyAgree"){ var opname = "审批通过"; @@ -298,12 +298,6 @@ var opurl = "{:U('verifyRefuse')}"; var opst ="[未进行审批]"; var status = [0]; - }else if(id=="cancelPool"){ - var opname = "撤销汇总"; - var opurl = "{:U('cancelPool')}"; - var opst ="[审批通过]"; - var status = [-2,-1,0,1,2]; - var confirm = true; } var confirm = confirm ? confirm :false; @@ -368,8 +362,13 @@ }) $("#export").click(function () { + var flag = false; var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - return $(elem).val(); + if($(elem).data("export") == 1){ + return $(elem).val(); + }else{ + flag = true; + } }).get(); if(text.length > 20){ @@ -380,11 +379,21 @@ layer.msg("" + '请先选择要导出的结算单' + ""); return; } - for (var index = 0; index < text.length; index++) { - var id = text[index]; - var url ="{:U('export')}"+"&id="+id; - var iframeExcel = ""//添加下载的地址到iframe，这里是公司信息，我用**表示了。 - $("body").append(iframeExcel) + if(flag){ + layer.confirm("仅结算金额不等于0的会进行导出，将忽略结算金额等于0的汇总单，点击取消停止操作",{title:false}, function(index){ + _export(); + layer.close(index); + }); + }else{ + _export(); + } + function _export(){ + for (var index = 0; index < text.length; index++) { + var id = text[index]; + var url ="{:U('viewPool')}"+"&id="+id+"&export=1"; + var iframeExcel = ""//添加下载的地址到iframe，这里是公司信息，我用**表示了。 + $("body").append(iframeExcel) + } } }) //新增批注 diff --git a/Data/update.sql b/Data/update.sql index 869a852a5..7073433a9 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1975,6 +1975,8 @@ CREATE TABLE `tab_company_lack_statement_info` ( `statement_begin_time` int(11) NOT NULL DEFAULT '0' COMMENT '对账开始时间', `statement_end_time` int(11) NOT NULL DEFAULT '0' COMMENT '对账截止时间', `statement_info` text NOT NULL DEFAULT '' COMMENT '订单相关信息json', + `statement_pool_num` varchar(500) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '生成此单的汇总单单号', + `is_payment` tinyint(3) NOT NULL DEFAULT '1' COMMENT '是否需要打款：1-是 2-否(线下)', `is_pool` tinyint(3) NOT NULL DEFAULT '0' COMMENT '是否被汇总:0否/1是', PRIMARY KEY (`id`), KEY `company_tid` (`company_id`,`company_type`) USING BTREE,