From baaee849a8f3b649449149d91af1c25cb3cd975a Mon Sep 17 00:00:00 2001 From: hdm Date: Wed, 24 Nov 2021 17:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=80=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BDbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/home/controller/Expense.php | 20 +++++++---- app/home/controller/Invoice.php | 4 +-- app/home/controller/Login.php | 10 +++--- app/home/view/expense/add.html | 30 +++++++++------- app/home/view/expense/index.html | 59 +++++++++++++++++++++++++------- app/home/view/expense/view.html | 47 +++++++++++++++++++------ app/home/view/invoice/view.html | 38 +++++++++++++------- 7 files changed, 147 insertions(+), 61 deletions(-) diff --git a/app/home/controller/Expense.php b/app/home/controller/Expense.php index 3752795..e2cd778 100644 --- a/app/home/controller/Expense.php +++ b/app/home/controller/Expense.php @@ -68,7 +68,7 @@ class Expense extends BaseController { $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $expense = ExpenseList::where($where) - ->order('create_time asc') + ->order('id desc') ->paginate($rows, false, ['query' => $param]) ->each(function ($item, $key) { $item->income_month = empty($item->income_month) ? '-' : date('Y-m', $item->income_month); @@ -93,19 +93,21 @@ class Expense extends BaseController $expense['user_name'] = Db::name('Admin')->where(['id' => $expense['admin_id']])->value('name'); $expense['department'] = Db::name('Department')->where(['id' => $expense['did']])->value('title'); $expense['amount'] = Db::name('ExpenseInterfix')->where(['exid' => $expense['id']])->sum('amount'); - - if ($expense['check_admin_id'] > 0) { - $expense['check_admin'] = Db::name('Admin')->where(['id' => $expense['check_admin_id']])->value('name'); + $expense['check_admin'] = Db::name('Admin')->where(['id' => $expense['check_admin_id']])->value('name'); + $expense['pay_admin'] = Db::name('Admin')->where(['id' => $expense['pay_admin_id']])->value('name'); + if ($expense['check_time'] > 0) { $expense['check_time'] = date('Y-m-d H:i:s', $expense['check_time']); } - if ($expense['pay_admin_id'] > 0) { - $expense['pay_admin'] = Db::name('Admin')->where(['id' => $expense['pay_admin_id']])->value('name'); + if ($expense['pay_time'] > 0) { $expense['pay_time'] = date('Y-m-d H:i:s', $expense['pay_time']); } + else{ + $expense['pay_time'] = '-'; + } $expense['list'] = Db::name('ExpenseInterfix') ->field('a.*,c.title as cate_title') ->alias('a') - ->join('ExpenseCate c', 'a.cate_id = c.id') + ->join('ExpenseCate c', 'a.cate_id = c.id','LEFT') ->where(['a.exid' => $expense['id']]) ->select(); } @@ -124,6 +126,10 @@ class Expense extends BaseController if ($start_time > 0 && $end_time > 0) { $where[] = ['expense_time', 'between', [$start_time, $end_time]]; } + + if (isset($param['check_status']) && $param['check_status']!='') { + $where[] = ['check_status', '=', $param['check_status']]; + } $expense = $this->get_list($param, $where); return table_assign(0, '', $expense); } else { diff --git a/app/home/controller/Invoice.php b/app/home/controller/Invoice.php index 431597d..2e3086a 100644 --- a/app/home/controller/Invoice.php +++ b/app/home/controller/Invoice.php @@ -224,10 +224,10 @@ class Invoice extends BaseController if ($param['invoice_status'] == 2 || $param['invoice_status'] == 0) { $param['check_time'] = time(); } - if ($param['check_status'] == 3) { + if ($param['invoice_status'] == 3) { $param['open_time'] = time(); } - if ($param['check_status'] == 10) { + if ($param['invoice_status'] == 10) { $param['update_time'] = time(); } $res = InvoiceList::where('id', $param['id'])->strict(false)->field(true)->update($param); diff --git a/app/home/controller/Login.php b/app/home/controller/Login.php index 7f2651e..1bc9c1e 100644 --- a/app/home/controller/Login.php +++ b/app/home/controller/Login.php @@ -39,14 +39,17 @@ class Login $admin = Db::name('Admin')->where(['username' => $param['username']])->find(); if (empty($admin)) { - return to_assign(1, '用户名或密码错误'); + $admin = Db::name('Admin')->where(['mobile' => $param['username']])->find(); + if (empty($admin)) { + return to_assign(1, '用户名或密码错误'); + } } $param['pwd'] = set_password($param['password'], $admin['salt']); if ($admin['pwd'] !== $param['pwd']) { return to_assign(1, '用户名或密码错误'); } - if ($admin['status'] == 0) { - return to_assign(1, '该用户禁止登录,请于系统所有者联系'); + if ($admin['status'] != 1) { + return to_assign(1, '该用户禁止登录,请与管理者联系'); } $data = [ 'last_login_time' => time(), @@ -68,7 +71,6 @@ class Login { $session_admin = get_config('app.session_admin'); Session::delete($session_admin); - //redirect('/')->send(); return to_assign(0, "退出成功"); } } diff --git a/app/home/view/expense/add.html b/app/home/view/expense/add.html index 1e96a7d..bc4f8ef 100644 --- a/app/home/view/expense/add.html +++ b/app/home/view/expense/add.html @@ -143,7 +143,7 @@
- +
@@ -185,17 +185,23 @@ layer.msg('至少要保留一个报销选项'); return false; } - $.ajax({ - url:"{:url('/home/expense/add')}", - type:'post', - data:data.field, - success:function(e){ - layer.msg(e.msg); - if(e.code==0){ - parent.location.reload(); - } - } - }) + layer.confirm('审核期间不能编辑修改，确定报销数据无误？', { + icon: 3, + title: '提示' + }, function(index) { + $.ajax({ + url:"{:url('/home/expense/add')}", + type:'post', + data:data.field, + success:function(e){ + layer.msg(e.msg); + if(e.code==0){ + parent.location.reload(); + } + } + }) + layer.close(index); + }); return false; }); diff --git a/app/home/view/expense/index.html b/app/home/view/expense/index.html index 5d36435..7f27216 100644 --- a/app/home/view/expense/index.html +++ b/app/home/view/expense/index.html @@ -2,6 +2,27 @@ {block name="body"}
+
+
+
+ +
+ ~ +
+ +
+
+
+ +
+ +