diff --git a/application/admin/controller/orders/Income.php b/application/admin/controller/orders/Income.php index 6c0bdf3..ca3004d 100644 --- a/application/admin/controller/orders/Income.php +++ b/application/admin/controller/orders/Income.php @@ -31,6 +31,8 @@ class Income extends Backend $this->model = new \app\admin\model\OrderIncome; $this->view->assign("itemTypeList", $this->model->getItemTypeList()); $this->view->assign("incomeTypeList", $this->model->getIncomeTypeList()); + + $this->view->assign("statusList", $this->model->getStatusList()); } diff --git a/application/admin/lang/zh-cn/orders/income.php b/application/admin/lang/zh-cn/orders/income.php index c3ceab9..83c21e4 100644 --- a/application/admin/lang/zh-cn/orders/income.php +++ b/application/admin/lang/zh-cn/orders/income.php @@ -10,6 +10,12 @@ return [ 'Item_type 2' => '尾款', 'Item_type 3' => '全款', 'Item_type 4' => '其它', + + 'Status' => '审核状态', + 'Status 0' => '待审核', + 'Status 1' => '通过', + 'Status -1' => '未通过', + 'Audit_remark' => '审核备注', 'Amount' => '收款金额', 'Income_type' => '收款方式', 'Income_type 1' => '平台收款', diff --git a/application/admin/model/OrderIncome.php b/application/admin/model/OrderIncome.php index c403e9f..e4c9c01 100644 --- a/application/admin/model/OrderIncome.php +++ b/application/admin/model/OrderIncome.php @@ -40,6 +40,10 @@ class OrderIncome extends Model return ['1' => __('Income_type 1'), '2' => __('Income_type 2')]; } + public function getStatusList() + { + return ['0' => __('Status 0'), '1' => __('Status 1'), '-1' => __('Status -1')]; + } public function getItemTypeTextAttr($value, $data) { diff --git a/public/assets/js/backend/orders/income.js b/public/assets/js/backend/orders/income.js index a52565e..c0f300b 100644 --- a/public/assets/js/backend/orders/income.js +++ b/public/assets/js/backend/orders/income.js @@ -39,6 +39,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'payment_time', title: __('Payment_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'image', title: __('凭证'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false}, {field: 'remark', title: __('备注'), operate: false}, + {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"-1":__('Status -1')}, formatter: Table.api.formatter.status}, + {field: 'audit_remark', title: __('审核备注'), operate: false}, // {field: 'admin_id', title: __('Admin_id')}, {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},