备份:大改造前的完整版本 - 修复合同细节/付款节点/文件上传/施工管理/项目保存等BUG

This commit is contained in:
root
2026-05-15 12:02:24 +08:00
parent 1cad1e438d
commit fad28741bd
6157 changed files with 5147 additions and 877912 deletions
+40 -52
View File
@@ -1,22 +1,22 @@
const express = require('express');
const db = require('../db');
const { authenticate, requireAdmin } = require('../middleware/auth');
const { body, validationResult } = require('express-validator');
const router = express.Router();
// 验证错误处理中间件
const validate = (req, res, next) => {
const errors = validationResult(req);
if (!errors.isEmpty()) {
return res.status(400).json({
success: false,
errors: errors.array()
});
}
next();
};
const express = require('express');
const db = require('../db');
const { authenticate, requireAdmin } = require('../middleware/auth');
const { body, validationResult } = require('express-validator');
const router = express.Router();
// 验证错误处理中间件
const validate = (req, res, next) => {
const errors = validationResult(req);
if (!errors.isEmpty()) {
return res.status(400).json({
success: false,
errors: errors.array()
});
}
next();
};
router.get('/', async (req, res) => {
try {
const result = await db.query(`
@@ -47,11 +47,11 @@ router.get('/', async (req, res) => {
res.status(500).json({
success: false,
message: '获取预支款失败',
error: error.message
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
});
}
});
router.post('/', [
body('amount').isFloat({ min: 0.01 }),
body('reason').notEmpty()
@@ -64,30 +64,18 @@ router.post('/', [
const advanceCode = `ADV-${Date.now()}`;
const result = await db.query(
'INSERT INTO advances (applicant_id, project_id, amount, currency, amount_cny, reason, advance_date, advance_code, status, applicant, attachments) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)',
'INSERT INTO advances (applicant_id, project_id, amount, currency, amount_cny, reason, advance_date, advance_code, status, applicant, attachments) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING id',
[applicant_id, project_id, amount, currency || 'CNY', amount_cny || 0, reason, advance_date, advanceCode, status || 'pending', applicant, JSON.stringify(attachments || [])]
);
// SQLite不支持RETURNING,所以需要查询刚插入的数据
const lastInsert = await db.query('SELECT * FROM advances ORDER BY id DESC LIMIT 1');
const data = lastInsert.rows[0];
// 解析 attachments 字段为数组
if (data.attachments) {
try {
data.attachments = JSON.parse(data.attachments);
} catch (error) {
data.attachments = [];
}
} else {
data.attachments = [];
}
const data = { id: result.rows[0]?.id, applicant_id, project_id, amount, currency, reason, advance_date, advance_code: advanceCode, status, applicant };
res.json({ success: true, data });
} catch (error) {
console.error('创建预支申请失败:', error);
res.status(500).json({ success: false, message: '创建预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '创建预支申请失败' });
}
});
router.get('/:id', async (req, res) => {
try {
const { id } = req.params;
@@ -112,10 +100,10 @@ router.get('/:id', async (req, res) => {
}
} catch (error) {
console.error('获取预支申请失败:', error);
res.status(500).json({ success: false, message: '获取预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '获取预支申请失败' });
}
});
router.put('/:id', async (req, res) => {
try {
const { id } = req.params;
@@ -133,10 +121,10 @@ router.put('/:id', async (req, res) => {
}
} catch (error) {
console.error('更新预支申请失败:', error);
res.status(500).json({ success: false, message: '更新预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '更新预支申请失败' });
}
});
router.delete('/:id', async (req, res) => {
try {
const { id } = req.params;
@@ -150,10 +138,10 @@ router.delete('/:id', async (req, res) => {
}
} catch (error) {
console.error('删除预支申请失败:', error);
res.status(500).json({ success: false, message: '删除预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '删除预支申请失败' });
}
});
router.post('/:id/submit', async (req, res) => {
try {
const { id } = req.params;
@@ -167,10 +155,10 @@ router.post('/:id/submit', async (req, res) => {
}
} catch (error) {
console.error('提交预支申请失败:', error);
res.status(500).json({ success: false, message: '提交预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '提交预支申请失败' });
}
});
router.post('/:id/withdraw', async (req, res) => {
try {
const { id } = req.params;
@@ -184,10 +172,10 @@ router.post('/:id/withdraw', async (req, res) => {
}
} catch (error) {
console.error('撤回预支申请失败:', error);
res.status(500).json({ success: false, message: '撤回预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '撤回预支申请失败' });
}
});
router.post('/:id/approve', async (req, res) => {
try {
const { id } = req.params;
@@ -202,10 +190,10 @@ router.post('/:id/approve', async (req, res) => {
}
} catch (error) {
console.error('审批预支申请失败:', error);
res.status(500).json({ success: false, message: '审批预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '审批预支申请失败' });
}
});
router.post('/:id/reject', async (req, res) => {
try {
const { id } = req.params;
@@ -220,9 +208,9 @@ router.post('/:id/reject', async (req, res) => {
}
} catch (error) {
console.error('退回预支申请失败:', error);
res.status(500).json({ success: false, message: '退回预支申请失败', error: error.message });
res.status(500).json({ success: false, message: '退回预支申请失败' });
}
});
module.exports = router;