From a1a9803977654ef90f1b7ee01d0fc46f0cea9a9d Mon Sep 17 00:00:00 2001 From: hdm Date: Wed, 2 Mar 2022 09:59:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E5=85=AC=E5=AE=A1=E6=89=B9=E3=80=81?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=AE=A1=E6=89=B9=E3=80=81=E6=8A=A5=E9=94=80?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E9=94=99=E8=AF=AFbug?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E5=B7=A5=E4=BD=9C=E7=B1=BB=E5=9E=8B=E5=BF=85=E9=80=89?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/finance/controller/Expense.php | 3 ++- app/finance/view/expense/view.html | 35 +++++++++++++++++++++--------- app/finance/view/invoice/view.html | 20 ++++++++++------- app/oa/view/approve/view_step.html | 14 +++++++----- app/oa/view/schedule/calendar.html | 1 + 5 files changed, 48 insertions(+), 25 deletions(-) diff --git a/app/finance/controller/Expense.php b/app/finance/controller/Expense.php index 5fe208e..ce628af 100644 --- a/app/finance/controller/Expense.php +++ b/app/finance/controller/Expense.php @@ -71,9 +71,9 @@ class Expense extends BaseController $expense['create_user'] = 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'); - $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']); + $expense['pay_admin'] = Db::name('Admin')->where(['id' => $expense['pay_admin_id']])->value('name'); } else{ $expense['pay_time'] = '-'; @@ -621,6 +621,7 @@ class Expense extends BaseController { $param = get_params(); if (request()->isAjax()) { + //打款，数据操作 $param['check_status'] = 5; $param['pay_admin_id'] = $this->uid; $param['pay_time'] = time(); diff --git a/app/finance/view/expense/view.html b/app/finance/view/expense/view.html index 87579c6..7e1fb45 100644 --- a/app/finance/view/expense/view.html +++ b/app/finance/view/expense/view.html @@ -105,9 +105,10 @@ 审核状态 {eq name="$detail.check_status" value="0"}待审批{/eq} {eq name="$detail.check_status" value="1"}审批中{/eq} - {eq name="$detail.check_status" value="2"}已通过{/eq} + {eq name="$detail.check_status" value="2"}已通过，待打款{/eq} {eq name="$detail.check_status" value="3"}已拒绝{/eq} {eq name="$detail.check_status" value="4"}已撤销{/eq} + {eq name="$detail.check_status" value="5"}已通过{/eq} 查看审批记录 当前审核人 @@ -148,19 +149,33 @@ {/if} + {if ( $detail.check_status eq 5)} + + 报销状态 + 已打款 + 打款人 + {$detail.pay_admin} + 打款时间 + {$detail.pay_time} + + {/if} -
- {eq name="$is_check_admin" value='1'} - 通过 - 拒绝 - {/eq} - {if ( $detail.check_status lt 2) AND ( $is_create_admin eq 1) } - 撤回 +
+ {if ( $detail.check_status lt 2)} + {eq name="$is_check_admin" value='1'} + 通过 + 拒绝 + {/eq} + {eq name="$is_create_admin" value='1'} + 撤回 + {/eq} {/if} - {if ( $detail.check_status gt 2) AND ( $is_create_admin eq 1) } - 重新编辑 + {if ( $detail.check_status eq 3) OR ( $detail.check_status eq 4 ) } + {eq name="$is_create_admin" value='1'} + 重新编辑 + {/eq} {/if}
{/block} diff --git a/app/finance/view/invoice/view.html b/app/finance/view/invoice/view.html index 9bbe657..fa1bff6 100644 --- a/app/finance/view/invoice/view.html +++ b/app/finance/view/invoice/view.html @@ -180,15 +180,19 @@
- {eq name="$is_check_admin" value='1'} - 通过 - 拒绝 - {/eq} - {if ( $detail.check_status lt 2) AND ( $is_create_admin eq 1) } - 撤回 + {if ( $detail.check_status lt 2)} + {eq name="$is_check_admin" value='1'} + 通过 + 拒绝 + {/eq} + {eq name="$is_create_admin" value='1'} + 撤回 + {/eq} {/if} - {if ( $detail.check_status eq 4) AND ( $is_create_admin eq 1) } - 重新编辑 + {if ( $detail.check_status eq 3) OR ( $detail.check_status eq 4 ) } + {eq name="$is_create_admin" value='1'} + 重新编辑 + {/eq} {/if}
diff --git a/app/oa/view/approve/view_step.html b/app/oa/view/approve/view_step.html index 3b619af..0425113 100644 --- a/app/oa/view/approve/view_step.html +++ b/app/oa/view/approve/view_step.html @@ -48,12 +48,14 @@
- {eq name="$is_check_admin" value='1'} - 通过 - 拒绝 - {/eq} - {if ( $detail.check_status lt 2) AND ( $is_create_admin eq 1) } - 撤回 + {if ( $detail.check_status lt 2)} + {eq name="$is_check_admin" value='1'} + 通过 + 拒绝 + {/eq} + {eq name="$is_create_admin" value='1'} + 撤回 + {/eq} {/if} {if ( $detail.check_status gt 2) AND ( $is_create_admin eq 1) } 重新编辑 diff --git a/app/oa/view/schedule/calendar.html b/app/oa/view/schedule/calendar.html index 4f2d0e9..1285e8b 100644 --- a/app/oa/view/schedule/calendar.html +++ b/app/oa/view/schedule/calendar.html @@ -350,6 +350,7 @@ user-select: none;} var detail={}; detail['id']=0; detail['title']=''; + detail['labor_type']=0; detail['start_time_a']=dateStr; detail['end_time_a']=dateStr; detail['start_time_b']='08:30';