diff --git a/generate/php/app/adminapi/controller/financial/FinancialExpenseReimbursementController.php b/generate/php/app/adminapi/controller/financial/FinancialExpenseReimbursementController.php deleted file mode 100644 index f5ca67b..0000000 --- a/generate/php/app/adminapi/controller/financial/FinancialExpenseReimbursementController.php +++ /dev/null @@ -1,108 +0,0 @@ -dataLists(new FinancialExpenseReimbursementLists()); - } - - - /** - * @notes 添加财务管理--费用报销单 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function add() - { - $params = (new FinancialExpenseReimbursementValidate())->post()->goCheck('add'); - $result = FinancialExpenseReimbursementLogic::add($params); - if (true === $result) { - return $this->success('添加成功', [], 1, 1); - } - return $this->fail(FinancialExpenseReimbursementLogic::getError()); - } - - - /** - * @notes 编辑财务管理--费用报销单 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function edit() - { - $params = (new FinancialExpenseReimbursementValidate())->post()->goCheck('edit'); - $result = FinancialExpenseReimbursementLogic::edit($params); - if (true === $result) { - return $this->success('编辑成功', [], 1, 1); - } - return $this->fail(FinancialExpenseReimbursementLogic::getError()); - } - - - /** - * @notes 删除财务管理--费用报销单 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function delete() - { - $params = (new FinancialExpenseReimbursementValidate())->post()->goCheck('delete'); - FinancialExpenseReimbursementLogic::delete($params); - return $this->success('删除成功', [], 1, 1); - } - - - /** - * @notes 获取财务管理--费用报销单详情 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function detail() - { - $params = (new FinancialExpenseReimbursementValidate())->goCheck('detail'); - $result = FinancialExpenseReimbursementLogic::detail($params); - return $this->data($result); - } - - -} \ No newline at end of file diff --git a/generate/php/app/adminapi/controller/financial/FinancialTravelReimbursementController.php b/generate/php/app/adminapi/controller/financial/FinancialTravelReimbursementController.php deleted file mode 100644 index e378058..0000000 --- a/generate/php/app/adminapi/controller/financial/FinancialTravelReimbursementController.php +++ /dev/null @@ -1,108 +0,0 @@ -dataLists(new FinancialTravelReimbursementLists()); - } - - - /** - * @notes 添加财务管理--差旅费报销单 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function add() - { - $params = (new FinancialTravelReimbursementValidate())->post()->goCheck('add'); - $result = FinancialTravelReimbursementLogic::add($params); - if (true === $result) { - return $this->success('添加成功', [], 1, 1); - } - return $this->fail(FinancialTravelReimbursementLogic::getError()); - } - - - /** - * @notes 编辑财务管理--差旅费报销单 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function edit() - { - $params = (new FinancialTravelReimbursementValidate())->post()->goCheck('edit'); - $result = FinancialTravelReimbursementLogic::edit($params); - if (true === $result) { - return $this->success('编辑成功', [], 1, 1); - } - return $this->fail(FinancialTravelReimbursementLogic::getError()); - } - - - /** - * @notes 删除财务管理--差旅费报销单 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function delete() - { - $params = (new FinancialTravelReimbursementValidate())->post()->goCheck('delete'); - FinancialTravelReimbursementLogic::delete($params); - return $this->success('删除成功', [], 1, 1); - } - - - /** - * @notes 获取财务管理--差旅费报销单详情 - * @return \think\response\Json - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function detail() - { - $params = (new FinancialTravelReimbursementValidate())->goCheck('detail'); - $result = FinancialTravelReimbursementLogic::detail($params); - return $this->data($result); - } - - -} \ No newline at end of file diff --git a/generate/php/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php b/generate/php/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php deleted file mode 100644 index 51fac3c..0000000 --- a/generate/php/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php +++ /dev/null @@ -1,78 +0,0 @@ - ['contract_id', 'fee_application_id', 'pay_type'], - '%like%' => ['theme', 'code', 'create_user'], - ]; - } - - - /** - * @notes 获取财务管理--费用报销单列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function lists(): array - { - return FinancialExpenseReimbursement::where($this->searchWhere) - ->field(['id', 'contract_id', 'fee_application_id', 'theme', 'code', 'bill_num', 'pay_type', 'content', 'create_user', 'create_time']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select() - ->toArray(); - } - - - /** - * @notes 获取财务管理--费用报销单数量 - * @return int - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function count(): int - { - return FinancialExpenseReimbursement::where($this->searchWhere)->count(); - } - -} \ No newline at end of file diff --git a/generate/php/app/adminapi/lists/financial/FinancialTravelReimbursementLists.php b/generate/php/app/adminapi/lists/financial/FinancialTravelReimbursementLists.php deleted file mode 100644 index 6021314..0000000 --- a/generate/php/app/adminapi/lists/financial/FinancialTravelReimbursementLists.php +++ /dev/null @@ -1,77 +0,0 @@ - ['code', 'approve_dept', 'cost_type', 'pay_type', 'create_user'], - ]; - } - - - /** - * @notes 获取财务管理--差旅费报销单列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function lists(): array - { - return FinancialTravelReimbursement::where($this->searchWhere) - ->field(['id', 'code', 'approve_dept', 'cost_type', 'pay_type', 'tax_deductible_amount', 'bill_num', 'fee_application_id', 'content', 'create_user', 'create_time']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select() - ->toArray(); - } - - - /** - * @notes 获取财务管理--差旅费报销单数量 - * @return int - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function count(): int - { - return FinancialTravelReimbursement::where($this->searchWhere)->count(); - } - -} \ No newline at end of file diff --git a/generate/php/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php b/generate/php/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php deleted file mode 100644 index 8d8accb..0000000 --- a/generate/php/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php +++ /dev/null @@ -1,124 +0,0 @@ - $params['contract_id'], - 'fee_application_id' => $params['fee_application_id'], - 'theme' => $params['theme'], - 'code' => $params['code'], - 'bill_num' => $params['bill_num'], - 'pay_type' => $params['pay_type'], - 'content' => $params['content'], - 'annex' => $params['annex'], - 'create_user' => $params['create_user'], - 'create_time' => $params['create_time'] - ]); - - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 编辑财务管理--费用报销单 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - FinancialExpenseReimbursement::where('id', $params['id'])->update([ - 'contract_id' => $params['contract_id'], - 'fee_application_id' => $params['fee_application_id'], - 'theme' => $params['theme'], - 'code' => $params['code'], - 'bill_num' => $params['bill_num'], - 'pay_type' => $params['pay_type'], - 'content' => $params['content'], - 'annex' => $params['annex'], - 'create_user' => $params['create_user'], - 'create_time' => $params['create_time'] - ]); - - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除财务管理--费用报销单 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public static function delete(array $params): bool - { - return FinancialExpenseReimbursement::destroy($params['id']); - } - - - /** - * @notes 获取财务管理--费用报销单详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public static function detail($params): array - { - return FinancialExpenseReimbursement::findOrEmpty($params['id'])->toArray(); - } -} \ No newline at end of file diff --git a/generate/php/app/adminapi/logic/financial/FinancialTravelReimbursementLogic.php b/generate/php/app/adminapi/logic/financial/FinancialTravelReimbursementLogic.php deleted file mode 100644 index ff63e0d..0000000 --- a/generate/php/app/adminapi/logic/financial/FinancialTravelReimbursementLogic.php +++ /dev/null @@ -1,124 +0,0 @@ - $params['code'], - 'approve_dept' => $params['approve_dept'], - 'cost_type' => $params['cost_type'], - 'pay_type' => $params['pay_type'], - 'tax_deductible_amount' => $params['tax_deductible_amount'], - 'bill_num' => $params['bill_num'], - 'fee_application_id' => $params['fee_application_id'], - 'content' => $params['content'], - 'create_user' => $params['create_user'], - 'create_time' => $params['create_time'] - ]); - - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 编辑财务管理--差旅费报销单 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - FinancialTravelReimbursement::where('id', $params['id'])->update([ - 'code' => $params['code'], - 'approve_dept' => $params['approve_dept'], - 'cost_type' => $params['cost_type'], - 'pay_type' => $params['pay_type'], - 'tax_deductible_amount' => $params['tax_deductible_amount'], - 'bill_num' => $params['bill_num'], - 'fee_application_id' => $params['fee_application_id'], - 'content' => $params['content'], - 'create_user' => $params['create_user'], - 'create_time' => $params['create_time'] - ]); - - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除财务管理--差旅费报销单 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public static function delete(array $params): bool - { - return FinancialTravelReimbursement::destroy($params['id']); - } - - - /** - * @notes 获取财务管理--差旅费报销单详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public static function detail($params): array - { - return FinancialTravelReimbursement::findOrEmpty($params['id'])->toArray(); - } -} \ No newline at end of file diff --git a/generate/php/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php b/generate/php/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php deleted file mode 100644 index 836608d..0000000 --- a/generate/php/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php +++ /dev/null @@ -1,112 +0,0 @@ - 'require', - 'contract_id' => 'require', - 'fee_application_id' => 'require', - 'theme' => 'require', - 'code' => 'require', - 'bill_num' => 'require', - 'pay_type' => 'require', - 'content' => 'require', - 'create_user' => 'require', - 'create_time' => 'require', - ]; - - - /** - * 参数描述 - * @var string[] - */ - protected $field = [ - 'id' => 'id', - 'contract_id' => '合同id', - 'fee_application_id' => '费用申请id', - 'theme' => '单据主题', - 'code' => '单据编号', - 'bill_num' => '单据张数', - 'pay_type' => '支付方式', - 'content' => '事由', - 'create_user' => '申请人员', - 'create_time' => '报销日期', - ]; - - - /** - * @notes 添加场景 - * @return FinancialExpenseReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneAdd() - { - return $this->only(['contract_id','fee_application_id','theme','code','bill_num','pay_type','content','create_user','create_time']); - } - - - /** - * @notes 编辑场景 - * @return FinancialExpenseReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneEdit() - { - return $this->only(['id','contract_id','fee_application_id','theme','code','bill_num','pay_type','content','create_user','create_time']); - } - - - /** - * @notes 删除场景 - * @return FinancialExpenseReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneDelete() - { - return $this->only(['id']); - } - - - /** - * @notes 详情场景 - * @return FinancialExpenseReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneDetail() - { - return $this->only(['id']); - } - -} \ No newline at end of file diff --git a/generate/php/app/adminapi/validate/financial/FinancialTravelReimbursementValidate.php b/generate/php/app/adminapi/validate/financial/FinancialTravelReimbursementValidate.php deleted file mode 100644 index ca4911d..0000000 --- a/generate/php/app/adminapi/validate/financial/FinancialTravelReimbursementValidate.php +++ /dev/null @@ -1,114 +0,0 @@ - 'require', - 'code' => 'require', - 'approve_dept' => 'require', - 'cost_type' => 'require', - 'pay_type' => 'require', - 'tax_deductible_amount' => 'require', - 'bill_num' => 'require', - 'fee_application_id' => 'require', - 'content' => 'require', - 'create_user' => 'require', - 'create_time' => 'require', - ]; - - - /** - * 参数描述 - * @var string[] - */ - protected $field = [ - 'id' => 'id', - 'code' => '单据编号', - 'approve_dept' => '审批部门', - 'cost_type' => '费用类别', - 'pay_type' => '支付方式', - 'tax_deductible_amount' => '可抵扣税额', - 'bill_num' => '附单据张数', - 'fee_application_id' => '关联费用申请', - 'content' => '事由', - 'create_user' => '申请人', - 'create_time' => '申请日期', - ]; - - - /** - * @notes 添加场景 - * @return FinancialTravelReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneAdd() - { - return $this->only(['code','approve_dept','cost_type','pay_type','tax_deductible_amount','bill_num','fee_application_id','content','create_user','create_time']); - } - - - /** - * @notes 编辑场景 - * @return FinancialTravelReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneEdit() - { - return $this->only(['id','code','approve_dept','cost_type','pay_type','tax_deductible_amount','bill_num','fee_application_id','content','create_user','create_time']); - } - - - /** - * @notes 删除场景 - * @return FinancialTravelReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneDelete() - { - return $this->only(['id']); - } - - - /** - * @notes 详情场景 - * @return FinancialTravelReimbursementValidate - * @author likeadmin - * @date 2024/03/28 14:45 - */ - public function sceneDetail() - { - return $this->only(['id']); - } - -} \ No newline at end of file diff --git a/generate/php/app/common/model/financial/FinancialExpenseReimbursement.php b/generate/php/app/common/model/financial/FinancialExpenseReimbursement.php deleted file mode 100644 index 86659b3..0000000 --- a/generate/php/app/common/model/financial/FinancialExpenseReimbursement.php +++ /dev/null @@ -1,34 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - diff --git a/generate/vue/src/views/financial_expense_reimbursement/index.vue b/generate/vue/src/views/financial_expense_reimbursement/index.vue deleted file mode 100644 index f14365e..0000000 --- a/generate/vue/src/views/financial_expense_reimbursement/index.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - diff --git a/src/api/build/build_report_detail.ts b/src/api/build/build_report_detail.ts index 99a90a5..ca1b11a 100644 --- a/src/api/build/build_report_detail.ts +++ b/src/api/build/build_report_detail.ts @@ -2,4 +2,9 @@ import request from '@/utils/request' // 人工明细列表 export function buildreportDetaillists(params: any) { return request.get({ url: '/build.build_report_detail/lists', params }) +} + +// 某个施工汇报下的人工明细列表 +export function apibuild_reportLists(params: any) { + return request.get({ url: '/build.build_report/personDetails', params }) } \ No newline at end of file diff --git a/src/api/financial_borrow_money.ts b/src/api/financial_borrow_money.ts new file mode 100644 index 0000000..f8ba0a2 --- /dev/null +++ b/src/api/financial_borrow_money.ts @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +// 财务管理--借款单列表 +export function apiFinancialBorrowMoneyLists(params: any) { + return request.get({ url: '/financial.financial_borrow_money/lists', params }) +} + +// 添加财务管理--借款单 +export function apiFinancialBorrowMoneyAdd(params: any) { + return request.post({ url: '/financial.financial_borrow_money/add', params }) +} + +// 编辑财务管理--借款单 +export function apiFinancialBorrowMoneyEdit(params: any) { + return request.post({ url: '/financial.financial_borrow_money/edit', params }) +} + +// 删除财务管理--借款单 +export function apiFinancialBorrowMoneyDelete(params: any) { + return request.post({ url: '/financial.financial_borrow_money/delete', params }) +} + +// 财务管理--借款单详情 +export function apiFinancialBorrowMoneyDetail(params: any) { + return request.get({ url: '/financial.financial_borrow_money/detail', params }) +} + + +// 财务管理--借款单列表 +export function apiFinancialBorrowMoneySearch(params: any) { + return request.get({ url: '/financial.financial_borrow_money/datas', params }) +} \ No newline at end of file diff --git a/src/api/financial_repayment.ts b/src/api/financial_repayment.ts new file mode 100644 index 0000000..4e270fa --- /dev/null +++ b/src/api/financial_repayment.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 财务管理--还款单列表 +export function apiFinancialRepaymentLists(params: any) { + return request.get({ url: '/financial.financial_repayment/lists', params }) +} + +// 添加财务管理--还款单 +export function apiFinancialRepaymentAdd(params: any) { + return request.post({ url: '/financial.financial_repayment/add', params }) +} + +// 编辑财务管理--还款单 +export function apiFinancialRepaymentEdit(params: any) { + return request.post({ url: '/financial.financial_repayment/edit', params }) +} + +// 删除财务管理--还款单 +export function apiFinancialRepaymentDelete(params: any) { + return request.post({ url: '/financial.financial_repayment/delete', params }) +} + +// 财务管理--还款单详情 +export function apiFinancialRepaymentDetail(params: any) { + return request.get({ url: '/financial.financial_repayment/detail', params }) +} \ No newline at end of file diff --git a/src/api/financial_using_funds.ts b/src/api/financial_using_funds.ts new file mode 100644 index 0000000..4cf474e --- /dev/null +++ b/src/api/financial_using_funds.ts @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 财务管理--用款申请单列表 +export function apiFinancialUsingFundsLists(params: any) { + return request.get({ url: '/financial.financial_using_funds/lists', params }) +} + +// 添加财务管理--用款申请单 +export function apiFinancialUsingFundsAdd(params: any) { + return request.post({ url: '/financial.financial_using_funds/add', params }) +} + +// 编辑财务管理--用款申请单 +export function apiFinancialUsingFundsEdit(params: any) { + return request.post({ url: '/financial.financial_using_funds/edit', params }) +} + +// 删除财务管理--用款申请单 +export function apiFinancialUsingFundsDelete(params: any) { + return request.post({ url: '/financial.financial_using_funds/delete', params }) +} + +// 财务管理--用款申请单详情 +export function apiFinancialUsingFundsDetail(params: any) { + return request.get({ url: '/financial.financial_using_funds/detail', params }) +} + +// 财务管理--用款申请单列表 +export function apiFinancialUsingFundsDetailLists(params: any) { + return request.get({ url: '/financial.financial_using_funds_detail/lists', params }) +} +// 删除财务管理--用款申请单 +export function apiFinancialUsingFundsDetailDelete(params: any) { + return request.post({ url: '/financial.financial_using_funds_detail/delete', params }) +} diff --git a/src/assets/images/CWGL.png b/src/assets/images/CWGL.png new file mode 100644 index 0000000..c13db8e Binary files /dev/null and b/src/assets/images/CWGL.png differ diff --git a/src/assets/images/GCJL.png b/src/assets/images/GCJL.png new file mode 100644 index 0000000..d64cca2 Binary files /dev/null and b/src/assets/images/GCJL.png differ diff --git a/src/assets/images/SGGL.png b/src/assets/images/SGGL.png new file mode 100644 index 0000000..28c7de6 Binary files /dev/null and b/src/assets/images/SGGL.png differ diff --git a/src/assets/images/XMGL.png b/src/assets/images/XMGL.png new file mode 100644 index 0000000..5a7e0ac Binary files /dev/null and b/src/assets/images/XMGL.png differ diff --git a/src/assets/images/XMZX.png b/src/assets/images/XMZX.png new file mode 100644 index 0000000..c35e927 Binary files /dev/null and b/src/assets/images/XMZX.png differ diff --git a/src/assets/images/XT.png b/src/assets/images/XT.png new file mode 100644 index 0000000..59b4a36 Binary files /dev/null and b/src/assets/images/XT.png differ diff --git a/src/assets/images/ZJZX.png b/src/assets/images/ZJZX.png new file mode 100644 index 0000000..de15e9f Binary files /dev/null and b/src/assets/images/ZJZX.png differ diff --git a/src/assets/images/mipmap-xxxhdpi/AS.png b/src/assets/images/mipmap-xxxhdpi/AS.png new file mode 100644 index 0000000..cd5575a Binary files /dev/null and b/src/assets/images/mipmap-xxxhdpi/AS.png differ diff --git a/src/assets/images/mipmap-xxxhdpi/AS1.png b/src/assets/images/mipmap-xxxhdpi/AS1.png new file mode 100644 index 0000000..4739217 Binary files /dev/null and b/src/assets/images/mipmap-xxxhdpi/AS1.png differ diff --git a/src/assets/images/mipmap-xxxhdpi/AS2.png b/src/assets/images/mipmap-xxxhdpi/AS2.png new file mode 100644 index 0000000..e456d66 Binary files /dev/null and b/src/assets/images/mipmap-xxxhdpi/AS2.png differ diff --git a/src/assets/images/mipmap-xxxhdpi/AS3.png b/src/assets/images/mipmap-xxxhdpi/AS3.png new file mode 100644 index 0000000..59b4a36 Binary files /dev/null and b/src/assets/images/mipmap-xxxhdpi/AS3.png differ diff --git a/src/assets/images/mipmap-xxxhdpi/AS4.png b/src/assets/images/mipmap-xxxhdpi/AS4.png new file mode 100644 index 0000000..342f561 Binary files /dev/null and b/src/assets/images/mipmap-xxxhdpi/AS4.png differ diff --git a/src/assets/images/mipmap-xxxhdpi/AS5.png b/src/assets/images/mipmap-xxxhdpi/AS5.png new file mode 100644 index 0000000..8c1f56b Binary files /dev/null and b/src/assets/images/mipmap-xxxhdpi/AS5.png differ diff --git a/src/components/build_plan/index.vue b/src/components/build_plan/index.vue index 4500117..12c7446 100644 --- a/src/components/build_plan/index.vue +++ b/src/components/build_plan/index.vue @@ -22,19 +22,6 @@ - - - - diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index 95d285d..0c39e40 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -640,5 +640,39 @@ export const financial_fee_application: Iconfig = { ], }; +import { apiFinancialBorrowMoneyLists } from '@/api/financial_borrow_money' + +export const financial_borrow_money: Iconfig = { + fetchFn: apiFinancialBorrowMoneyLists, + dictData:"cost_type,financial_pay_type", + serchList: [ + { + label: "单据编号", + value: "code", + }, + { + label: "费用类别", + value: "cost_type", + select:'cost_type' + }, + { + label: "支付方式", + value: "pay_type", + select:'financial_pay_type' + + }, + ], + tableList: [ + { code: "单据编号" }, + { dept_name: "所在部门" }, + { cost_type_text: "费用类别" }, + { pay_type_text: "支付方式" }, + { amount: "金额" }, + { content: "事由" }, + { create_user: "申请人" }, + { create_time: "申请日期" }, + ], +}; + diff --git a/src/components/formTable/index.vue b/src/components/formTable/index.vue index c797dfe..a0bc3d5 100644 --- a/src/components/formTable/index.vue +++ b/src/components/formTable/index.vue @@ -10,9 +10,7 @@ - - - diff --git a/src/layout/default/components/header/menuLi.vue b/src/layout/default/components/header/menuLi.vue index c6999d5..860a7ee 100644 --- a/src/layout/default/components/header/menuLi.vue +++ b/src/layout/default/components/header/menuLi.vue @@ -1,13 +1,18 @@ - \ No newline at end of file diff --git a/src/layout/default/components/header/multiple-tabs.vue b/src/layout/default/components/header/multiple-tabs.vue index 6c539f9..43ef1c7 100644 --- a/src/layout/default/components/header/multiple-tabs.vue +++ b/src/layout/default/components/header/multiple-tabs.vue @@ -1,6 +1,6 @@ @@ -79,10 +80,11 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { buildreportLists, buildreportDelete, buildreportDetail } from '@/api/build/build_report' import { timeFormat } from '@/utils/util' - import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' +import detailConfig from './detail' + +const showDetail = ref(false) const detailRef = shallowRef>() const editRef = shallowRef>() // 是否显示编辑框 @@ -150,14 +152,16 @@ const handleDelete = async (id: number | any[]) => { await buildreportDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await buildreportDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await buildreportDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) } + getLists() diff --git a/src/views/financial_borrow_money/detail.js b/src/views/financial_borrow_money/detail.js new file mode 100644 index 0000000..3cfdd81 --- /dev/null +++ b/src/views/financial_borrow_money/detail.js @@ -0,0 +1,46 @@ +const detailConfig = { + title: "财务管理--用款申请单", + config: [ + { + label: "单据编号", + value: "code" + }, + { + label: "所在部门", + value: "approve_dept_name" + }, + { + label: "费用类别", + value: "cost_type_text" + }, + { + label: "支付方式", + value: "pay_type_text" + }, + { + label: "金额", + value: "amount" + }, + { + label: "事由", + value: "content", + column: 1 + }, + { + label: "附件", + value: "annex", + column: 1 + }, + { + label: "申请人", + value: "create_user" + }, + { + label: "申请时间", + value: "create_time" + }, + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/generate/vue/src/views/financial_travel_reimbursement/edit.vue b/src/views/financial_borrow_money/edit.vue similarity index 51% rename from generate/vue/src/views/financial_travel_reimbursement/edit.vue rename to src/views/financial_borrow_money/edit.vue index 136f0d6..e8e0888 100644 --- a/generate/vue/src/views/financial_travel_reimbursement/edit.vue +++ b/src/views/financial_borrow_money/edit.vue @@ -1,55 +1,53 @@ - diff --git a/src/views/financial_repayment/detail.js b/src/views/financial_repayment/detail.js new file mode 100644 index 0000000..645beaa --- /dev/null +++ b/src/views/financial_repayment/detail.js @@ -0,0 +1,37 @@ +const detailConfig = { + title: "财务管理--用款申请单", + config: [ + { + label: "借款单编号", + value: "borrow_code" + }, + { + label: "单据编号", + value: "code" + }, + { + label: "还款人", + value: "payer_name" + }, + { + label: "还款金额", + value: "amount" + }, + { + label: "说明", + value: "desc", + + }, + { + label: "经办人", + value: "create_user" + }, + { + label: "还款日期", + value: "create_time" + }, + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/financial_repayment/edit.vue b/src/views/financial_repayment/edit.vue new file mode 100644 index 0000000..185fbad --- /dev/null +++ b/src/views/financial_repayment/edit.vue @@ -0,0 +1,196 @@ + + + diff --git a/src/views/financial_repayment/index.vue b/src/views/financial_repayment/index.vue new file mode 100644 index 0000000..46e7743 --- /dev/null +++ b/src/views/financial_repayment/index.vue @@ -0,0 +1,146 @@ + + + + diff --git a/src/views/financial_travel_reimbursement/edit.vue b/src/views/financial_travel_reimbursement/edit.vue index a592440..c99bdfc 100644 --- a/src/views/financial_travel_reimbursement/edit.vue +++ b/src/views/financial_travel_reimbursement/edit.vue @@ -58,7 +58,7 @@ - +