SN: ${r.sn}
- ${ts}
+
+
${ts}
+ ${r.tracking_number ? `📦 ${r.tracking_number}` : ''}
+
${r.machine_type ? `${r.machine_type}` : ''}
+ ${r.defect_symptom ? `${r.defect_symptom}` : ''}
${r.defect_reason}
${imgCount > 0 ? `${imgCount}张图片` : ''}
@@ -1098,6 +1100,86 @@ const Upload = (() => {
}
};
});
+
+ // 快递单号点击查询物流
+ document.querySelectorAll('.tracking-link').forEach(link => {
+ link.onclick = async () => {
+ const trackingNumber = link.dataset.tracking;
+ if(!trackingNumber) return;
+
+ // 显示加载弹窗
+ const modal = document.createElement('div');
+ modal.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.5);display:flex;align-items:center;justify-content:center;z-index:1000';
+ modal.innerHTML = `
+
+
+ `;
+ document.body.appendChild(modal);
+ document.getElementById('tracking-modal-close').onclick = () => modal.remove();
+ modal.onclick = (e) => { if(e.target === modal) modal.remove(); };
+
+ try {
+ const result = await API.queryTracking(trackingNumber);
+ const contentEl = document.getElementById('tracking-content');
+
+ if(result.ok && result.data && result.data.length > 0) {
+ // 快递公司名称映射
+ const comNames = {
+ 'shunfeng': '顺丰速运', 'yuantong': '圆通速递', 'zhongtong': '中通快递',
+ 'yunda': '韵达快递', 'jd': '京东物流', 'ems': 'EMS', 'shentong': '申通快递',
+ 'debangkuaidi': '德邦快递', 'auto': '快递'
+ };
+ const comName = comNames[result.com] || result.com || '快递';
+ const stateNames = {'0': '在途', '1': '揽收', '2': '疑难', '3': '签收', '4': '退签', '5': '派件', '6': '退回', '7': '转投'};
+ const stateName = stateNames[result.state] || '未知';
+ const stateColor = result.state === '3' ? 'var(--success)' : (result.state === '5' ? 'var(--primary)' : 'var(--text-2)');
+
+ contentEl.innerHTML = `
+
+
+ 📦 物流查询
+ +
+
+
+
+
+ 正在查询物流信息...
+
+
+
+
+ ${stateName}
+ ${comName}
+ ${trackingNumber}
+
+ ${result.data.map((item, idx) => `
+
+ `;
+ } else {
+ contentEl.innerHTML = `
+
+
+
+ `).join('')}
+ ${item.time || item.ftime || ''}
+ ${item.context || ''}
+
+
+ `;
+ }
+ } catch(e) {
+ document.getElementById('tracking-content').innerHTML = `
+ 📭
+ ${result.error || '暂无物流信息'}
+
+
+ `;
+ }
+ };
+ });
};
// 更新全选框状态
@@ -1163,7 +1245,8 @@ const Upload = (() => {
let modal = document.getElementById(modalId);
if(modal) modal.remove();
- const imagesHtml = (record.images || []).length > 0
+ const images = record.images || [];
+ const imagesHtml = images.length > 0
? `❌
+ 查询失败: ${e.message || '网络错误'}
+
${record.images.map(img => `
+
+
+
+
-
-
+
-
- ${imagesHtml}
-
+ 编辑模式暂不支持修改图片
+
+
+
+
+
+ ${images.map(img => `
+
+ `).join('')}
+
+
+
+
+
+ 点击或拖拽添加新图片
+ 最多10张图片，点击×删除
@@ -1226,6 +1326,10 @@ const Upload = (() => {
+ 机种
${record.machine_type || '未知'}
+
不良现象
+ ${record.defect_symptom || '未填写'}
+ 不良原因
${record.defect_reason}
@@ -1234,6 +1338,10 @@ const Upload = (() => {
维修方法
${record.repair_method || '无'}
+
快递单号
+ ${record.tracking_number ? `📦 ${record.tracking_number}` : '未填写'}
+ 上传时间
${ts}
@@ -1258,29 +1366,87 @@ const Upload = (() => {
modal.querySelector('div').onclick = (e) => { if(e.target === modal.querySelector('div')) modal.remove(); };
if(isEdit) {
- const editDefectSelect = document.getElementById('edit-repair-defect');
- const editDefectOther = document.getElementById('edit-repair-defect-other');
+ const editDefectInput = document.getElementById('edit-repair-defect');
const editMethodRequired = document.getElementById('edit-method-required');
- // 不良原因选择变化
- editDefectSelect.onchange = () => {
- if(editDefectSelect.value === '其他') {
- editDefectOther.style.display = 'block';
- } else {
- editDefectOther.style.display = 'none';
+ // 图片管理相关
+ let keepImages = [...images]; // 要保留的现有图片
+ let newImageFiles = []; // 新添加的图片文件
+
+ // 删除现有图片
+ document.querySelectorAll('.edit-image-delete').forEach(btn => {
+ btn.onclick = (e) => {
+ e.stopPropagation();
+ const filename = btn.dataset.filename;
+ keepImages = keepImages.filter(img => img !== filename);
+ btn.closest('.edit-image-item').remove();
+ };
+ });
+
+ // 添加新图片
+ const editDropzone = document.getElementById('edit-image-dropzone');
+ const editNewImagesInput = document.getElementById('edit-new-images');
+ const editNewImagesPreview = document.getElementById('edit-new-images-preview');
+
+ editDropzone.onclick = () => editNewImagesInput.click();
+ editDropzone.ondragover = (e) => { e.preventDefault(); editDropzone.style.borderColor = 'var(--primary)'; };
+ editDropzone.ondragleave = () => { editDropzone.style.borderColor = 'rgba(79,140,255,0.4)'; };
+ editDropzone.ondrop = (e) => {
+ e.preventDefault();
+ editDropzone.style.borderColor = 'rgba(79,140,255,0.4)';
+ handleNewImages(e.dataTransfer.files);
+ };
+
+ editNewImagesInput.onchange = () => handleNewImages(editNewImagesInput.files);
+
+ function handleNewImages(files) {
+ for(const file of files) {
+ if(!file.type.startsWith('image/')) continue;
+ if(keepImages.length + newImageFiles.length >= 10) {
+ API.toast('最多10张图片');
+ break;
+ }
+ newImageFiles.push(file);
+
+ // 预览
+ const reader = new FileReader();
+ reader.onload = (e) => {
+ const idx = newImageFiles.length - 1;
+ const div = document.createElement('div');
+ div.className = 'new-image-item';
+ div.dataset.idx = idx;
+ div.style.cssText = 'position:relative;width:80px;height:80px;border-radius:6px;overflow:hidden;border:1px solid var(--border)';
+ div.innerHTML = `
+
+
+ `;
+ document.body.appendChild(modal);
+
+ document.getElementById('tracking-modal-close').onclick = () => modal.remove();
+ document.getElementById('tracking-cancel').onclick = () => modal.remove();
+ document.getElementById('tracking-submit').onclick = async () => {
+ const trackingNumber = document.getElementById('tracking-number-input').value.trim();
+ if(!trackingNumber) {
+ API.toast('请输入快递单号');
+ return;
+ }
+
+ try {
+ const result = await API.batchUpdateTracking(Array.from(selectedIds), trackingNumber);
+ if(result.ok) {
+ API.toast(`成功更新 ${result.updated} 条记录的快递单号`);
+ modal.remove();
+ refreshRepairsList();
+ } else {
+ API.toast(result.error || '更新失败');
+ }
+ } catch(e) {
+ API.toast('更新失败: ' + (e.message || '网络错误'));
+ }
+ };
+ });
+
// 导出按钮
const exportBtn = document.getElementById('repairs-export-btn');
addListener(exportBtn, 'click', async () => {
@@ -1437,17 +1686,18 @@ const Upload = (() => {
hasError = true;
}
+ // 验证不良现象
+ const defectSymptom = symptomInput.value.trim();
+ if(!defectSymptom) {
+ symptomError.textContent = '请输入不良现象';
+ symptomError.style.display = 'block';
+ hasError = true;
+ }
+
// 验证不良原因
- let defectReason = defectSelect.value;
- if(defectReason === '其他') {
- defectReason = defectOtherInput.value.trim();
- if(!defectReason) {
- defectError.textContent = '请输入其他原因';
- defectError.style.display = 'block';
- hasError = true;
- }
- } else if(!defectReason) {
- defectError.textContent = '请选择不良原因';
+ const defectReason = defectInput.value.trim();
+ if(!defectReason) {
+ defectError.textContent = '请输入不良原因';
defectError.style.display = 'block';
hasError = true;
}
@@ -1466,6 +1716,7 @@ const Upload = (() => {
const formData = new FormData();
formData.append('sn', sn);
formData.append('machine_type', machineType);
+ formData.append('defect_symptom', defectSymptom);
formData.append('defect_reason', defectReason);
formData.append('repair_method', methodInput.value.trim());
@@ -1487,9 +1738,8 @@ const Upload = (() => {
// 清空表单
snInput.value = '';
machineTypeSelect.value = '';
- defectSelect.value = '';
- defectOtherInput.value = '';
- defectOtherInput.style.display = 'none';
+ symptomInput.value = '';
+ defectInput.value = '';
methodInput.value = '';
methodGroup.style.opacity = '0.5';
methodInput.disabled = true;
diff --git a/frontend/js/router.js b/frontend/js/router.js
index bd9eddf..d977afd 100644
--- a/frontend/js/router.js
+++ b/frontend/js/router.js
@@ -54,6 +54,7 @@ const Router = (() => {
function updateBreadcrumb(path) {
const bc = document.getElementById('breadcrumb');
+ if (!bc) return; // 元素不存在时直接返回
const parts = path.split('/').filter(Boolean);
let acc = '#';
bc.innerHTML = parts.map((p, i) => {
diff --git a/server/app.py b/server/app.py
index ccd4a95..c63e463 100644
--- a/server/app.py
+++ b/server/app.py
@@ -152,6 +152,16 @@ def init_db():
c.execute('ALTER TABLE repair_records ADD COLUMN machine_type TEXT')
except:
pass
+ # 添加tracking_number字段（快递单号）
+ try:
+ c.execute('ALTER TABLE repair_records ADD COLUMN tracking_number TEXT')
+ except:
+ pass
+ # 添加defect_symptom字段（不良现象）
+ try:
+ c.execute('ALTER TABLE repair_records ADD COLUMN defect_symptom TEXT')
+ except:
+ pass
c.execute('''CREATE TABLE IF NOT EXISTS sop_files(
id INTEGER PRIMARY KEY AUTOINCREMENT,
filename TEXT NOT NULL,
@@ -849,9 +859,8 @@ def dashboard():
# 计算不良率
bad_rate = "{}%".format(round((bad/(good+bad)) * 100, 2)) if (good+bad) > 0 else u'—'
- # 计算直通良品率（FPY = First Pass Yield）
- total_produced = good + bad
- fpy_rate = "{}%".format(round((fpy_good/total_produced) * 100, 2)) if total_produced > 0 else u'—'
+ # 直通良品数（FPY = First Pass Yield）
+ fpy_count = fpy_good
conn.close()
@@ -965,7 +974,7 @@ def dashboard():
shipments_count = (ship['total'] or 0) if ship else 0
return jsonify({
- 'fpyRate': fpy_rate,
+ 'fpyCount': fpy_count,
'goodRate': rate,
'badRate': bad_rate,
'shipments': shipments_count,
@@ -1370,7 +1379,7 @@ def upload_stats():
conn.commit()
conn.close()
- platform_name = {'pdd': '拼多多', 'yt': '圆通', 'tx': '兔喜'}.get(platform, platform)
+ platform_name = {'pdd': '拼多多', 'yt': '圆通', 'tx': '兔喜', 'mt': '美团', 'drf': '大润发', 'std': '标准版'}.get(platform, platform)
log('upload_stats', json.dumps({'good': good, 'bad': bad, 'fpy_good': fpy_good, 'platform': platform, 'details_count': len(details)}))
notify_superadmin('上传良/不良统计', f"平台: {platform_name}, 良品: {good}, 不良品: {bad}, 直通良品: {fpy_good}")
return jsonify({'ok': True})
@@ -1404,9 +1413,10 @@ def upload_repairs():
@require_login
@require_any_role('admin','superadmin')
def upload_repair_record():
- """上传返修记录（含设备SN、机种、不良原因、维修方法、图片）"""
+ """上传返修记录（含设备SN、机种、不良现象、不良原因、维修方法、图片）"""
sn = request.form.get('sn', '').strip()
machine_type = request.form.get('machine_type', '').strip()
+ defect_symptom = request.form.get('defect_symptom', '').strip()
defect_reason = request.form.get('defect_reason', '').strip()
repair_method = request.form.get('repair_method', '').strip()
@@ -1415,6 +1425,8 @@ def upload_repair_record():
return jsonify({'error': '设备SN为必填项'}), 400
if not machine_type:
return jsonify({'error': '机种为必填项'}), 400
+ if not defect_symptom:
+ return jsonify({'error': '不良现象为必填项'}), 400
if not defect_reason:
return jsonify({'error': '不良原因为必填项'}), 400
@@ -1464,14 +1476,14 @@ def upload_repair_record():
now = get_beijing_time()
images_json = json.dumps(image_filenames) if image_filenames else ''
- c.execute('INSERT INTO repair_records(sn, machine_type, defect_reason, repair_method, images, ts) VALUES(?,?,?,?,?,?)',
- (sn, machine_type, defect_reason, repair_method, images_json, now))
+ c.execute('INSERT INTO repair_records(sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts) VALUES(?,?,?,?,?,?,?)',
+ (sn, machine_type, defect_symptom, defect_reason, repair_method, images_json, now))
conn.commit()
record_id = c.lastrowid
conn.close()
- log('upload_repair_record', json.dumps({'sn': sn, 'machine_type': machine_type, 'defect_reason': defect_reason, 'images_count': len(image_filenames)}))
- notify_superadmin('上传返修记录', f"SN: {sn}, 机种: {machine_type}, 不良原因: {defect_reason}")
+ log('upload_repair_record', json.dumps({'sn': sn, 'machine_type': machine_type, 'defect_symptom': defect_symptom, 'defect_reason': defect_reason, 'images_count': len(image_filenames)}))
+ notify_superadmin('上传返修记录', f"SN: {sn}, 机种: {machine_type}, 不良现象: {defect_symptom}, 不良原因: {defect_reason}")
return jsonify({'ok': True, 'id': record_id})
@@ -1487,16 +1499,16 @@ def list_repair_records():
if sn_query:
# 支持模糊搜索
- c.execute('SELECT id, sn, machine_type, defect_reason, repair_method, images, ts FROM repair_records WHERE sn LIKE ? ORDER BY id DESC', (f'%{sn_query}%',))
+ c.execute('SELECT id, sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts, tracking_number FROM repair_records WHERE sn LIKE ? ORDER BY id DESC', (f'%{sn_query}%',))
elif limit:
try:
lim = int(limit)
- c.execute('SELECT id, sn, machine_type, defect_reason, repair_method, images, ts FROM repair_records ORDER BY id DESC LIMIT ?', (lim,))
+ c.execute('SELECT id, sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts, tracking_number FROM repair_records ORDER BY id DESC LIMIT ?', (lim,))
except:
- c.execute('SELECT id, sn, machine_type, defect_reason, repair_method, images, ts FROM repair_records ORDER BY id DESC')
+ c.execute('SELECT id, sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts, tracking_number FROM repair_records ORDER BY id DESC')
else:
# 不限制数量，返回所有记录
- c.execute('SELECT id, sn, machine_type, defect_reason, repair_method, images, ts FROM repair_records ORDER BY id DESC')
+ c.execute('SELECT id, sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts, tracking_number FROM repair_records ORDER BY id DESC')
rows = [dict(r) for r in c.fetchall()]
conn.close()
@@ -1549,7 +1561,7 @@ def export_repair_records():
# 获取选中的记录
placeholders = ','.join(['?' for _ in record_ids])
- c.execute(f'SELECT id, sn, machine_type, defect_reason, repair_method, images, ts FROM repair_records WHERE id IN ({placeholders}) ORDER BY id DESC', record_ids)
+ c.execute(f'SELECT id, sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts, tracking_number FROM repair_records WHERE id IN ({placeholders}) ORDER BY id DESC', record_ids)
rows = [dict(r) for r in c.fetchall()]
conn.close()
@@ -1564,7 +1576,7 @@ def export_repair_records():
from openpyxl.styles import Alignment
# 设置表头
- headers = ['序号', 'SN', '机种', '不良原因', '维修方法', '时间', '图片']
+ headers = ['序号', 'SN', '机种', '不良现象', '不良原因', '维修方法', '快递单号', '时间', '图片']
for col, header in enumerate(headers, 1):
cell = ws.cell(row=1, column=col, value=header)
cell.alignment = Alignment(horizontal='left', vertical='center')
@@ -1573,7 +1585,7 @@ def export_repair_records():
# 序号列宽度缩小
ws.column_dimensions['A'].width = 4.5
# 图片列宽度更大
- ws.column_dimensions['G'].width = 60
+ ws.column_dimensions['I'].width = 60
upload_dir = os.path.join(os.path.dirname(__file__), 'uploads', 'repair_images')
@@ -1588,16 +1600,20 @@ def export_repair_records():
cell2.alignment = data_alignment
cell3 = ws.cell(row=row_idx, column=3, value=record.get('machine_type') or '')
cell3.alignment = data_alignment
- cell4 = ws.cell(row=row_idx, column=4, value=record['defect_reason'])
+ cell4 = ws.cell(row=row_idx, column=4, value=record.get('defect_symptom') or '')
cell4.alignment = data_alignment
- cell5 = ws.cell(row=row_idx, column=5, value=record['repair_method'] or '')
+ cell5 = ws.cell(row=row_idx, column=5, value=record['defect_reason'])
cell5.alignment = data_alignment
+ cell6 = ws.cell(row=row_idx, column=6, value=record['repair_method'] or '')
+ cell6.alignment = data_alignment
+ cell7 = ws.cell(row=row_idx, column=7, value=record.get('tracking_number') or '')
+ cell7.alignment = data_alignment
# 格式化时间：去掉T和时区，只显示到秒
ts = record['ts']
if ts:
ts = ts.replace('T', ' ').split('.')[0].split('+')[0]
- cell6 = ws.cell(row=row_idx, column=6, value=ts)
- cell6.alignment = data_alignment
+ cell8 = ws.cell(row=row_idx, column=8, value=ts)
+ cell8.alignment = data_alignment
# 处理图片
images = []
@@ -1611,7 +1627,7 @@ def export_repair_records():
# 设置行高以容纳图片（增大到150像素）
ws.row_dimensions[row_idx].height = 150
- img_col = 7 # 图片列改为第7列
+ img_col = 9 # 图片列改为第9列
for img_idx, img_name in enumerate(images[:3]): # 最多显示3张图片
img_path = os.path.join(upload_dir, secure_filename(img_name))
if os.path.exists(img_path):
@@ -1634,7 +1650,7 @@ def export_repair_records():
else:
ws.cell(row=row_idx, column=img_col, value=f'图片不存在: {img_name}')
else:
- ws.cell(row=row_idx, column=7, value='无图片')
+ ws.cell(row=row_idx, column=9, value='无图片')
# 保存到内存
output = BytesIO()
@@ -1661,7 +1677,7 @@ def get_repair_record(record_id):
"""获取单条返修记录详情"""
conn = get_db()
c = conn.cursor()
- c.execute('SELECT id, sn, machine_type, defect_reason, repair_method, images, ts FROM repair_records WHERE id=?', (record_id,))
+ c.execute('SELECT id, sn, machine_type, defect_symptom, defect_reason, repair_method, images, ts, tracking_number FROM repair_records WHERE id=?', (record_id,))
row = c.fetchone()
conn.close()
@@ -1688,6 +1704,7 @@ def update_repair_record(record_id):
data = request.get_json() or {}
sn = data.get('sn', '').strip()
machine_type = data.get('machine_type', '').strip()
+ defect_symptom = data.get('defect_symptom', '').strip()
defect_reason = data.get('defect_reason', '').strip()
repair_method = data.get('repair_method', '').strip()
@@ -1696,6 +1713,8 @@ def update_repair_record(record_id):
return jsonify({'error': '设备SN为必填项'}), 400
if not machine_type:
return jsonify({'error': '机种为必填项'}), 400
+ if not defect_symptom:
+ return jsonify({'error': '不良现象为必填项'}), 400
if not defect_reason:
return jsonify({'error': '不良原因为必填项'}), 400
@@ -1717,15 +1736,211 @@ def update_repair_record(record_id):
conn.close()
return jsonify({'error': '记录不存在'}), 404
- c.execute('UPDATE repair_records SET sn=?, machine_type=?, defect_reason=?, repair_method=? WHERE id=?',
- (sn, machine_type, defect_reason, repair_method, record_id))
+ # 获取快递单号（可选）
+ tracking_number = data.get('tracking_number', '').strip() if 'tracking_number' in data else None
+
+ if tracking_number is not None:
+ c.execute('UPDATE repair_records SET sn=?, machine_type=?, defect_symptom=?, defect_reason=?, repair_method=?, tracking_number=? WHERE id=?',
+ (sn, machine_type, defect_symptom, defect_reason, repair_method, tracking_number, record_id))
+ else:
+ c.execute('UPDATE repair_records SET sn=?, machine_type=?, defect_symptom=?, defect_reason=?, repair_method=? WHERE id=?',
+ (sn, machine_type, defect_symptom, defect_reason, repair_method, record_id))
conn.commit()
conn.close()
- log('update_repair_record', json.dumps({'id': record_id, 'sn': sn, 'defect_reason': defect_reason}))
+ log('update_repair_record', json.dumps({'id': record_id, 'sn': sn, 'defect_symptom': defect_symptom, 'defect_reason': defect_reason}))
return jsonify({'ok': True})
+@app.post('/api/repair-record/
+
+ 添加快递单号
+ +
+
+
+ 已选择 ${selectedIds.size} 条记录
+
+
+
+
+
+
+
+
+
+