From 07c554d7c7dbb308012e604948118eb153ab93cd Mon Sep 17 00:00:00 2001 From: liyu1201 <1492230202@qq.com> Date: Mon, 8 Dec 2025 13:34:04 +0800 Subject: [PATCH] 报销 --- antis-ncc-admin/.env.development | 4 ++-- antis-ncc-admin/src/views/lqReimbursementApplication copy/ExportBox.vue | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqReimbursementApplication copy/Form.vue | 909 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqReimbursementApplication copy/detail.vue | 709 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqReimbursementApplication copy/index.vue | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqReimbursementApplication/ExportBox.vue | 66 ------------------------------------------------------------------ antis-ncc-admin/src/views/lqReimbursementApplication/Form.vue | 909 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- antis-ncc-admin/src/views/lqReimbursementApplication/approval-history-dialog.vue | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqReimbursementApplication/detail-dialog.vue | 579 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqReimbursementApplication/detail.vue | 709 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- antis-ncc-admin/src/views/lqReimbursementApplication/index.vue | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ 绿纤uni-app/common/config.js | 4 ++-- 12 files changed, 3485 insertions(+), 2036 deletions(-) create mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication copy/ExportBox.vue create mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication copy/Form.vue create mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication copy/detail.vue create mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication copy/index.vue delete mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication/ExportBox.vue delete mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication/Form.vue create mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication/approval-history-dialog.vue create mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication/detail-dialog.vue delete mode 100644 antis-ncc-admin/src/views/lqReimbursementApplication/detail.vue diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development index f6590fa..c236b7d 100644 --- a/antis-ncc-admin/.env.development +++ b/antis-ncc-admin/.env.development @@ -2,7 +2,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com' -# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' -VUE_APP_BASE_API = 'http://localhost:2011' +VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' +# VUE_APP_BASE_API = 'http://localhost:2011' # VUE_APP_BASE_API = 'http://localhost:2011' VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication copy/ExportBox.vue b/antis-ncc-admin/src/views/lqReimbursementApplication copy/ExportBox.vue new file mode 100644 index 0000000..4fc5c07 --- /dev/null +++ b/antis-ncc-admin/src/views/lqReimbursementApplication copy/ExportBox.vue @@ -0,0 +1,66 @@ + + + + + + 当前页面数据 + 全部页面数据 + + + + 全选 + + + {{item.label}} + + + + + + 取 消 + 导 出 + + + + + + \ No newline at end of file diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication copy/Form.vue b/antis-ncc-admin/src/views/lqReimbursementApplication copy/Form.vue new file mode 100644 index 0000000..0b1dce9 --- /dev/null +++ b/antis-ncc-admin/src/views/lqReimbursementApplication copy/Form.vue @@ -0,0 +1,909 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ dataForm.approveStatus || '无' }} + + + + + + + + + 选择购买物品 + + 已选择 {{ selectedPurchaseRecords.length }} 条记录 + + + + + + + + + + + + + + {{ getStoreName(scope.row.createUserStoreId) }} + + + + + + + + {{ scope.row.purchaseTime ? formatDate(scope.row.purchaseTime) : '' }} + + + + + + + + + + {{ scope.row.attachment.length + '个文件' }} + + + + + + + + 无 + + + + + 移除 + + + + + + + + + + + + + + + + + + {{ scope.row.purchaseTime ? formatDate(scope.row.purchaseTime) : '' }} + + + + + + 取 消 + 确 定 + + + + + + + + + + + + + + + + 打 印 + 取 消 + 通过审批 + 拒绝审批 + 确 定 + + + + + diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication copy/detail.vue b/antis-ncc-admin/src/views/lqReimbursementApplication copy/detail.vue new file mode 100644 index 0000000..94335e6 --- /dev/null +++ b/antis-ncc-admin/src/views/lqReimbursementApplication copy/detail.vue @@ -0,0 +1,709 @@ + + + + + + + + 基本信息 + + + + + 申请编号: + {{ dataForm.id || '无' }} + + + + + 申请人: + {{ dataForm.applicationUserName || '无' }} + + + + + 门店: + {{ getStoreName(dataForm.applicationStoreId) || '无' }} + + + + + 申请时间: + {{ formatDate(dataForm.applicationTime) || '无' }} + + + + + 总金额: + {{ dataForm.amount || '无' }} + + + + + 审批状态: + + {{ dataForm.approveStatus || '无' }} + + + + + + + + + + + 购买物品清单 + + + + + + + {{ getStoreName(scope.row.createUserStoreId) }} + + + + + + + + {{ formatDate(scope.row.purchaseTime) || '无' }} + + + + + + + + + {{ scope.row.attachment.length + '个文件' }} + + + + + + + 无 + + + + + + + + + + 审批信息 + + + + + 审批人: + {{ getUserName(dataForm.approveUser) || '无' }} + + + + + 审批时间: + {{ formatDate(dataForm.approveTime) || '无' }} + + + + + + + 打 印 + 关 闭 + + + + + + + + + + + + + + + + + + diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication copy/index.vue b/antis-ncc-admin/src/views/lqReimbursementApplication copy/index.vue new file mode 100644 index 0000000..10c0d4d --- /dev/null +++ b/antis-ncc-admin/src/views/lqReimbursementApplication copy/index.vue @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + 展开 + 收起 + + + + + + + + 新增 + 批量删除 + + + + + + + + + + + + + + + + + + {{ getStoreName(scope.row.applicationStoreId) || '无' }} + + + + + + + + + + + + 编辑 + 查看 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/ExportBox.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/ExportBox.vue deleted file mode 100644 index 4fc5c07..0000000 --- a/antis-ncc-admin/src/views/lqReimbursementApplication/ExportBox.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 当前页面数据 - 全部页面数据 - - - - 全选 - - - {{item.label}} - - - - - - 取 消 - 导 出 - - - - - - \ No newline at end of file diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/Form.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/Form.vue deleted file mode 100644 index 0b1dce9..0000000 --- a/antis-ncc-admin/src/views/lqReimbursementApplication/Form.vue +++ /dev/null @@ -1,909 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ dataForm.approveStatus || '无' }} - - - - - - - - - 选择购买物品 - - 已选择 {{ selectedPurchaseRecords.length }} 条记录 - - - - - - - - - - - - - - {{ getStoreName(scope.row.createUserStoreId) }} - - - - - - - - {{ scope.row.purchaseTime ? formatDate(scope.row.purchaseTime) : '' }} - - - - - - - - - - {{ scope.row.attachment.length + '个文件' }} - - - - - - - - 无 - - - - - 移除 - - - - - - - - - - - - - - - - - - {{ scope.row.purchaseTime ? formatDate(scope.row.purchaseTime) : '' }} - - - - - - 取 消 - 确 定 - - - - - - - - - - - - - - - - 打 印 - 取 消 - 通过审批 - 拒绝审批 - 确 定 - - - - - diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/approval-history-dialog.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/approval-history-dialog.vue new file mode 100644 index 0000000..711b8cf --- /dev/null +++ b/antis-ncc-admin/src/views/lqReimbursementApplication/approval-history-dialog.vue @@ -0,0 +1,217 @@ + + + + + + + + + {{ item.nodeName || '无' }} + 第{{ item.nodeOrder }}节点 + + + {{ item.approvalResult || '无' }} + + + + + 审批人: + {{ item.approverName || '无' }} + + + 审批意见: + {{ item.approvalOpinion }} + + + 审批时间: + {{ formatDateTime(item.approvalTime) }} + + + + + + + + + 关 闭 + + + + + + + + diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/detail-dialog.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/detail-dialog.vue new file mode 100644 index 0000000..61cd0a1 --- /dev/null +++ b/antis-ncc-admin/src/views/lqReimbursementApplication/detail-dialog.vue @@ -0,0 +1,579 @@ + + + + + + + + 申请信息 + + + + + 申请编号: + {{ formData.id || '无' }} + + + + + 申请人编号: + {{ formData.applicationUserId || '无' }} + + + + + 申请人姓名: + {{ formData.applicationUserName || '无' }} + + + + + 申请门店ID: + {{ formData.applicationStoreId || '无' }} + + + + + 申请时间: + {{ formatDateTime(formData.applicationTime) || '无' }} + + + + + 总金额: + {{ formatMoney(formData.amount) || '无' }} + + + + + 审批状态: + + {{ formData.approveStatus || '无' }} + + + + + + 购买记录编号: + {{ formData.purchaseRecordsId || '无' }} + + + + + + + + + + 审批流程 + + + + + {{ node.nodeOrder }} + + {{ node.nodeName || '无' }} + + + {{ node.approvalType || '无' }} + + 必审 + + + + + + + 审批人: + + + {{ approver.userName || '无' }} + + + + + + + 审批记录: + + + + {{ record.approverName || '无' }} + + {{ record.approvalResult || '无' }} + + + + 意见:{{ record.approvalOpinion }} + + + 时间:{{ formatDateTime(record.approvalTime) }} + + + + + + + + + + + + + 当前审批人 + + + + {{ approver.userName || '无' }} + + + + + + + + + 退回原因 + + + {{ returnedReason }} + + + + + + + + 审批操作 + + + + + 通过 + 不通过 + 退回 + + + + + + + + + + 关 闭 + + 提交审批 + + + + + + + + + diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/detail.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/detail.vue deleted file mode 100644 index 94335e6..0000000 --- a/antis-ncc-admin/src/views/lqReimbursementApplication/detail.vue +++ /dev/null @@ -1,709 +0,0 @@ - - - - - - - - 基本信息 - - - - - 申请编号: - {{ dataForm.id || '无' }} - - - - - 申请人: - {{ dataForm.applicationUserName || '无' }} - - - - - 门店: - {{ getStoreName(dataForm.applicationStoreId) || '无' }} - - - - - 申请时间: - {{ formatDate(dataForm.applicationTime) || '无' }} - - - - - 总金额: - {{ dataForm.amount || '无' }} - - - - - 审批状态: - - {{ dataForm.approveStatus || '无' }} - - - - - - - - - - - 购买物品清单 - - - - - - - {{ getStoreName(scope.row.createUserStoreId) }} - - - - - - - - {{ formatDate(scope.row.purchaseTime) || '无' }} - - - - - - - - - {{ scope.row.attachment.length + '个文件' }} - - - - - - - 无 - - - - - - - - - - 审批信息 - - - - - 审批人: - {{ getUserName(dataForm.approveUser) || '无' }} - - - - - 审批时间: - {{ formatDate(dataForm.approveTime) || '无' }} - - - - - - - 打 印 - 关 闭 - - - - - - - - - - - - - - - - - - diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue index 10c0d4d..b3423e0 100644 --- a/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue +++ b/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue @@ -1,362 +1,653 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 重置 - 展开 - 收起 - - - - - - - - 新增 - 批量删除 - - - - - - - - - - - - - - - - - - {{ getStoreName(scope.row.applicationStoreId) || '无' }} - - - - - - - - - - - - 编辑 - 查看 - - - - - + + + + + + 报销申请管理 + 管理报销申请,包括待办审批、所有申请列表等 + + + + 刷新 + + + + + + + + + + 所有待办 + + + + + 我的待办 + + + + + 所有申请 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + {{ scope.row.id || '无' }} + + + + + + + + + + {{ scope.row.applicationUserName || '无' }} + + + + + + + + + + {{ scope.row.applicationStoreId || '无' }} + + + + + + + + + + {{ formatDateTime(scope.row.applicationTime) || '无' }} + + + + + + + + + + {{ formatMoney(scope.row.amount) || '无' }} - - - - - + + + + + + + + {{ scope.row.approveStatus || '无' }} + + + + + + + + + + {{ scope.row.currentApprovers || '无' }} + + + + + + + + + + {{ scope.row.currentNodeOrder ? `第${scope.row.currentNodeOrder}节点` : '无' }} + + + + + + + + + + {{ scope.row.nodeCount || '无' }} + + + + + + + + + + 查看 + + + 审批历史 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file + +.amount-value { + font-weight: 600; + color: #F56C6C; +} + +// 操作按钮样式 +.action-buttons { + display: flex; + align-items: center; + gap: 8px; + + .view-btn { + color: #409EFF; + + &:hover { + color: #66b1ff; + } + } + + .history-btn { + color: #909399; + + &:hover { + color: #606266; + } + } +} + +.pagination-container { + display: flex; + justify-content: center; + padding: 20px; + background: #fff; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + diff --git a/绿纤uni-app/common/config.js b/绿纤uni-app/common/config.js index c156a1c..ab8ccef 100644 --- a/绿纤uni-app/common/config.js +++ b/绿纤uni-app/common/config.js @@ -10,8 +10,8 @@ const ENV_CONFIG = { // 正式环境 production: { name: '正式环境', - // apiBaseUrl: 'http://erp_test.lvqianmeiye.com', - apiBaseUrl: 'https://erp.lvqianmeiye.com', + apiBaseUrl: 'http://erp_test.lvqianmeiye.com', + // apiBaseUrl: 'https://erp.lvqianmeiye.com', description: '生产环境服务器' } }; -- libgit2 0.21.4
管理报销申请,包括待办审批、所有申请列表等