page old

8e8e4dcf · chengye · 3d2ae57c · 8e8e4dcf · 8e8e4dcf · 8e8e4dcf
--- a/application/em/controller/WriteOff.php
+++ b/application/em/controller/WriteOff.php
@@ -13,18 +13,18 @@ use think\facade\Log;

 class WriteOff extends Controller
 {
-    public function writeOffFromPayment($account_id,$payment_id){
+    public function writeOffFromPayment($payment_id){

-        Log::info('触发销账:'.$account_id.' | '.$payment_id);
+        Log::info('触发销账:{$payment_id}');
        //获取缴费单对象
        $payment = EmPayment::where('payment_id','=',$payment_id)->find();

        //获取关联的账单对象
-        $invs =  (new EmInvoice())->alias('ei')->field('ei.invoice_id')
-            ->leftJoin(['em_payment_invoice'=>'epi'],'epi.invoice_id = ei.invoice_id')
-            ->where('epi.payment_id','=',$payment_id)
-            ->where('ei.payment_balance','neq',0)
-            ->order('ei.invoice_id asc')
+        $invs =  (new EmInvoice())->alias('a')->field('a.invoice_id')
+            ->leftJoin(['em_payment_invoice'=>'b'],'b.invoice_id = a.invoice_id')
+            ->where('b.payment_id','=',$payment_id)
+            ->where('a.payment_balance','neq',0)
+            ->order('a.invoice_id asc')
            ->select();

        $invsArr = [];
@@ -45,7 +45,7 @@ class WriteOff extends Controller
        //如果可以完全销账 则继续销账
        if($payment->balance > $payments_balance){
            $invs = (new EmInvoice())->field('invoice_id')
-                ->where('account_id','=',$account_id)
+                ->where('account_id','=',$payment->account_id)
                ->where('payment_balance','neq',0)
                ->order('invoice_id asc')
                ->select();

--- a/public/page/css/app.96f2bf7e.css
+++ b/public/page/css/app.96f2bf7e.css
--- a/public/page/index.html
+++ b/public/page/index.html
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>广厦项目管理系统beta版</title><link href=css/app.f5cc36b7.css rel=preload as=style><link href=js/app.aa6907c3.js rel=preload as=script><link href=css/app.f5cc36b7.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-cli-integration doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/app.aa6907c3.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>广厦项目管理系统beta版</title><link href=css/app.96f2bf7e.css rel=preload as=style><link href=js/app.81004bd3.js rel=preload as=script><link href=css/app.96f2bf7e.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-cli-integration doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/app.81004bd3.js></script></body></html>
\ No newline at end of file
--- a/public/page/js/app.81004bd3.js
+++ b/public/page/js/app.81004bd3.js
--- a/public/page/js/app.aa6907c3.js.LICENSE
+++ b/public/page/js/app.aa6907c3.js.LICENSE
--- a/public/page/css/app.7ad51aae.css
+++ b/public/page/css/app.7ad51aae.css
--- a/public/page/css/app.f5cc36b7.css
+++ b/public/page/css/app.f5cc36b7.css
--- a/public/page/css/chunk-vendors.b27c2f9a.css
+++ b/public/page/css/chunk-vendors.b27c2f9a.css
--- a/public/page1/favicon.ico
+++ b/public/page1/favicon.ico
--- a/public/page1/fonts/bpmn.499c9aa3.eot
+++ b/public/page1/fonts/bpmn.499c9aa3.eot
--- a/public/page1/fonts/bpmn.9b84e8c8.ttf
+++ b/public/page1/fonts/bpmn.9b84e8c8.ttf
--- a/public/page1/fonts/bpmn.b5d0cc49.woff
+++ b/public/page1/fonts/bpmn.b5d0cc49.woff
--- a/public/page1/fonts/bpmn.f3d4b5d1.woff2
+++ b/public/page1/fonts/bpmn.f3d4b5d1.woff2
--- a/public/page1/fonts/element-icons.535877f5.woff
+++ b/public/page1/fonts/element-icons.535877f5.woff
--- a/public/page1/fonts/element-icons.732389de.ttf
+++ b/public/page1/fonts/element-icons.732389de.ttf
--- a/public/page1/fonts/iconfont.0208023e.0208023e.eot
+++ b/public/page1/fonts/iconfont.0208023e.0208023e.eot
--- a/public/page1/fonts/iconfont.d8583a84.d8583a84.ttf
+++ b/public/page1/fonts/iconfont.d8583a84.d8583a84.ttf
--- a/public/page1/fonts/iconfont.e9caaa06.e9caaa06.woff
+++ b/public/page1/fonts/iconfont.e9caaa06.e9caaa06.woff
--- a/public/page1/img/bpmn.deea5c90.svg
+++ b/public/page1/img/bpmn.deea5c90.svg
--- a/public/page1/img/icon-ext.ba81b24c.ba81b24c.png
+++ b/public/page1/img/icon-ext.ba81b24c.ba81b24c.png
--- a/public/page1/img/icon.551539f8.551539f8.png
+++ b/public/page1/img/icon.551539f8.551539f8.png
--- a/public/page1/img/iconfont.5d06b488.5d06b488.svg
+++ b/public/page1/img/iconfont.5d06b488.5d06b488.svg
--- a/public/page1/img/loading-0.a72011cc.a72011cc.gif
+++ b/public/page1/img/loading-0.a72011cc.a72011cc.gif
--- a/public/page1/index.html
+++ b/public/page1/index.html
--- a/public/page/js/app.aa6907c3.js
+++ b/public/page/js/app.aa6907c3.js
--- a/public/page1/js/app.aa6907c3.js.LICENSE
+++ b/public/page1/js/app.aa6907c3.js.LICENSE
--- a/public/page/js/app.bc5c248b.js
+++ b/public/page/js/app.bc5c248b.js
--- a/public/page/js/chunk-vendors.a06d51ef.js
+++ b/public/page/js/chunk-vendors.a06d51ef.js